Permalink
Browse files

Merge branch 'devel'

  • Loading branch information...
2 parents 3a145cd + 7b02885 commit 9e68cd51d5db043c2fafaf9c55c5660f0b25b208 @steveschnepp steveschnepp committed Jul 24, 2012
Showing with 1,827 additions and 319 deletions.
  1. +2 −0 .gitignore
  2. +1 −0 .travis.yml
  3. +34 −23 Makefile
  4. +6 −3 Makefile.config
  5. +91 −2 doc/conf.py
  6. +1 −0 doc/documentation/index.rst
  7. +3 −0 doc/example/{plugin → graph}/aggregate.rst
  8. BIN doc/example/{plugin → graph}/aggregate/aggregate_current.png
  9. BIN doc/example/{plugin → graph}/aggregate/aggregate_power.png
  10. BIN doc/example/{plugin → graph}/aggregate/ups-5a_current.png
  11. BIN doc/example/{plugin → graph}/aggregate/ups-5a_power.png
  12. +2 −1 doc/example/index.rst
  13. +6 −0 doc/example/webserver/apache-virtualhost.rst
  14. +8 −2 doc/example/webserver/lighttpd.rst
  15. +18 −9 doc/example/webserver/nginx.rst
  16. +6 −4 doc/index.rst
  17. +1 −1 doc/installation/configuration.rst
  18. +1 −0 doc/installation/index.rst
  19. +46 −5 doc/master/index.rst
  20. +0 −14 doc/master/munin-cron.rst
  21. +0 −13 doc/master/munin-html.rst
  22. +0 −13 doc/master/munin-limits.rst
  23. +0 −17 doc/master/munin-update.rst
  24. +1 −1 doc/master/rrdcached.rst
  25. +17 −4 doc/node/async.rst
  26. +17 −3 doc/node/index.rst
  27. +0 −50 doc/node/munin-node.rst
  28. +0 −111 doc/node/reference.rst
  29. +0 −8 doc/plugin/aggregate.rst
  30. +14 −4 doc/plugin/index.rst
  31. +120 −0 doc/plugin/supersampling.rst
  32. +83 −0 doc/plugin/use.rst
  33. +45 −0 doc/reference/directories.rst
  34. +37 −0 doc/reference/index.rst
  35. +74 −0 doc/reference/munin-async.rst
  36. +58 −0 doc/reference/munin-asyncd.rst
  37. +94 −0 doc/reference/munin-cgi-graph.rst
  38. +73 −0 doc/reference/munin-cgi-html.rst
  39. +32 −0 doc/reference/munin-check.rst
  40. +52 −0 doc/reference/munin-cron.rst
  41. +147 −0 doc/reference/munin-graph.rst
  42. +61 −0 doc/reference/munin-html.rst
  43. +79 −0 doc/reference/munin-limits.rst
  44. +176 −0 doc/reference/munin-node.conf.rst
  45. +107 −0 doc/reference/munin-node.rst
  46. +74 −0 doc/reference/munin-run.rst
  47. +68 −0 doc/reference/munin-update.rst
  48. +115 −0 doc/reference/munin.conf.rst
  49. +16 −1 doc/{plugin/reference.rst → reference/plugin.rst}
  50. +4 −1 master/_bin/munin-cgi-graph.in
  51. +4 −1 master/_bin/munin-graph.in
  52. +4 −3 master/lib/Munin/Master/GraphOld.pm
  53. +4 −6 master/lib/Munin/Master/HTMLConfig.pm
  54. +3 −2 master/lib/Munin/Master/UpdateWorker.pm
  55. +3 −1 master/static/dynazoom.html
  56. +1 −1 node/sbin/munin-node
  57. +3 −4 plugins/node.d.debug/multigraph_complex
  58. 0 plugins/{node.d → node.d.java}/jmx_.in
  59. 0 plugins/{node.d → node.d.java}/jmx_tomcat_dbpools.in
  60. +1 −1 plugins/node.d.linux/df.in
  61. +3 −3 plugins/node.d.linux/df_inode.in
  62. +1 −1 plugins/node.d.linux/if_err_.in
  63. +3 −3 plugins/node.d/ifx_concurrent_sessions_.in
  64. +2 −0 plugins/node.d/nginx_request.in
  65. +2 −0 plugins/node.d/nginx_status.in
  66. +3 −3 plugins/node.d/slony_lag_.in
