Merge lp:~logan/ubuntu/quantal/munin/debian-merge into lp:ubuntu/quantal/munin

[Logan Rosen]

[Jamie Strandboge (jdstrand)]

This looks great. Thanks! ACK

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2012-07-02 14:15:42 +0000
+++ ChangeLog	2012-07-23 03:02:19 +0000
@@ -1,5 +1,15 @@
 -*- text -*-
 
+munin-2.0.2, 2012-06-29
+
+Summary :
+
+* munin-graph can be called again from cron
+* workaround "root" field name bug
+* initial doc/ subdir. will be munin book
+* emits percent in log about errors 
+* various bugfix
+
 munin-2.0.1, 2012-06-10
 
 Well, first bugfix release. 

=== modified file 'RELEASE'
--- RELEASE	2012-07-02 14:15:42 +0000
+++ RELEASE	2012-07-23 03:02:19 +0000
@@ -1,1 +1,1 @@
-2.0.1
+2.0.2

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-02 14:15:42 +0000
+++ debian/changelog	2012-07-23 03:02:19 +0000
@@ -1,3 +1,23 @@
+munin (2.0.2-1ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/munin-node.upstart,munin.upstart: Add upstart configurations.
+
+ -- Logan Rosen <[e-mail]>  Sun, 22 Jul 2012 14:19:53 -0400
+
+munin (2.0.2-1) unstable; urgency=low
+
+  [ Holger Levsen ]
+  * New upstream version, reintroducing munin-graph (Closes: #681674) and
+    some bugfixes. The new munin book is added to the sources, but not yet
+    build.
+  * Add proper LSB headers to all init scripts. (Closes: #680223)
+
+  [ Stig Sandbeck Mathisen ]
+  * debian/control: Rename "munin-async-*" to munin-async and munin-asyncd.
+
+ -- Holger Levsen <[e-mail]>  Sat, 21 Jul 2012 12:43:33 -0600
+
 munin (2.0.1-1ubuntu1) quantal; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:

=== modified file 'debian/control'
--- debian/control	2012-07-02 14:15:42 +0000
+++ debian/control	2012-07-23 03:02:19 +0000
@@ -143,7 +143,7 @@
  virtually everything imaginable throughout your network, while still
  maintaining a rattling ease of installation and configuration.
  .
- This package contains munin-async-master and munin-async-client which can
+ This package contains munin-async and munin-asyncd which can
  be used for (optional) asynchronous operation of munin-update.
  .
  Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent

=== modified file 'debian/munin-async.init'
--- debian/munin-async.init	2012-03-19 15:17:42 +0000
+++ debian/munin-async.init	2012-07-23 03:02:19 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          munin-async
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
+# Required-Start:    $network $named $local_fs $remote_fs
+# Required-Stop:     $network $named $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Munin asynchronous server
@@ -16,7 +16,7 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Munin asynchronous server"
-NAME=munin-async-server
+NAME=munin-asyncd
 DAEMON=/usr/share/munin/$NAME
 DAEMON_ARGS=""
 PIDFILE=/var/run/munin/$NAME.pid

=== modified file 'debian/munin-node.init'
--- debian/munin-node.init	2012-05-31 22:21:59 +0000
+++ debian/munin-node.init	2012-07-23 03:02:19 +0000
@@ -2,10 +2,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          munin-node
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Should-Start:      $all
-# Should-Stop:       $all
+# Required-Start:    $network $named $local_fs $remote_fs
+# Required-Stop:     $network $named $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Start/stop Munin-Node

=== modified file 'debian/munin.init'
--- debian/munin.init	2012-03-19 15:17:42 +0000
+++ debian/munin.init	2012-07-23 03:02:19 +0000
@@ -2,10 +2,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          munin
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Should-Start:      $all
-# Should-Stop:       $all
+# Required-Start:    $network $named $local_fs $remote_fs
+# Required-Stop:     $network $named $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Create /var/run/munin on boot

=== added directory 'doc'
=== added file 'doc/.gitignore'
--- doc/.gitignore	1970-01-01 00:00:00 +0000
+++ doc/.gitignore	2012-07-23 03:02:19 +0000
@@ -0,0 +1,2 @@
+_build/
+*~

=== added file 'doc/Makefile'
--- doc/Makefile	1970-01-01 00:00:00 +0000
+++ doc/Makefile	2012-07-23 03:02:19 +0000
@@ -0,0 +1,153 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Munin.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Munin.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Munin"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Munin"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."

=== added directory 'doc/_static'
=== added file 'doc/_static/.gitignore'
=== added directory 'doc/_templates'
=== added file 'doc/_templates/.gitignore'
=== added file 'doc/conf.py'
--- doc/conf.py	1970-01-01 00:00:00 +0000
+++ doc/conf.py	2012-07-23 03:02:19 +0000
@@ -0,0 +1,286 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Munin documentation build configuration file, created by
+# sphinx-quickstart on Sat Jun  9 11:12:29 2012.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.doctest']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'Munin'
+copyright = '2012, Stig Sandbeck Mathisen <[e-mail]>'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '2.0'
+# The full version, including alpha/beta/rc tags.
+release = os.popen('../getversion').read()
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+html_short_title = "Munin"
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+html_logo = '../master/static/logo-h.png'
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Munindoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+'papersize': 'a4paper',
+
+# The font size ('10pt', '11pt' or '12pt').
+'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'Munin.tex', 'Munin Documentation',
+   'Stig Sandbeck Mathisen \\textless{}[e-mail]\\textgreater{}', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+latex_logo = '../master/static/logo-h.png'
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'munin', 'Munin Documentation',
+     ['Stig Sandbeck Mathisen <[e-mail]>'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output ------------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+  ('index', 'Munin', 'Munin Documentation',
+   'Stig Sandbeck Mathisen <[e-mail]>', 'Munin', 'One line description of project.',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+
+# -- Options for Epub output ---------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = 'Munin'
+epub_author = 'Stig Sandbeck Mathisen <[e-mail]>'
+epub_publisher = 'Stig Sandbeck Mathisen <[e-mail]>'
+epub_copyright = '2012, Stig Sandbeck Mathisen <[e-mail]>'
+
+# The language of the text. It defaults to the language option
+# or en if the language is not set.
+#epub_language = ''
+
+# The scheme of the identifier. Typical schemes are ISBN or URL.
+#epub_scheme = ''
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#epub_identifier = ''
+
+# A unique identification for the text.
+#epub_uid = ''
+
+# A tuple containing the cover image and cover page html template filenames.
+#epub_cover = ()
+
+# HTML files that should be inserted before the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_pre_files = []
+
+# HTML files shat should be inserted after the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_post_files = []
+
+# A list of files that should not be packed into the epub file.
+#epub_exclude_files = []
+
+# The depth of the table of contents in toc.ncx.
+#epub_tocdepth = 3
+
+# Allow duplicate toc entries.
+#epub_tocdup = True

=== added directory 'doc/documentation'
=== added file 'doc/documentation/index.rst'
--- doc/documentation/index.rst	1970-01-01 00:00:00 +0000
+++ doc/documentation/index.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,11 @@
+.. _documentation-index:
+
+===================
+ Documenting Munin
+===================
+
+This document is rather meta, it explains how to document Munin.
+
+.. toctree::
+
+   nomenclature.rst

=== added file 'doc/documentation/nomenclature.rst'
--- doc/documentation/nomenclature.rst	1970-01-01 00:00:00 +0000
+++ doc/documentation/nomenclature.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,134 @@
+==============
+ Nomenclature
+==============
+
+To be able to use Munin, to understand the documentation, and - not to
+be neglected - to be able to write documentation that is consistent
+with Munin behaviour, we need a common nomenclature.
+
+Common terms
+============
+
++--------------+--------------------------------------------+------------------------------+
+| Term         | Explanation                                | Also referred to as as       |
++==============+============================================+==============================+
+| Munin Master | The central host / server where Munin      | master, server, munin server |
+|              | gathers all data.                          |                              |
+|              | The machine runs munin-cron                |                              |
++--------------+--------------------------------------------+------------------------------+
+| Munin Node   | The daemon /  network service running      | In SNMP terms                |
+|              | on each host to be contacted by the        | it may be called an          |
+|              |                                            | agent.                       |
++--------------+--------------------------------------------+------------------------------+
+| Plugin       | Each munin node handles one or more        | service                      |
+|              | plugins to monitor stuff on hosts          |                              |
++--------------+--------------------------------------------+------------------------------+
+| Host         | A machine monitored by Munin,              |                              |
+|              | maybe by proxy on a munin node,            |                              |
+|              | or via a SNMP plugin                       |                              |
++--------------+--------------------------------------------+------------------------------+
+| Field        | Each plugin presents data from one         | Data source                  |
+|              | or more data sources. Each found,          |                              |
+|              | read or calculated value corresponds       |                              |
+|              | to a field.attribute tuple.                |                              |
++--------------+--------------------------------------------+------------------------------+
+| Attribute    | Description found in output from plugins,  |                              |
+|              | both general (global) to the plugin, and   |                              |
+|              | also specific ot each Field.               |                              |
++--------------+--------------------------------------------+------------------------------+
+| Environment  | Set up by munin node, used to control      |                              |
+| variable     | plugin behaviour.  Found in the plugin     |                              |
+|              | configuration directory.                   |                              |
+|              | (/etc/munin/plugin-conf.d/)                |                              |
++--------------+--------------------------------------------+------------------------------+
+| Global       | Used in the global context in the          |                              |
+| (plugin)     | configuration output from a plugin.        |                              |
+| attribute    | (Note: The attribute is considered         |                              |
+|              | "global" only to the plugin (and the       |                              |
+|              | node), and only when executed.             |                              |
++--------------+--------------------------------------------+------------------------------+
+| Datasource   | Used in the datasource-specific context in |                              |
+| specific     | the output of a plugin                     |                              |
+| plugin       |                                            |                              |
+| attribute    |                                            |                              |
++--------------+--------------------------------------------+------------------------------+
+| Global       | Used in munin.conf                         |                              |
+| directive    |                                            |                              |
++--------------+--------------------------------------------+------------------------------+
+| Node level   | Used in munin.conf                         |                              |
+| directive    |                                            |                              |
++--------------+--------------------------------------------+------------------------------+
+| Group level  | Used in munin.conf                         |                              |
+| directive    |                                            |                              |
++--------------+--------------------------------------------+------------------------------+
+| Field level  | Used in munin.conf                         |                              |
+| directive    |                                            |                              |
++--------------+--------------------------------------------+------------------------------+
+
+
+Examples
+========
+
+To shed some light on the nomenclature, consider the examples below:
+
+Global plugin attribute
+-----------------------
+
+Global plugin attributes are in the plugins output when run with the
+config argument. The full list of these attributes is found on the
+protocol config page. This output does not configure the plugin, it
+configures the plugins graph.
+
+::
+
+    graph_title Load average
+    ----------- ------------
+         |           `------ value
+         `------------------ attribute
+
+
+Datasource specific plugin attribute
+------------------------------------
+
+These are found both in the config outout of a plugin and in the
+normal readings of a plugin. A plugin may provide data from one or
+more data sources. Each data source needs its own set of
+field.attribute tuples to define how the data source should be
+presented.
+
+::
+
+    load.warning 100
+    ---- ------- ---
+      |     |     `- value
+      |     `------- one of several attributes used in config output
+      `------------- field
+
+    load.value 54
+    ---- ----- --
+      |    |    `- value
+      |    `------ only attribute when getting values from a plugin
+      `----------- field
+
+Configuration files
+-------------------
+
+This one is from the global section of munin.conf:
+
+::
+
+    dbdir       /var/lib/munin/
+    -----       ---------------
+      |                `--------- value
+      `-------------------------- global directive
+
+
+And then one from the node level section:
+
+::
+
+    [foo.example.org]
+      address localhost
+      ------- ---------
+         |        `----- value
+         `-------------- node level directive

=== added directory 'doc/example'
=== added file 'doc/example/index.rst'
--- doc/example/index.rst	1970-01-01 00:00:00 +0000
+++ doc/example/index.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,14 @@
+.. _example-index:
+
+========
+Examples
+========
+
+Examples of munin and related configuration are gathered here.
+
+.. toctree::
+
+   webserver/apache-virtualhost.rst
+   webserver/lighttpd.rst
+   webserver/nginx.rst
+   plugin/aggregate.rst

=== added directory 'doc/example/plugin'
=== added directory 'doc/example/plugin/aggregate'
=== added file 'doc/example/plugin/aggregate.rst'
--- doc/example/plugin/aggregate.rst	1970-01-01 00:00:00 +0000
+++ doc/example/plugin/aggregate.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,188 @@
+.. _example-plugin-aggregate:
+
+==============================
+ Graph aggregation by example
+==============================
+
+This example covers creating aggregate graphs. The configuration reads
+the current and power from two UPSes (i.e. two hosts with two plugins
+each) and then creates one virtual host with two virtual plugins; one
+for current and one for power.
+
+Plugins involved
+================
+
+The example uses a plugin for monitoring UPSes through SNMP, where the
+UPS address and the different aspects are defined through symlinks.
+The two UPSes, called "ups-5a" and "ups-5b", are monitored with
+respect to "current" and "power". Thus, the affected plugins are
+called as:
+
+::
+
+ snmp_ups_ups-5a_current
+ snmp_ups_ups-5b_current
+ snmp_ups_ups-5a_power
+ snmp_ups_ups-5b_power
+
+The original plugin name is actually "snmp_ups\_\_" - note the "two"
+underscores at the end. The plugin is then symlinked to the given host
+name(s) (e.g. ups-5a) and what we want to monitor (e.g. power). Let's
+just take one closer look at one of them:
+
+::
+
+ snmp_ups_ups-5a_power
+ -------- ------ -----
+     |       |     |
+     |       |     `--- The function we want to monitor
+     |       `--------- The node name of the UPS
+     `----------------- The plugin
+
+Extract from munin.conf
+=======================
+
+
+The following extract from /etc/munin/munin.conf is explained in
+detail, step by step, below the configuration.
+
+::
+
+  1 [UPS;ups-5a]
+  2        address 127.0.0.1 # localhost fetches data
+  3
+  4 [UPS;ups-5b]
+  5        address 127.0.0.1 # localhost fetches data
+  6
+  7 [UPS;Aggregated]
+  8         update no
+  9         contacts no
+ 10
+ 11         snmp_ups_current.update no
+ 12         snmp_ups_current.graph_args --base 1000 -l 0
+ 13         snmp_ups_current.graph_category UPS
+ 14         snmp_ups_current.graph_title Aggregated input/output current
+ 15         snmp_ups_current.graph_vlabel Ampere
+ 16         snmp_ups_current.inputtotal.label Input current
+ 17         snmp_ups_current.outputtotal.label Output current
+ 18         snmp_ups_current.graph_order inputtotal outputtotal
+ 19         snmp_ups_current.inputtotal.sum \
+ 20                         ups-5a:snmp_ups_ups-5a_current.inputcurrent \
+ 21                         ups-5b:snmp_ups_ups-5b_current.inputcurrent
+ 22         snmp_ups_current.outputtotal.sum \
+ 23                         ups-5a:snmp_ups_ups-5a_current.outputcurrent \
+ 24                         ups-5b:snmp_ups_ups-5b_current.outputcurrent
+ 25
+ 26         snmp_ups_power.update no
+ 27         snmp_ups_power.graph_args --base 1000 -l 0
+ 28         snmp_ups_power.graph_category UPS
+ 29         snmp_ups_power.graph_title Aggregated output power
+ 30         snmp_ups_power.graph_vlabel Watts
+ 31         snmp_ups_power.output.label Output power
+ 32         snmp_ups_power.graph_order output
+ 33         snmp_ups_power.output.sum \
+ 34                         ups-5a:snmp_ups_ups-5a_power.outputpower \
+ 35                         ups-5b:snmp_ups_ups-5b_power.outputpower
+
+
+Explanations, per line
+======================
+
+* 1 - 2: The SNMP-based plugin for the UPS known as "ups-5a" is
+  defined. The group name is "UPS" and the node name is "ups-5a". The
+  plugin is run from localhost.
+
+* 4 - 5: The SNMP-based plugin for the UPS known as "ups-5b" is
+  defined. The group name is "UPS" and the node name is "ups-5b". The
+  plugin is run from localhost.
+
+* 7: The group and "virtual node name" for the aggregated graphs are
+  defined. The group name is "UPS" and the virtual node name is
+  "Aggregated".
+
+* 8: Make sure that Munin (specifically, "munin-update") does not try
+  to actively gather information for this node.
+
+* 9: Tell "munin-limits" not to send alerts if any limit is breached.
+
+The above lines (1 - 9) have now established the fundament for three
+different graph pages; one for each of the two UPSes and one for the
+aggregate graphs.
+
+* 11 - 15: Define the basic information for the virtual plugin for
+  aggregated current. Note that "snmp_ups_current" is the virtual
+  plugin's name.
+
+* 16 - 17: Simultaneously define and label "two" values to be graphed
+  in the virtual plugin: "inputtotal" and "outputtotal".
+
+* 18: Order the values.
+
+* 19 - 21: Calculate the value for "inputtotal" by reading the
+  "inputcurrent" values from each of the two UPSes.
+
+Let's take a closer look at the components
+
+::
+
+ snmp_ups_current.inputtotal.sum \
+ ---------------- ---------- ---
+         |             |      |
+         |             |      `-- The sum mechanism
+         |             `--------- One of this virtual plugin's values
+         `----------------------- The name of the virtual plugin
+
+::
+
+ ups-5a:snmp_ups_ups-5a_current.inputcurrent \
+ ups-5b:snmp_ups_ups-5b_current.inputcurrent
+ ------ ----------------------- ------------
+    |               |                 |
+    |               |                 `------ The "inputcurrent" value from the real plugin
+    |               `------------------------ The real plugin's name (symlink)
+    `---------------------------------------- The host name from which to seek information
+
+
+* 22 - 24: Similarly for "outputtotal".
+
+* 26 - 35: Like the above, but for power instead. Note that this
+  virtual plugin graphs only "one" value, and as such, only "one"
+  "sum" mechanism is used.
+
+Result graphs
+=============
+
+The graphs below show one of the UPSes, and the aggregated values. The
+graphs used are by week, because they had a nice dip in the beginning
+of the graphing period :-)
+
+Source graphs for one of the UPSes:
+
+.. image:: aggregate/ups-5a_current.png
+
+.. image:: aggregate/ups-5a_power.png
+
+Aggregate graphs:
+
+.. image:: aggregate/aggregate_current.png
+
+.. image:: aggregate/aggregate_power.png
+
+Summary
+=======
+
+We have now, in addition to the two real UPS nodes "ups-5a" and
+"ups-5b" (lines 1 - 5), created one virtual host named "Aggregated"
+(line 7) with two virtual plugins: "snmp_ups_current" (lines 11 - 24)
+and "snmp_ups_power" (lines 26 - 35).
+
+The "snmp_ups_current" virtual plugin outputs two field names:
+"inputtotal" (lines 16 and 19 - 21) and "outputtotal" (lines 17 and
+22 - 24), while the "snmp_ups_power" virtual plugin outputs only one
+field name, namely "output" (lines 31 - 35).
+
+Further reading
+===============
+
+ * [wiki:Using_SNMP_plugins Using SNMP plugins]
+ * [wiki:munin.conf munin.conf] directives explained

=== added file 'doc/example/plugin/aggregate/aggregate_current.png'
Binary files doc/example/plugin/aggregate/aggregate_current.png	1970-01-01 00:00:00 +0000 and doc/example/plugin/aggregate/aggregate_current.png	2012-07-23 03:02:19 +0000 differ
=== added file 'doc/example/plugin/aggregate/aggregate_power.png'
Binary files doc/example/plugin/aggregate/aggregate_power.png	1970-01-01 00:00:00 +0000 and doc/example/plugin/aggregate/aggregate_power.png	2012-07-23 03:02:19 +0000 differ
=== added file 'doc/example/plugin/aggregate/ups-5a_current.png'
Binary files doc/example/plugin/aggregate/ups-5a_current.png	1970-01-01 00:00:00 +0000 and doc/example/plugin/aggregate/ups-5a_current.png	2012-07-23 03:02:19 +0000 differ
=== added file 'doc/example/plugin/aggregate/ups-5a_power.png'
Binary files doc/example/plugin/aggregate/ups-5a_power.png	1970-01-01 00:00:00 +0000 and doc/example/plugin/aggregate/ups-5a_power.png	2012-07-23 03:02:19 +0000 differ
=== added directory 'doc/example/webserver'
=== added file 'doc/example/webserver/apache-virtualhost.rst'
--- doc/example/webserver/apache-virtualhost.rst	1970-01-01 00:00:00 +0000
+++ doc/example/webserver/apache-virtualhost.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,65 @@
+.. _example-webserver-apache:
+
+==================================
+ Apache virtualhost configuration
+==================================
+
+This example describes how to set up munin on a separate apache httpd
+virtual host. It uses FastCGI if this is available, and falls back to
+CGI if it is not.
+
+Munin configuration
+===================
+
+This example assumes the following configuration in
+/etc/munin/munin.conf
+
+::
+
+ # graph_strategy should be commented out, if present
+ html_strategy  cgi
+
+Virtualhost configuration
+=========================
+
+Add a new virtualhost, using the following example:
+
+::
+
+ <VirtualHost *:80>
+     ServerName munin.example.org
+     ServerAlias munin
+
+     ServerAdmin  [e-mail]
+
+     DocumentRoot /srv/www/munin.example.org
+
+     ErrorLog  /var/log/apache2/munin.example.org-error.log
+     CustomLog /var/log/apache2/munin.example.org-access.log combined
+
+     # Rewrites
+     RewriteEngine On
+
+     # Static content in /static
+     RewriteRule ^/favicon.ico /etc/munin/static/favicon.ico [L]
+     RewriteRule ^/static/(.*) /etc/munin/static/$1          [L]
+
+     # HTML
+     RewriteCond %{REQUEST_URI} .html$ [or]
+     RewriteCond %{REQUEST_URI} =/
+     RewriteRule ^/(.*)          /usr/lib/cgi-bin/munin-cgi-html/$1 [L]
+
+     # Images
+     RewriteRule ^/cgi-bin/munin-cgi-graph/(.*) /usr/lib/cgi-bin/munin-cgi-graph/$1 [L]
+
+     # Ensure we can run (fast)cgi scripts
+     <Directory "/usr/lib/cgi-bin">
+         Options +ExecCGI
+         <IfModule mod_fcgid.c>
+             SetHandler fcgid-script
+         </IfModule>
+         <IfModule !mod_fcgid.c>
+             SetHandler cgi-script
+         </IfModule>
+     </Directory>
+ </VirtualHost>

=== added file 'doc/example/webserver/lighttpd.rst'
--- doc/example/webserver/lighttpd.rst	1970-01-01 00:00:00 +0000
+++ doc/example/webserver/lighttpd.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,49 @@
+.. _example-webserver-lighttpd:
+
+========================
+ lighttpd configuration
+========================
+
+This example describes how to set up munin on lighttpd. It spawns two
+lighttpd processes, one for the graph rendering, and one for the html
+generation.
+
+You need to enable the "mod_rewrite" module in the main lighttpd
+configuration.
+
+Munin configuration
+===================
+
+This example assumes the following configuration in
+/etc/munin/munin.conf
+
+::
+
+ # graph_strategy should be commented out, if present
+ html_strategy cgi
+
+Webserver configuration
+=======================
+
+::
+
+  alias.url += ( "/munin-static" => "/etc/munin/static" )
+  alias.url += ( "/munin"        => "/var/cache/munin/www/" )
+   
+  fastcgi.server += ("/cgi-bin/munin-cgi-graph" =>
+                     (( "socket"      => "/var/run/lighttpd/munin-cgi-graph.sock",
+                        "bin-path"    => "/usr/lib/cgi-bin/munin-cgi-graph",
+                        "check-local" => "disable",
+                     )),
+                    "/cgi-bin/munin-cgi-html" =>
+                     (( "socket"      => "/var/run/lighttpd/munin-cgi-html.sock",
+                        "bin-path"    => "/usr/lib/cgi-bin/munin-cgi-html",
+                        "check-local" => "disable",
+                     ))
+                   )
+   
+  url.rewrite-repeat += (
+                     "/munin/(.*)" => "/cgi-bin/munin-cgi-html/$1",
+                     "/cgi-bin/munin-cgi-html$" => "/cgi-bin/munin-cgi-html/",
+                     "/cgi-bin/munin-cgi-html/static/(.*)" => "/munin-static/$1"
+                     )

=== added file 'doc/example/webserver/nginx.rst'
--- doc/example/webserver/nginx.rst	1970-01-01 00:00:00 +0000
+++ doc/example/webserver/nginx.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,72 @@
+.. _example-webserver-nginx:
+
+=====================
+ nginx configuration
+=====================
+
+This example describes how to set up munin on nginx.
+
+nginx does not spawn FastCGI processes by itself, but comes with an
+external "spawn-fcgi" program.
+
+We need one process for the graph rendering, and one for the html
+generation.
+
+Munin configuration
+===================
+
+This example assumes the following configuration in
+/etc/munin/munin.conf
+
+::
+
+ # graph_strategy should be commented out, if present
+ html_strategy cgi
+
+FastCGI configuration
+=====================
+
+This will spawn two FastCGI processes trees. One for munin cgi
+graphing and one for HTML generation. It will create a socket owned by
+www-data, and run the processes as the "munin" user.
+
+.. code-block:: bash
+
+  spawn-fcgi -s /var/run/munin/fastcgi-graph.sock -U www-data \
+    -u munin -g munin /usr/lib/cgi-bin/munin-cgi-graph
+
+  spawn-fcgi -s /var/run/munin/fastcgi-html.sock  -U www-data \
+    -u munin -g munin /usr/lib/cgi-bin/munin-html-graph
+
+Note: Depending on your installation method, the "munin-\*-graph"
+programs may be in another directory. Check Makefile.config if you
+installed from source, or your package manager if you used that to
+install.
+
+Note: If you installed using the package manager on Debian or Ubuntu,
+the /var/log/munin/munin-cgi-\*.log files may be owned by the
+"www-data" user. This example runs the processes as the "munin" user,
+so you need to chown the log files, and edit /etc/logrotate.d/munin.
+
+Webserver configuration
+=======================
+
+::
+
+    location ^~ /cgi-bin/munin-cgi-graph/ {
+	fastcgi_split_path_info ^(/cgi-bin/munin-cgi-graph)(.*);
+	fastcgi_param PATH_INFO $fastcgi_path_info;
+	fastcgi_pass unix:/var/run/munin/fastcgi-graph.sock;
+	include fastcgi_params;
+    }
+
+    location /munin/static/ {
+	alias /etc/munin/static/;
+    }
+
+    location /munin/ {
+	fastcgi_split_path_info ^(/munin)(.*);
+	fastcgi_param PATH_INFO $fastcgi_path_info;
+	fastcgi_pass unix:/var/run/munin/fastcgi-html.sock;
+	include fastcgi_params;
+    }

=== added file 'doc/index.rst'
--- doc/index.rst	1970-01-01 00:00:00 +0000
+++ doc/index.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,29 @@
+.. Munin documentation master file, created by
+   sphinx-quickstart on Sat Jun  9 11:12:29 2012.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to Munin's documentation!
+=================================
+
+Warning: This documentation is being developed. It is incomplete, and
+may even be plain wrong. Feedback is welcome.
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   installation/index.rst
+   master/index.rst
+   plugin/index.rst
+   documentation/index.rst
+   example/index.rst
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

=== added directory 'doc/installation'
=== added file 'doc/installation/configuration.rst'
--- doc/installation/configuration.rst	1970-01-01 00:00:00 +0000
+++ doc/installation/configuration.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,84 @@
+=======================
+ Initial configuration
+=======================
+
+Node
+====
+
+Plugins
+-------
+
+Decide which plugins to use. The munin node runs all plugins present
+in CONFDIR/plugins/
+
+The quick auto-plug-and-play solution:
+
+.. code-block:: bash
+
+ munin-node-configure --shell --families=contrib,auto | sh -x
+
+Access
+------
+
+The munin node listens on all interfaces by default, but has a
+restrictive access list. You need to add your master's IP address.
+
+The "cidr_allow", "cidr_deny", "allow" and "deny" statements are used.
+
+cidr_allow uses the following syntax (the /32 is not implicit, so for
+a single host, you need to add it):
+
+    | cidr_allow 127.0.0.0/8
+    | cidr_allow 192.0.2.1/32
+
+allow uses regular expression matching against the client IP address.
+
+    | allow '^127\.'
+    | allow '^192\.0\.2\.1$'
+
+For specific information about the syntax, see `Net::Server
+<http://search.cpan.org/dist/Net-Server/lib/Net/Server.pod>`_. Please
+keep in mind that cidr_allow is a recent addition, and may not be
+available on all systems.
+
+Startup
+-------
+
+Start the node agent (as root) SBINDIR/munin-node. Restart it it it
+was already started. The node only discovers new plugins when it is
+restarted.
+
+You probably want to use an init-script instead and you might find a
+good one under build/dists or in the build/resources directory (maybe
+you need to edit the init script, check the given paths in the script
+you might use).
+
+Master
+======
+
+Add some nodes
+--------------
+
+Add some nodes to CONFDIR/munin.conf
+
+[node.example.com]
+  address 192.0.2.4
+
+[node2.example.com]
+  address node2.example.com
+
+[node3.example.com]
+  address 2001:db8::de:caf:bad
+
+Configure web server
+====================
+
+On the master, you need to configure a web server. 
+
+If you have installed "munin" through distribution
+packages, a webserver may have been configured for you already.
+
+If you installed from source, there is a minimal configuration example
+in the "resources" directory in the source tarball.
+
+For a more complex example, see :ref:`example-webserver-apache`

=== added file 'doc/installation/help.rst'
--- doc/installation/help.rst	1970-01-01 00:00:00 +0000
+++ doc/installation/help.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,27 @@
+==============
+ Getting help
+==============
+
+IRC Channel
+===========
+
+The most immediate way to get hold of us is to join our IRC channel:
+
+        ``#munin on server irc.oftc.net``
+
+The main timezone of the channel is Europe+America.
+
+If you can explain your problem in a few clear sentences, without too
+much copy&paste, IRC is a good way to try to get help. If you do need
+to paste log files, configuration snippets, scripts and so on, please
+use a pastebin_.
+
+If the channel is all quiet, try again some time later, we do have
+lives, families and jobs to deal with also.
+
+You are more than welcome to just hang out, and while we don't mind
+the occational intrusion of the real world into the flow, keep it
+mostly on topic, and dont paste random links unless they are *really*
+spectacular and intelligent.
+
+.. _pastebin: https://gist.github.com/

=== added file 'doc/installation/index.rst'
--- doc/installation/index.rst	1970-01-01 00:00:00 +0000
+++ doc/installation/index.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,16 @@
+.. _install-index:
+
+====================
+ Munin installation
+====================
+
+This document explains how to get Munin onto your system, where to get
+help, and how to report bugs.
+
+.. toctree::
+
+   prerequisites.rst
+   install.rst
+   configuration.rst
+   help.rst
+   upgrade.rst

=== added file 'doc/installation/install.rst'
--- doc/installation/install.rst	1970-01-01 00:00:00 +0000
+++ doc/installation/install.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,177 @@
+==================
+ Installing Munin
+==================
+
+With open source software, you can choose to install binary packages
+or install from source-code. To install a package or install from
+source is a matter of personal taste. If you don't know which method
+too choose read the whole document and choose the method you are most
+comfortable with.
+
+Master and node
+===============
+
+Munin is split into two distinct roles.
+
+Node
+----
+
+The "munin node" is a daemon which runs on all servers being
+monitored.
+
+
+Master
+------
+
+The "munin master" connects to all munin nodes, collects data, and
+stores it in `RRD <http://oss.oetiker.ch/rrdtool/>`_
+
+You will need to install "munin-master" on the server which will
+collect data from all nodes, and graph the results. When starting with
+munin, it should be enough to install the munin master on one server.
+
+On the munin master, you will need a web server capable of running CGI
+or FastCGI. Apache HTTD should be suitable. Also reported to be
+working is nginx and lighttpd.
+
+Source or packages?
+===================
+
+Installing Munin on most relevant operating systems can usually be
+done with with the systems package manager, typical examples being:
+
+FreeBSD
+-------
+
+From source:
+
+.. code-block:: bash
+
+ cd /usr/ports/sysutils/munin-master && make install clean
+ cd /usr/ports/sysutils/munin-node && make install clean
+
+Binary packages:
+
+.. code-block:: bash
+
+ pkg_add -r munin-master
+ pkg_add -r munin-node
+
+Debian/Ubuntu
+-------------
+
+Munin is distributed with both Debian and Ubuntu.
+
+In order to get Munin up and running type
+
+.. code-block:: bash
+
+ sudo apt-get install munin-node
+
+on all nodes, and
+
+.. code-block:: bash
+
+ sudo apt-get install munin
+
+on the master.
+
+Please note that this might not be the latest version of Munin. On
+Debian you have the option of enabling "backports", which may give
+access to later versions of Munin.
+
+RedHat / CentOS / Fedora
+------------------------
+
+At time of writing, only the 1.x version of munin is available in
+`EPEL
+<http://dl.fedoraproject.org/pub/epel/6/SRPMS/repoview/munin.html>`_.
+
+If you want 2.x, your best option is probably to install from source.
+
+Other systems
+-------------
+
+On other systems, you are probably best off compiling your own code.
+See `Installing Munin from source`_.
+
+Installing Munin from source
+============================
+
+If there are no binary packages available for your system, or if you
+want to install Munin from source for other reasons, follow these
+steps:
+
+We recommend downloading a release tarball, which you can find on
+`sourceforge.net <http://sourceforge.net/projects/munin/files/stable/>`_.
+
+Alternatively, if you want to hack on Munin, you should clone our git
+repository by doing.
+
+.. code-block:: bash
+
+ git clone git://github.com/munin-monitoring/munin
+
+Please note that a git checkout will need some more build-dependencies
+than listed below, in particular the Python Docutils and Sphinx.
+
+Build dependencies on Debian / Ubuntu
+-------------------------------------
+
+In order to build Munin from source you need a number of packages
+installed. On a Debian or Ubuntu system these are:
+
+* perl
+* htmldoc
+* html2text
+* default-jdk
+
+Configuring and installing
+--------------------------
+
+Warning for NFS users
+~~~~~~~~~~~~~~~~~~~~~
+
+If you're using NFS please note that the "make install" process is
+slightly problematic in that it (Module::Build actually) writes files
+under $CWD. Since "make install" is usually run by root and root
+usually cannot write files on a NFS volume, this will fail. If you use
+NFS please install munin from /var/tmp, /tmp or some such to work
+around this.
+
+Running make
+~~~~~~~~~~~~
+
+There are make targets for node, master, documentation and man files.
+Generally you want to install everything on the master, and just the
+node and plugiuns on the nodes.
+
+- Edit Makefile.config to suit your needs.
+
+- Create the user "munin" with the primary group "munin".
+
+  The user needs no shell and no privileges. On most Linux systems the
+  munin user's shell is the nologin shell (it has different paths on
+  different systems - but the user still needs to be able to run cron
+  jobs.
+
+Node
+~~~~
+
+For the node, you need only the common parts, the node and the plugins.
+
+.. code-block:: bash
+
+ make
+ make install-common-prime install-node-prime install-plugins-prime
+
+
+Master
+~~~~~~
+
+For the master, this will install everything.
+
+.. code-block:: bash
+
+ make
+ make install

=== added file 'doc/installation/prerequisites.rst'
--- doc/installation/prerequisites.rst	1970-01-01 00:00:00 +0000
+++ doc/installation/prerequisites.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,68 @@
+===============
+ Prerequisites
+===============
+
+In order for you to install Munin you must have the following:
+
+Building munin
+==============
+
+In order to build munin, you need:
+
+* GNU Make — Please do not attempt to use any other make.
+
+* A reasonable Perl 5 (Version 5.8 or newer)
+
+* Perl modules: Module::Build
+
+Developers / packagers need
+
+* Test::MockModule
+* Test::MockObject
+* Test::Pod::Coverage
+* Test::Perl::Critic 1.096 or later
+* Test::Exception
+* Directory::Scratch (err, wherefrom?)
+
+In order to build the documentation, you need:
+* sphinx
+
+Running munin
+============
+
+In order to run munin, you need:
+
+* A reasonable perl 5 (Version 5.8 or newer)
+
+The munin node needs:
+
+* Perl modules
+
+  * Net::Server
+  * Net::Server::Fork
+  * Time::HiRes
+  * Net::SNMP (Optional, if you want to use SNMP plugins)
+
+* Java JRE (Optional, if you want to use java plugins)
+* Anything the separate plugins may need. These have diverse
+  requirements, not documented here.
+
+The munin master needs
+
+* Perl modules:
+
+    * CGI::Fast
+    * Digest::MD5,
+    * File\::Copy::Recursive
+    * Getopt::Long
+    * HTML::Template
+    * IO::Socket::INET6
+    * Log::Log4perl 1.18 or later
+    * Net::SSLeay (Optional, if you want to use SSL/TLS)
+    * Params::Validate
+    * Storable
+    * Text::Balanced
+    * Time::HiRes
+    * TimeDate
+
+* A web server capable of CGI or FastCGI

=== added file 'doc/installation/upgrade.rst'
--- doc/installation/upgrade.rst	1970-01-01 00:00:00 +0000
+++ doc/installation/upgrade.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,19 @@
+=================================
+ Upgrading Munin from 1.x to 2.x
+=================================
+
+This is a compilation of items you need to pay attention to when
+upgrading from Munin 1.x to munin 2.x
+
+FastCGI
+=======
+
+Munin graphing is now done with FastCGI.
+
+Munin HTML generation is optionally done with FastCGI.
+
+Logging
+=======
+
+The web server needs write access to the munin-cgi-html and
+munin-cgi-graph logs.

=== added directory 'doc/master'
=== added file 'doc/master/index.rst'
--- doc/master/index.rst	1970-01-01 00:00:00 +0000
+++ doc/master/index.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,18 @@
+.. _master-index:
+
+==================
+ The Munin master
+==================
+
+The munin master is responsible for gathering data from munin nodes.
+It stores this data in RRD, and graphs them on request.
+
+The munin master consists of the following components:
+
+.. toctree::
+
+   munin-cron.rst
+   munin-update.rst
+   munin-limits.rst
+   munin-html.rst
+   rrdcached.rst

=== added file 'doc/master/munin-cron.rst'
--- doc/master/munin-cron.rst	1970-01-01 00:00:00 +0000
+++ doc/master/munin-cron.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,14 @@
+.. _munin-cron:
+
+============
+ munin-cron
+============
+
+"munin-cron" runs the following programs, in the given order:
+
+1. :ref:`munin-update`
+2. :ref:`munin-limits`
+3. :ref:`munin-html` (unless configured to run from CGI)
+
+Unless the munin master is configured otherwise, "munin-cron" should
+run every 5 minutes.

=== added file 'doc/master/munin-html.rst'
--- doc/master/munin-html.rst	1970-01-01 00:00:00 +0000
+++ doc/master/munin-html.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,13 @@
+.. _munin-html:
+
+============
+ munin-html
+============
+
+munin-html is one of the munin master components run from the
+:ref:`munin-cron` script.
+
+This script is responsible for generating static HTML pages.  
+
+If "html_strategy cgi" is set in munin.conf, munin-html will assume
+HTML pages are generated by munin-cgi-html, and exit silently.

=== added file 'doc/master/munin-limits.rst'
--- doc/master/munin-limits.rst	1970-01-01 00:00:00 +0000
+++ doc/master/munin-limits.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,13 @@
+.. _munin-limits:
+
+==============
+ munin-limits
+==============
+
+"munin-limits" is one of the processes regularly run from the
+:ref:`munin-cron` script.
+
+It reads the last collected values for each plugin from the RRD files,
+and compares them to the plugin's warning and critical values (if
+any). If the limits are breached, it sends an event to any configured
+contacts.

=== added file 'doc/master/munin-update.rst'
--- doc/master/munin-update.rst	1970-01-01 00:00:00 +0000
+++ doc/master/munin-update.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,17 @@
+.. _munin-update:
+
+==============
+ munin-update
+==============
+
+munin-update is the primary Munin component. It is run from the
+:ref:`munin-cron` script.
+
+This script is responsible for contacting all the agents (munin-nodes)
+and collecting their data. Upon fetching the data, munin-update stores
+everything in RRD files - one RRD files for each field in each plugin.
+
+Running munin-update with the --debug flag will often give plenty of
+hints on what might be wrong.
+
+munin-update is a component in the Munin server.

=== added file 'doc/master/rrdcached.rst'
--- doc/master/rrdcached.rst	1970-01-01 00:00:00 +0000
+++ doc/master/rrdcached.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,116 @@
+.. _munin-master-rrdcached:
+
+=========================================
+ Scaling the munin master with rrdcached
+=========================================
+
+When the master grows big, and has a lot of nodes, there is a risk of
+disk IO becoming a bottleneck.
+
+To reduce this disk IO, you can use the RRD Cache Daemon.
+
+This will spool RRD changes in a queue, and flush changes on demand,
+and periodically. This will replace lots of random writes with a much
+smaller amount of sequential writes.
+
+Configuring rrdcached
+=====================
+
+Parameters
+----------
+
+RRDCached writes the spool data every 5 mintes by default. This is the
+same as the munin master. To have an effect, change the flushing
+intervals to allow more data to be spooled. Use the following
+parameters, and tune to your liking:
+
++---------+-----------------------------------------------------+
+| -w 1800 | Wait 30 minutes before writing data                 |
++---------+-----------------------------------------------------+
+| -z 1800 | Delay writes by a random factor of up to 30 minutes |
+|         | (this should be equal to, or lower than, "-w")      |
++---------+-----------------------------------------------------+
+| -f 3600 | Flush all data every hour                           |
++---------+-----------------------------------------------------+
+
+Example
+-------
+
+Create a directory for the rrdcached journal, and have the "munin"
+user own it. (in this example: /var/lib/munin/rrdcached-journal).
+
+Set up a separate RRDCached instance, run by the munin user. The
+following command starts an RRDCached instance, and can be added to
+/etc/rc.local.
+
+.. code-block:: bash
+
+  sudo -u munin /usr/bin/rrdcached \
+    -p /run/munin/rrdcached.pid \
+    -B -b /var/lib/munin/ \
+    -F -j /var/lib/munin/rrdcached-journal/ \
+    -m 0660 -l unix:/run/munin/rrdcached.sock \
+    -w 1800 -z 1800 -f 3600
+
+Note: While testing, add "-g" to the command line to prevent rrdcached
+from forking into the background.
+
+The munin grapher also needs write access to this socket, in order for
+it to tell the RRDCached to flush data needed for graphing. If you run
+munin with CGI graphing, you will need to give the web server access.
+For a common setup, run the following command, as root, after starting
+rrdcached:
+
+.. code-block:: bash
+
+ chgrp www-data /run/munin/rrdcached.sock
+
+Recommended: If you have systemd installed, use a systemd service. If
+you have upstart installed, write a daemon job configuration file. If
+you use systemd, you can add "-g" to the rrdcached command line.
+
+Configuring munin to use  rrdcached
+===================================
+
+To enable rrdcached on the munin master, you will need to set the
+"rrdcached_socket" line in /etc/munin/munin.conf
+
+::
+
+  rrdcached_socket=/run/munin/rrdcached.sock
+
+
+Is it working?
+==============
+
+If all goes well, you should see the following:
+
+Munin logging
+-------------
+
+There should be no messages regarding rrdcached in
+/var/log/munin/munin-update.log. 
+
+
+On failure to connect, there will be log lines like:
+
+::
+
+ 2012/06/26 18:56:12 [WARN] RRDCached feature ignored: rrdcached socket not writable
+
+…and you should then check for permissions problems.
+
+RRDCached spool
+---------------
+
+The rrdcached spool file should be in
+/var/lib/munin/rrdcached-journal/, and it should grow for each run of
+munin-update until it hits the flush time. The file looks like:
+
+::
+
+  /var/lib/munin/rrdcached-journal/rrd.journal.1340869388.141124
+
+For a munin master with 200 nodes, this could well grow to 100MiB,
+depending on the number of plugins, and the spool file time
+parameters.

=== added directory 'doc/plugin'
=== added file 'doc/plugin/aggregate.rst'
--- doc/plugin/aggregate.rst	1970-01-01 00:00:00 +0000
+++ doc/plugin/aggregate.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,8 @@
+.. _aggregate:
+
+==================
+ Borrowing data
+==================
+
+It is possible to exchange datapoints between plugins, or construct
+entirely new plugins based on purely borrowed data.

=== added file 'doc/plugin/index.rst'
--- doc/plugin/index.rst	1970-01-01 00:00:00 +0000
+++ doc/plugin/index.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,13 @@
+.. _plugin-index:
+
+==================
+ The Munin plugin
+==================
+
+This document explains how munin plugins work, how to install,
+configure, debug, and how to write new plugins.
+
+.. toctree::
+
+   aggregate.rst
+   reference.rst

=== added file 'doc/plugin/reference.rst'
--- doc/plugin/reference.rst	1970-01-01 00:00:00 +0000
+++ doc/plugin/reference.rst	2012-07-23 03:02:19 +0000
@@ -0,0 +1,134 @@
+==================
+ Plugin reference
+==================
+
+Fields
+======
+
+On a configuration run, the plugin is called with the argument "config". The
+following fields are used.
+
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| Field              | Value            | type     | Description                              | See also         | Default |
++====================+==================+==========+==========================================+==================+=========+
+| graph_title        | string           | required | Sets the title of the graph              |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| graph_args         | string           | optional | Arguments for the rrd grapher. This is   | rrdgraph_        |         |
+|                    |                  |          | used to control how the generated graph  |                  |         |
+|                    |                  |          | looks, and how values are interpreted or |                  |         |
+|                    |                  |          | presented.                               |                  |         |
+|                    |                  |          |                                          |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| graph_vlabel       | string           | optional | Label for the vertical axis of the graph |                  |         |
+|                    |                  |          |                                          |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| graph_category     | lower case       | optional | Category used to sort the graph on the   |                  | misc    |
+|                    | string, no       |          | generated index web page.                |                  |         |
+|                    | whitespace       |          |                                          |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| graph_info         | html text        | optional | Additional text for the generated graph  |                  |         |
+|                    |                  |          | web page                                 |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| graph_scale        | yes|no           | optional | If "yes", the generated graph will be    |                  | no      |
+|                    |                  |          | scaled to the uppper and lower values of |                  |         |
+|                    |                  |          | the datapoints within the graph.         |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| graph_order        | space separated  | optional | Ensures that the listed datapoints are   | :ref:`aggregate` |         |
+|                    | list of          |          | displayed in order. Any additional       |                  |         |
+|                    | graph.datapoints |          | datapoints are added in the order of     |                  |         |
+|                    |                  |          | appearance after datapoitns appearing on |                  |         |
+|                    |                  |          | this list.                               |                  |         |
+|                    |                  |          |                                          |                  |         |
+|                    |                  |          | This field is also used for "borrowing", |                  |         |
+|                    |                  |          | which is the practice of taking          |                  |         |
+|                    |                  |          | datapoints from other graphs.            |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| datapoint.label    | lower case       | required | The label used in the graph for this     |                  |         |
+|                    | string, no       |          | field                                    |                  |         |
+|                    | whitespace       |          |                                          |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| datapoint.info     | html text        | optional | Additional html text for the generated   |                  |         |
+|                    |                  |          | graph web page, used in the field        |                  |         |
+|                    |                  |          | description table                        |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| datapoint.warning  | integer, or      | optional | This field defines a threshold value or  |                  |         |
+|                    | integer:integer  |          | range. If the field value above the      |                  |         |
+|                    | (signed)         |          | defined warning value, or outside the    |                  |         |
+|                    |                  |          | range, the service is considered to be in|                  |         |
+|                    |                  |          | a "warning" state.                       |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| datapoint.critical | integer, or      | optional | This field defines a threshold value or  |                  |         |
+|                    | integer:integer  |          | range. If the field value is above the   |                  |         |
+|                    | (signed)         |          | defined critical value, or outside the   |                  |         |
+|                    |                  |          | range, the service is considered to be in|                  |         |
+|                    |                  |          | a "critical" state.                      |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| datapoint.graph    | yes|no           | optional | Determines if this datapoint should be   |                  | yes     |
+|                    |                  |          | visible in the generated graph.          |                  |         |
+|                    |                  |          |                                          |                  |         |
+|                    |                  |          |                                          |                  |         |
+|                    |                  |          |                                          |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| datapoint.cdef     | CDEF statement   | optional | A CDEF statement is a Reverse Polish     | cdeftutorial_    |         |
+|                    |                  |          | Notation statement used to construct a   |                  |         |
+|                    |                  |          | datapoint from other datapoints.         |                  |         |
+|                    |                  |          |                                          |                  |         |
+|                    |                  |          | This is commonly used to calculate       |                  |         |
+|                    |                  |          | percentages.                             |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+| datapoint.draw     | AREA, LINE,      |          | Determines how the graph datapoints are  | rrdgraph_        | LINE    |
+|                    | LINE[n], STACK,  |          | displayed in the graph. The "LINE" takes |                  |         |
+|                    | AREASTACK,       |          | an optional width suffix, commonly       |                  |         |
+|                    | LINESTACK,       |          | "LINE1", "LINE2", etc…                   |                  |         |
+|                    | LINE[n]STACK     |          | The *STACK values are specific to munin  |                  |         |
+|                    |                  |          | and makes the first a LINE, LINE[n] or   |                  |         |
+|                    |                  |          | AREA datasource, and the rest as STACK.  |                  |         |
++--------------------+------------------+----------+------------------------------------------+------------------+---------+
+
+On a data fetch run, the plugin is called with no arguments. the following
+fields are used.
+
++-----------------+-----------------------+----------+------------------+------+------------+
+| Field           | Value                 | type     | Description      | See  | Default    |
+|                 |                       |          |                  | also |            |
++=================+=======================+==========+==================+======+============+
+| datapoint.value | integer, scientific   | required | The value to be  |      | No default |
+|                 | notation, or "U" (may |          | graphed.         |      |            |
+|                 | be signed)            |          |                  |      |            |
+|                 |                       |          |                  |      |            |
++-----------------+-----------------------+----------+------------------+------+------------+
+
+Example
+=======
+
+This is an example of the plugin fields used with the "df" plugin. The
+"munin-run" command is used to run the plugin from the command line.
+
+Configuration run
+-----------------
+
+::
+
+ # munin-run df config
+ graph_title Filesystem usage (in %)
+ graph_args --upper-limit 100 -l 0
+ graph_vlabel %
+ graph_category disk
+ graph_info This graph shows disk usage on the machine.
+ _dev_hda1.label /
+ _dev_hda1.info / (ext3) -> /dev/hda1
+ _dev_hda1.warning 92
+ _dev_hda1.critical 98
+
+Data fetch run
+--------------
+
+::
+
+ # munin-run df
+ _dev_hda1.value 83
+
+
+.. _cdeftutorial: http://oss.oetiker.ch/rrdtool/tut/cdeftutorial.en.html
+
+.. _rrdgraph: http://oss.oetiker.ch/rrdtool/doc/rrdgraph_graph.en.html

=== modified file 'master/_bin/munin-cron.in'
--- master/_bin/munin-cron.in	2012-03-19 15:17:42 +0000
+++ master/_bin/munin-cron.in	2012-07-23 03:02:19 +0000
@@ -12,3 +12,8 @@
 @@LIBDIR@@/munin-limits $@ 
 
 nice @@LIBDIR@@/munin-html $@ || exit 1
+
+# Now the result of munin-html is needed for munin-graph.
+# It is always lauched, but will be a noop if 
+# graph_strategy is "cgi" 
+nice @@LIBDIR@@/munin-graph $@ || exit 1

=== modified file 'master/_bin/munin-graph.in'
--- master/_bin/munin-graph.in	2012-06-21 00:29:37 +0000
+++ master/_bin/munin-graph.in	2012-07-23 03:02:19 +0000
@@ -54,8 +54,7 @@
 
 my @params = @ARGV;
 
-push @params, "--no-fork"; # FastCgi forks for us
-push @params, "--skip-locking", "--skip-stats", "--nolazy";
+push @params, "--no-fork"; # We do *not* want to fork. Perf -> FastCGI
 push @params, "--log-file", $logfile;
 
 my $config = graph_startup(\@params);
@@ -63,6 +62,12 @@
 logger_open($config->{'logdir'});
 logger_debug() if $config->{debug} or defined($ENV{CGI_DEBUG});
 
+if (! graph_check_cron() ) {
+	# Should not be launched from cron.
+	INFO "[INFO] graphing is cgi, do nothing";	
+	exit 0;
+}
+
 # BEGIN FAST-CGI LOOP:
 my $nb_request = 0;
 my $nb_request_max = 0;

=== modified file 'master/lib/Munin/Master/GraphOld.pm'
--- master/lib/Munin/Master/GraphOld.pm	2012-06-21 00:29:37 +0000
+++ master/lib/Munin/Master/GraphOld.pm	2012-07-23 03:02:19 +0000
@@ -333,7 +333,7 @@
 sub graph_check_cron {
 
     # Are we running from cron and do we have matching graph_strategy
-    if (&munin_get($config, "graph_strategy", "cron") ne "cron" and $cron) {
+    if (&munin_get($config, "graph_strategy", "cgi") ne "cron" and $cron) {
 
         # Strategy mismatch: We're run from cron, but munin.conf says
         # we use dynamic graph generation

=== modified file 'master/lib/Munin/Master/Node.pm'
--- master/lib/Munin/Master/Node.pm	2012-06-21 00:29:37 +0000
+++ master/lib/Munin/Master/Node.pm	2012-07-23 03:02:19 +0000
@@ -508,7 +508,9 @@
         }
     }
     if ($errors) {
-	WARN "[WARNING] $errors lines had errors while $correct lines were correct in data from 'fetch $plugin' on $nodedesignation";
+	my $percent = ($errors / ($errors + $correct)) * 100; 
+	$percent = sprintf("%.2f", $percent);
+	WARN "[WARNING] $errors lines had errors while $correct lines were correct ($percent%) in data from 'fetch $plugin' on $nodedesignation";
     }
 
     return %values;

=== modified file 'plugins/lib/Munin/Plugin.pm'
--- plugins/lib/Munin/Plugin.pm	2012-06-21 00:29:37 +0000
+++ plugins/lib/Munin/Plugin.pm	2012-07-23 03:02:19 +0000
@@ -167,6 +167,9 @@
     # Replace remaining illegals with _
     $name =~ s/[^A-Za-z0-9_]/_/g;
 
+    # "root" is *not* allowed due to a 2.0 bug
+    $name = "__root" if $name eq "root";
+
     return $name;
 }
 

=== modified file 'plugins/node.d.linux/if_err_.in'
--- plugins/node.d.linux/if_err_.in	2012-05-13 18:01:59 +0000
+++ plugins/node.d.linux/if_err_.in	2012-07-23 03:02:19 +0000
@@ -65,7 +65,7 @@
 
 if [ "$1" = "config" ]; then
     echo "graph_order rcvd trans"
-    echo "graph_title $INTERFACE errors, drops, and collisions"
+    echo "graph_title Interface errors on $INTERFACE"
     echo 'graph_args --base 1000'
     echo 'graph_vlabel packets in (-) / out (+) per ${graph_period}'
     echo 'graph_category network'

=== modified file 'plugins/node.d/munin_stats.in'
--- plugins/node.d/munin_stats.in	2012-06-21 00:29:37 +0000
+++ plugins/node.d/munin_stats.in	2012-07-23 03:02:19 +0000
@@ -63,8 +63,6 @@
     }
     print "update.warning 240\n";
     print "update.critical 285\n";
-    print "graph.warning 240\n";
-    print "graph.critical 285\n";
     exit 0;
 }
 

=== modified file 'plugins/plugin.sh.in'
--- plugins/plugin.sh.in	2012-03-19 15:17:42 +0000
+++ plugins/plugin.sh.in	2012-07-23 03:02:19 +0000
@@ -9,8 +9,9 @@
     # very much still break munin.
     #
     # usage: name="$(clean_fieldname "$item")"
-    # 
-    echo "$@" | sed -e 's/^[^A-Za-z_]/_/' -e 's/[^A-Za-z0-9_]/_/g'
+
+    # "root" is *not* allowed due to a 2.0 bug
+    echo "$@" | sed -e 's/^[^A-Za-z_]/_/' -e 's/[^A-Za-z0-9_]/_/g' -e 's/^root$/__root/'
 }