View
@@ -1,3 +1,5 @@
*/Build
*/_build/
*/blib/
+build-*-stamp
+build/
View
@@ -1,5 +1,6 @@
language: perl
perl:
+ - "5.16"
- "5.14"
- "5.10"
branches:
View
@@ -12,20 +12,25 @@ CONFIG = Makefile.config
include $(DEFAULTS)
include $(CONFIG)
+ifeq ($(JCVALID),yes)
+JAVA_BUILD=build-plugins-java
+JAVA_INSTALL=install-plugins-java
+JAVA_PLUGINS=plugins/node.d.java/*
+endif
+
RELEASE := $(shell $(CURDIR)/getversion)
INSTALL_PLUGINS ?= "auto manual contrib snmpauto"
INSTALL := ./install-sh
DIR := $(shell /bin/pwd | sed 's/^.*\///')
INFILES := $(shell find . -name '*.in' | sed 's/\.\/\(.*\)\.in$$/build\/\1/')
INFILES_MASTER := $(shell find master -name '*.in' | sed 's/\(.*\)\.in$$/build\/\1/')
CLASSFILES := $(shell find plugins/javalib -name '*.java' | sed 's/\(.*\)\.java$$/build\/\1.class/')
-PLUGINS := $(wildcard plugins/node.d.$(OSTYPE)/* plugins/node.d/*)
+PLUGINS := $(wildcard plugins/node.d.$(OSTYPE)/* plugins/node.d/* $(JAVA_PLUGINS))
MANCENTER := "Munin Documentation"
MAN8 := master/_bin/munin-update master/_bin/munin-limits master/_bin/munin-html master/_bin/munin-graph
PODMAN8 := build/master/doc/munin-cron master/doc/munin master/doc/munin-check
PODMAN5 := build/master/doc/munin.conf node/doc/munin-node.conf
-
.PHONY: install install-pre install-master-prime install-node-prime install-node-pre install-common-prime install-doc install-man \
build build-common-prime build-common-pre build-doc \
source_dist \
@@ -38,11 +43,12 @@ PODMAN5 := build/master/doc/munin.conf node/doc/munin-node.conf
.SUFFIXES: .java .class
-.java.class:
- cd plugins/javalib && $(JC) $(JFLAGS) $(subst plugins/javalib/,,$*.java)
-
+# This HAS to be the 1st rule
default: build
+.java.class:
+ $(JC) -sourcepath plugins/javalib -d build/plugins/javalib $(JFLAGS) plugins/javalib/$(subst plugins/javalib/,,$*.java)
+
uninstall:
echo "Uninstall is not implemented yet"
@@ -58,11 +64,7 @@ tags:
######################################################################
-ifeq ($(JCVALID),yes)
-install: install-master-prime install-common-prime install-node-prime install-plugins-prime install-plugins-java install-man install-async-prime
-else
-install: install-master-prime install-common-prime install-node-prime install-plugins-prime install-man install-async-prime
-endif
+install: install-master-prime install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-man install-async-prime
install-pre: Makefile Makefile.config
@$(CHECKUSER)
@@ -104,8 +106,8 @@ install-master-prime: $(INFILES_MASTER) install-pre install-master
$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
done
- $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/
- $(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/
+ $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
+ $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/
test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
@@ -130,6 +132,10 @@ install-master-prime: $(INFILES_MASTER) install-pre install-master
install-node-plugins: install-plugins-prime
# Some HP-UX plugins needs *.adv support files in LIBDIR
+ifneq ($(OSTYPE),hp-ux)
+HPUXONLY=true ||
+endif
+
install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
@$(CHECKGROUP)
@@ -149,13 +155,20 @@ install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \
fi \
done
- -mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
+ $(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
$(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
$(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
install-plugins-java: build-plugins-java
mkdir -p $(JAVALIBDIR)
$(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/
+ mkdir -p $(LIBDIR)/plugins
+ for p in build/plugins/node.d.java/*; do \
+ if test -f "$$p" ; then \
+ echo Installing $$p; \
+ $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \
+ fi \
+ done
#TODO:
# configure plugins. Or not. Better done under the direction of the installer
@@ -199,11 +212,7 @@ install-doc: build-doc
# Dummy rule to enable parallel building
infiles: $(INFILES)
-ifeq ($(JCVALID),yes)
-build: infiles build-master build-common-prime build-node build-plugins build-plugins-java build-man
-else
-build: infiles build-master build-common-prime build-node build-plugins build-man
-endif
+build: infiles build-master build-common-prime build-node build-plugins $(JAVA_BUILD) build-man
build/%: %.in
@echo "$< -> $@"
@@ -304,9 +313,12 @@ build-plugins-java: build/plugins/javalib/munin-jmx-plugins.jar
build/plugins/javalib/munin-jmx-plugins.jar: $(CLASSFILES)
cd build/plugins/javalib && $(JAR) cf munin-jmx-plugins.jar org/munin/plugin/jmx
-build/%.class: %.class
- mkdir -p build/`dirname $*.class`
- cp $**.class build/`dirname $*.class`
+build-java-stamp:
+ mkdir -p build/plugins/javalib
+ touch build-java-stamp
+
+build/%.class: %.class build-java-stamp
+ @echo "Compiling $*"
######################################################################
# DIST RULES
@@ -355,6 +367,7 @@ endif
-rm -f build-stamp
-rm -f build-doc-stamp
-rm -f build-man-stamp
+ -rm -f build-java-stamp
-rm -rf t/install
-rm -f dists/redhat/munin.spec
@@ -401,8 +414,6 @@ build-%: %/Build
cd $* && $(PERL) Build
build-common: common/Build
- cd common && $(PERL) Build && rm -f common/blib/lib/Munin/Common/Defaults.pm && true
-
# BUG: the Build script writes files under PWD when it does "install"
# can't seem to find a way to persuade it to write otherwhere.
View
@@ -75,7 +75,7 @@ JAVARUN := /usr/bin/java
# this is needed in order to be able to install
# java libraries in a custom location. Many distrubutions
# enforce a spesific location for java libraries.
-JAVALIBDIR:= $(LIBDIR)
+JAVALIBDIR = $(LIBDIR)
# A modern (posix) shell. We're not looking for arrays, but $() and
@@ -96,7 +96,10 @@ PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
PERLLIB = $(DESTDIR)$(PERLSITELIB)
# Client only - Install plugins for this architecture
-OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]' | cut -f 1 -d _)
+# the LANG=C makes tr work as expected, not regarding any locale it
+# isn't done globally to enable users to have as much localized
+# errors as possible
+OSTYPE := $(shell uname | LANG=C tr '[A-Z]' '[a-z]' | cut -f 1 -d _)
# How to figure out the hostname. (Only used in default configuration
# files)
@@ -153,7 +156,7 @@ CHGRP := chgrp
# Java compiler stuff - only needed on the buildhost
JC := javac
-JFLAGS := -g -source 1.5 -target 1.5
+JFLAGS := -g -source 1.5 -target 1.5 -Xlint
JAR := jar
# Check if the java compiler works
View
@@ -214,8 +214,97 @@
# 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 <ssm@fnord.no>'], 1)
+ ('reference/munin-async',
+ 'munin-async',
+ 'Munin async client',
+ ['Steve Schnepp'],
+ 1),
+ ('reference/munin-asyncd',
+ 'munin-asyncd',
+ 'Munin async daemon',
+ ['Steve Schnepp'],
+ 1),
+ ('reference/munin-cgi-graph',
+ 'munin-cgi-graph',
+ 'Munin CGI grapher',
+ ['Steve Schnepp'],
+ 1),
+ ('reference/munin-cgi-html',
+ 'munin-cgi-html',
+ 'Munin CGI HTML generator',
+ ['Steve Schnepp'],
+ 1),
+ ('reference/munin-check',
+ 'munin-check',
+ 'A program to fix permissions of munin directories and files',
+ ['Matthias Schmitz'],
+ 1),
+ ('reference/munin-cron',
+ 'munin-cron',
+ 'Munin cron script',
+ ['Audun Ytterdal',
+ 'Jimmy Olsen'],
+ 1),
+ ('reference/munin-graph',
+ 'munin-graph',
+ 'Create graphs from RRD files',
+ ['Audun Ytterdal',
+ 'Jimmy Olsen',
+ 'Nicolai Langfeldt',
+ 'Steve Schnepp'],
+ 1),
+ ('reference/munin-html',
+ 'munin-html',
+ 'Create HTML pages',
+ ['Knut Haugen',
+ 'Steve Schnepp',
+ 'Audun Ytterdal',
+ 'Jimmy Olsen'],
+ 1),
+ ('reference/munin-limits',
+ 'munin-limits',
+ 'A program to check for any off-limit values',
+ ['Audun Ytterdal',
+ 'Jimmy Olsen',
+ 'Knut Haugen',
+ 'Nikolai Langfeldt'],
+ 1),
+ ('reference/munin-node',
+ 'munin-node',
+ 'A daemon which gathers information from the local node',
+ ['Audun Ytterdal',
+ 'Jimmy Olsen',
+ 'Matthew Boyle',
+ 'Tore Anderson'],
+ 1),
+ ('reference/munin-run',
+ 'munin-run',
+ 'A program to run munin plugins from the command line',
+ ['Audun Ytterdal',
+ 'Jimmy Olsen',
+ 'Tore Anderson',
+ 'Nikolai Langfeldt'],
+ 1),
+ ('reference/munin-update',
+ 'munin-update',
+ 'A program to gather data from machines running munin-node or munin-async',
+ ['Audun Ytterdal',
+ 'Jimmy Olsen',
+ u'Kjell Magne Øierud',
+ 'Knut Haugen',
+ 'Nikolai Langfeldt',
+ 'Tore Anderson'],
+ 1),
+ ('reference/munin.conf',
+ 'munin.conf',
+ 'Configuration file for the munin master',
+ [],
+ 5),
+ ('reference/munin-node.conf',
+ 'munin-node.conf',
+ 'Configuration file for the munin node',
+ [],
+ 5),
]
# If true, show URL addresses after external links.
@@ -7,5 +7,6 @@
This document is rather meta, it explains how to document Munin.
.. toctree::
+ :maxdepth: 2
nomenclature.rst
@@ -1,4 +1,7 @@
.. _example-plugin-aggregate:
+.. index::
+ single: Aggregating munin plugins
+ pair: plugin; aggregate
==============================
Graph aggregation by example
View
@@ -7,8 +7,9 @@ Examples
Examples of munin and related configuration are gathered here.
.. toctree::
+ :maxdepth: 2
webserver/apache-virtualhost.rst
webserver/lighttpd.rst
webserver/nginx.rst
- plugin/aggregate.rst
+ graph/aggregate.rst
@@ -14,6 +14,9 @@ Munin configuration
This example assumes the following configuration in
/etc/munin/munin.conf
+.. index::
+ pair: example; munin.conf
+
::
# graph_strategy should be commented out, if present
@@ -24,6 +27,9 @@ Virtualhost configuration
Add a new virtualhost, using the following example:
+.. index::
+ pair: example; apache httpd configuration
+
::
<VirtualHost *:80>
@@ -17,6 +17,9 @@ Munin configuration
This example assumes the following configuration in
/etc/munin/munin.conf
+.. index::
+ pair: example; munin.conf
+
::
# graph_strategy should be commented out, if present
@@ -25,11 +28,14 @@ This example assumes the following configuration in
Webserver configuration
=======================
+.. index::
+ pair: example; lighttpd 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",
@@ -41,7 +47,7 @@ Webserver configuration
"check-local" => "disable",
))
)
-
+
url.rewrite-repeat += (
"/munin/(.*)" => "/cgi-bin/munin-cgi-html/$1",
"/cgi-bin/munin-cgi-html$" => "/cgi-bin/munin-cgi-html/",
Oops, something went wrong.

0 comments on commit 9e68cd5

Please sign in to comment.