Author: baggins Date: Mon Nov 30 16:54:36 2009 GMT Module: packages Tag: HEAD ---- Log message: - 1.4.0
---- Files affected: packages/munin: munin-Makefile.patch (1.7 -> 1.8) , munin-plugins.patch (1.26 -> 1.27) , munin-separate-configs.patch (1.1 -> 1.2) , munin-templatedir.patch (1.2 -> 1.3) , munin.spec (1.72 -> 1.73) ---- Diffs: ================================================================ Index: packages/munin/munin-Makefile.patch diff -u packages/munin/munin-Makefile.patch:1.7 packages/munin/munin-Makefile.patch:1.8 --- packages/munin/munin-Makefile.patch:1.7 Wed Dec 3 23:59:24 2008 +++ packages/munin/munin-Makefile.patch Mon Nov 30 17:54:30 2009 @@ -1,29 +1,27 @@ -diff -Naur munin-1.3.4/Makefile munin-1.3.4-p/Makefile ---- munin-1.3.4/Makefile Sat Mar 8 07:50:16 2008 -+++ munin-1.3.4-p/Makefile Fri Apr 4 11:11:10 2008 -@@ -36,6 +36,7 @@ - mkdir -p $(CONFDIR)/templates +--- munin-1.4.0/Makefile~ 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/Makefile 2009-11-30 14:33:15.977700738 +0100 +@@ -77,6 +77,7 @@ + mkdir -p $(CONFDIR)/munin-conf.d mkdir -p $(LIBDIR) mkdir -p $(BINDIR) + mkdir -p $(SBINDIR) mkdir -p $(PERLLIB) - - mkdir -p $(LOGDIR) -@@ -56,8 +57,8 @@ - $(INSTALL) -m 0644 resources/favicon.ico $(HTMLDIR)/ - test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/server/munin-htaccess $(HTMLDIR)/.htaccess - test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/ -- $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/ -- $(INSTALL) -m 0755 build/server/munin-check $(BINDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-cron $(SBINDIR)/ -+ $(INSTALL) -m 0755 build/server/munin-check $(LIBDIR)/ - $(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/ - $(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/ - $(INSTALL) -m 0755 build/server/munin-html $(LIBDIR)/ -diff -Naur munin-1.3.4/Makefile.config munin-1.3.4-p/Makefile.config ---- munin-1.3.4/Makefile.config Sat Mar 8 07:35:13 2008 -+++ munin-1.3.4-p/Makefile.config Fri Apr 4 11:12:05 2008 -@@ -9,10 +9,10 @@ + mkdir -p $(PERLLIB)/Munin/Master + mkdir -p $(HTMLDIR) +@@ -99,8 +100,8 @@ + 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)/ + +- $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/ +--- munin-1.4.0/Makefile.config~ 2009-11-27 12:17:18.000000000 +0100 ++++ munin-1.4.0/Makefile.config 2009-11-30 14:32:28.827763277 +0100 +@@ -17,10 +17,10 @@ # # the base of the Munin installation. # @@ -36,7 +34,7 @@ # Server only - where to put munin-cron BINDIR = $(PREFIX)/bin -@@ -24,21 +24,21 @@ +@@ -32,34 +32,34 @@ DOCDIR = $(PREFIX)/doc # Where to put man pages @@ -48,11 +46,22 @@ +LIBDIR = $(PREFIX)/share/munin # Server only - Output directory --HTMLDIR = $(PREFIX)/var/www --CGIDIR = $(HTMLDIR)/cgi +-HTMLDIR = $(PREFIX)/www/docs +-CGIDIR = $(PREFIX)/www/cgi +HTMLDIR = $(DESTDIR)/var/lib/munin/html +CGIDIR = $(LIBDIR)/cgi + # Server only - spool directory for data gathered from nodes by + # munin-gather - experimental. Place on ramdisk to make munin + # scale better. On many versions of Linux as well as on Solaris + # /tmp will be a ramdisk. + +-SSPOOLDIR = $(PREFIX)/spool ++SSPOOLDIR = $(PREFIX)/var/spool/munin + + # Suggested directory name for a pulic ramdisk based tmp directory. + # SSPOOLDIR := /tmp/muninspool + # Client only - Where to put RRD files and other intenal data -DBDIR = $(DESTDIR)/var/opt/munin +DBDIR = $(DESTDIR)/var/lib/munin/db @@ -63,47 +72,52 @@ +PLUGSTATE = $(DESTDIR)/var/lib/munin/plugin-state # Where Munin should place its logs. - LOGDIR = $(DESTDIR)/var/log/munin -@@ -67,14 +67,14 @@ - BASH = /bin/bash +-LOGDIR = $(PREFIX)/log/munin ++LOGDIR = $(DESTDIR)/var/log/munin + + # Location of PID files and other statefiles. On the server, must be + # writable by the user "munin". +@@ -98,7 +98,7 @@ + BASH := /bin/bash # Server only - Where to install the perl libraries --PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2) -+PERLLIB = $(DESTDIR)$(shell $(PERL) -V:vendorlib | cut -d"'" -f2) +-PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2) ++PERLSITELIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2) + PERLLIB = $(DESTDIR)$(PERLSITELIB) # Client only - Install plugins for this architecture - OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') +@@ -106,7 +106,7 @@ # How to figure out the hostname. (Only used in default configuration # files) --HOSTNAME = $(shell hostname) -+HOSTNAME = localhost +-HOSTNAME := $(shell hostname) ++HOSTNAME := localhost # What is the safest way to create a tempfile. # Default is to figure it out by testing various methods. -@@ -94,9 +94,9 @@ +@@ -126,9 +126,9 @@ # Which command to use to check if the USER and GROUP to run Munin as, exists. # These will work on most modern OSes: # --GETENT = $(shell which getent || which true 2>/dev/null) --CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) --CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) -+GETENT = /bin/true -+CHECKUSER = /bin/true -+CHECKGROUP = /bin/true +-GETENT := $(shell which getent || which true 2>/dev/null) +-CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) ++GETENT := /bin/true ++CHECKUSER := /bin/true ++CHECKGROUP := /bin/true # For OSX, comment out the previous two lines and comment in these # -@@ -112,9 +112,9 @@ - - - --CHOWN = chown --CHMOD = chmod --CHGRP = chgrp -+CHOWN = /bin/true -+CHMOD = /bin/true -+CHGRP = /bin/true +@@ -146,9 +146,9 @@ + #CHECKUSER := $(shell pwget -n $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) + #CHECKGROUP := $(shell grget -n $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) + +-CHOWN := chown +-CHMOD := chmod +-CHGRP := chgrp ++CHOWN := /bin/true ++CHMOD := /bin/true ++CHGRP := /bin/true - # Check whether setruid functionality can be used - HASSETR = $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) + # Java compiler stuff - only needed on the buildhost + JC := javac ================================================================ Index: packages/munin/munin-plugins.patch diff -u packages/munin/munin-plugins.patch:1.26 packages/munin/munin-plugins.patch:1.27 --- packages/munin/munin-plugins.patch:1.26 Tue Apr 14 17:31:35 2009 +++ packages/munin/munin-plugins.patch Mon Nov 30 17:54:30 2009 @@ -128,9 +128,9 @@ + +[cupsys_pages] +user root -diff -Naur munin-1.3.4/node/node.d/apache_accesses.in munin-1.3.4-p/node/node.d/apache_accesses.in ---- munin-1.3.4/node/node.d/apache_accesses.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/apache_accesses.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/apache_accesses.in munin-1.3.4-p/plugins/node.d/apache_accesses.in +--- munin-1.3.4/plugins/node.d/apache_accesses.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/apache_accesses.in Fri Apr 4 11:13:06 2008 @@ -86,6 +86,7 @@ my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto"; @@ -152,9 +152,9 @@ print "graph_args --base 1000\n"; print "graph_vlabel accesses / \${graph_period}\n"; print "graph_category apache\n"; -diff -Naur munin-1.3.4/node/node.d/apache_processes.in munin-1.3.4-p/node/node.d/apache_processes.in ---- munin-1.3.4/node/node.d/apache_processes.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/apache_processes.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/apache_processes.in munin-1.3.4-p/plugins/node.d/apache_processes.in +--- munin-1.3.4/plugins/node.d/apache_processes.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/apache_processes.in Fri Apr 4 11:13:06 2008 @@ -88,6 +88,7 @@ my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto"; @@ -176,9 +176,9 @@ print "graph_args --base 1000 -l 0\n"; print "graph_category apache\n"; print "graph_order "; -diff -Naur munin-1.3.4/node/node.d/apache_volume.in munin-1.3.4-p/node/node.d/apache_volume.in ---- munin-1.3.4/node/node.d/apache_volume.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/apache_volume.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/apache_volume.in munin-1.3.4-p/plugins/node.d/apache_volume.in +--- munin-1.3.4/plugins/node.d/apache_volume.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/apache_volume.in Fri Apr 4 11:13:06 2008 @@ -86,6 +86,7 @@ my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto"; @@ -200,9 +200,9 @@ print "graph_args --base 1000\n"; print "graph_vlabel bytes per \${graph_period}\n"; print "graph_category apache\n"; -diff -Naur munin-1.3.4/node/node.d/bind9.in munin-1.3.4-p/node/node.d/bind9.in ---- munin-1.3.4/node/node.d/bind9.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/bind9.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/bind9.in munin-1.3.4-p/plugins/node.d/bind9.in +--- munin-1.3.4/plugins/node.d/bind9.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/bind9.in Fri Apr 4 11:13:06 2008 @@ -19,7 +19,7 @@ my %IN; @@ -212,9 +212,9 @@ while (<Q>) { chomp; my ($q,$n) = split(/\s+/,$_,2); -diff -Naur munin-1.3.4/node/node.d/courier_.in munin-1.3.4-p/node/node.d/courier_.in ---- munin-1.3.4/node/node.d/courier_.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/courier_.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/courier_.in munin-1.3.4-p/plugins/node.d/courier_.in +--- munin-1.3.4/plugins/node.d/courier_.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/courier_.in Fri Apr 4 11:13:06 2008 @@ -35,7 +35,7 @@ COURIER_LOG=${logfile:-/var/log/mail.log} SERVICE=${service:-`basename $0 | sed 's/^courier_//g'`} @@ -224,9 +224,9 @@ mktempfile () { @@MKTEMP@@ -diff -Naur munin-1.3.4/node/node.d/courier_mta_mailstats.in munin-1.3.4-p/node/node.d/courier_mta_mailstats.in ---- munin-1.3.4/node/node.d/courier_mta_mailstats.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/courier_mta_mailstats.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/courier_mta_mailstats.in munin-1.3.4-p/plugins/node.d/courier_mta_mailstats.in +--- munin-1.3.4/plugins/node.d/courier_mta_mailstats.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/courier_mta_mailstats.in Fri Apr 4 11:13:06 2008 @@ -101,7 +101,9 @@ if($startsize < $pos) { @@ -238,9 +238,9 @@ $pos = 0; } -diff -Naur munin-1.3.4/node/node.d/courier_mta_mailvolume.in munin-1.3.4-p/node/node.d/courier_mta_mailvolume.in ---- munin-1.3.4/node/node.d/courier_mta_mailvolume.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/courier_mta_mailvolume.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/courier_mta_mailvolume.in munin-1.3.4-p/plugins/node.d/courier_mta_mailvolume.in +--- munin-1.3.4/plugins/node.d/courier_mta_mailvolume.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/courier_mta_mailvolume.in Fri Apr 4 11:13:06 2008 @@ -92,7 +92,9 @@ if($startsize < $pos) { @@ -252,9 +252,9 @@ $pos = 0; } -diff -Naur munin-1.3.4/node/node.d/cupsys_pages.in munin-1.3.4-p/node/node.d/cupsys_pages.in ---- munin-1.3.4/node/node.d/cupsys_pages.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/cupsys_pages.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/cupsys_pages.in munin-1.3.4-p/plugins/node.d/cupsys_pages.in +--- munin-1.3.4/plugins/node.d/cupsys_pages.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/cupsys_pages.in Fri Apr 4 11:13:06 2008 @@ -94,7 +94,9 @@ } if ($startsize < $pos) { @@ -266,9 +266,9 @@ $pos = 0; } -diff -Naur munin-1.3.4/node/node.d/mailman.in munin-1.3.4-p/node/node.d/mailman.in ---- munin-1.3.4/node/node.d/mailman.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/mailman.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/mailman.in munin-1.3.4-p/plugins/node.d/mailman.in +--- munin-1.3.4/plugins/node.d/mailman.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/mailman.in Fri Apr 4 11:13:06 2008 @@ -69,7 +69,9 @@ if($startsize < $pos) { @@ -280,9 +280,9 @@ $pos = 0; } -diff -Naur munin-1.3.4/node/node.d/mysql_slowqueries.in munin-1.3.4-p/node/node.d/mysql_slowqueries.in ---- munin-1.3.4/node/node.d/mysql_slowqueries.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/mysql_slowqueries.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/mysql_slowqueries.in munin-1.3.4-p/plugins/node.d/mysql_slowqueries.in +--- munin-1.3.4/plugins/node.d/mysql_slowqueries.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/mysql_slowqueries.in Fri Apr 4 11:13:06 2008 @@ -47,5 +47,5 @@ exit 0 fi @@ -290,9 +290,9 @@ -/usr/bin/printf "queries.value " +/bin/printf "queries.value " ($MYSQLADMIN $MYSQLOPTS status 2>/dev/null || echo a a a a a a a a U) | awk '{print $9}' -diff -Naur munin-1.3.4/node/node.d/mysql_threads.in munin-1.3.4-p/node/node.d/mysql_threads.in ---- munin-1.3.4/node/node.d/mysql_threads.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/mysql_threads.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/mysql_threads.in munin-1.3.4-p/plugins/node.d/mysql_threads.in +--- munin-1.3.4/plugins/node.d/mysql_threads.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/mysql_threads.in Fri Apr 4 11:13:06 2008 @@ -45,5 +45,5 @@ exit 0 fi @@ -300,9 +300,9 @@ -/usr/bin/printf "threads.value " +/bin/printf "threads.value " ($MYSQLADMIN $MYSQLOPTS status 2>/dev/null || echo 'a a a U') | awk '{print $4}' -diff -Naur munin-1.3.4/node/node.d/ntp_.in munin-1.3.4-p/node/node.d/ntp_.in ---- munin-1.3.4/node/node.d/ntp_.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/ntp_.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/ntp_.in munin-1.3.4-p/plugins/node.d/ntp_.in +--- munin-1.3.4/plugins/node.d/ntp_.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/ntp_.in Fri Apr 4 11:13:06 2008 @@ -32,9 +32,9 @@ my $nodelay = $ENV{'nodelay'} || 0; @@ -316,12 +316,12 @@ exit 0; } else { @@ -42,13 +42,13 @@ - exit 1; + exit 0; } } else { - print "no (ntpq not found)\n"; + print "no (/usr/sbin/ntpq not found)\n"; - exit 1; + exit 0; } } @@ -349,9 +349,9 @@ foreach (@lines) { next unless /^.(\d+\.\d+\.\d+\.\d+)/; next if /^.224\.0\.1\.1/; -diff -Naur munin-1.3.4/node/node.d/ntp_states.in munin-1.3.4-p/node/node.d/ntp_states.in ---- munin-1.3.4/node/node.d/ntp_states.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/ntp_states.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/ntp_states.in munin-1.3.4-p/plugins/node.d/ntp_states.in +--- munin-1.3.4/plugins/node.d/ntp_states.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/ntp_states.in Fri Apr 4 11:13:06 2008 @@ -35,9 +35,9 @@ ); @@ -370,7 +370,7 @@ } else { - print "no (ntpq not found)\n"; + print "no (/usr/sbin/ntpq not found)\n"; - exit 1; + exit 0; } } @@ -54,7 +54,7 @@ @@ -391,26 +391,19 @@ next unless /^(.)(\d+\.\d+\.\d+\.\d+)/; next if /^.224\.0\.1\.1/; my $state = $1; -diff -Naur munin-1.3.4/node/node.d/nut_misc.in munin-1.3.4-p/node/node.d/nut_misc.in ---- munin-1.3.4/node/node.d/nut_misc.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/nut_misc.in Fri Apr 4 11:13:06 2008 -@@ -1,12 +1,13 @@ --!@@PERL@@ -+#!@@PERL@@ - - use strict; - +diff -Naur munin-1.3.4/plugins/node.d/nut_misc.in munin-1.3.4-p/plugins/node.d/nut_misc.in +--- munin-1.3.4/plugins/node.d/nut_misc.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/nut_misc.in Fri Apr 4 11:13:06 2008 +@@ -5,7 +5,8 @@ my %status; my %config = ( -- upsname => 'ber...@127.0.0.1', -- upsc => 'upsc' -+ upsname => $ENV{upsname} || 'bertha', -+ upshost => $ENV{upshost} || '127.0.0.1', -+ upsc => $ENV{upsc} || 'upsc' +- upsname => $ENV{"upsname"} ? $ENV{"upsname"} : 'ber...@127.0.0.1', ++ upsname => $ENV{"upsname"} ? $ENV{"upsname"} : 'bertha', ++ upshost => $ENV{"upshost"} ? $ENV{"upshost"} : '127.0.0.1', + upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc' ); - my %graph = ( @@ -15,11 +16,6 @@ type => 'GAUGE', draw => 'LINE2' @@ -446,21 +439,19 @@ while ($data =~ /([a-z.]+): (.+)\b/g) { my $label = $1; my $value = $2; -diff -Naur munin-1.3.4/node/node.d/nut_volts.in munin-1.3.4-p/node/node.d/nut_volts.in ---- munin-1.3.4/node/node.d/nut_volts.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/nut_volts.in Fri Apr 4 11:13:06 2008 -@@ -5,8 +5,9 @@ +diff -Naur munin-1.3.4/plugins/node.d/nut_volts.in munin-1.3.4-p/plugins/node.d/nut_volts.in +--- munin-1.3.4/plugins/node.d/nut_volts.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/nut_volts.in Fri Apr 4 11:13:06 2008 +@@ -5,7 +5,8 @@ my %status; my %config = ( -- upsname => 'ber...@127.0.0.1', -- upsc => 'upsc' -+ upsname => $ENV{upsname} || 'bertha', -+ upshost => $ENV{upshost} || '127.0.0.1', -+ upsc => $ENV{upsc} || 'upsc' +- upsname => $ENV{"upsname"} ? $ENV{"upsname"} : 'ber...@127.0.0.1', ++ upsname => $ENV{"upsname"} ? $ENV{"upsname"} : 'bertha', ++ upshost => $ENV{"upshost"} ? $ENV{"upshost"} : '127.0.0.1', + upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc' ); - my %graph = ( @@ -15,16 +16,6 @@ type => 'GAUGE', draw => 'LINE2' @@ -501,9 +492,9 @@ while ($data =~ /([a-z.]+): (.+)\b/g) { my $label = $1; my $value = $2; -diff -Naur munin-1.3.4/node/node.d/perdition.in munin-1.3.4-p/node/node.d/perdition.in ---- munin-1.3.4/node/node.d/perdition.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/perdition.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/perdition.in munin-1.3.4-p/plugins/node.d/perdition.in +--- munin-1.3.4/plugins/node.d/perdition.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/perdition.in Fri Apr 4 11:13:06 2008 @@ -30,7 +30,7 @@ # Set the location of the perdition logs PERDITION_LOG=${logfile:-/var/log/perdition.log} @@ -513,9 +504,9 @@ case $1 in autoconf|detect) -diff -Naur munin-1.3.4/node/node.d/pop_stats.in munin-1.3.4-p/node/node.d/pop_stats.in ---- munin-1.3.4/node/node.d/pop_stats.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/pop_stats.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d/pop_stats.in munin-1.3.4-p/plugins/node.d/pop_stats.in +--- munin-1.3.4/plugins/node.d/pop_stats.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d/pop_stats.in Fri Apr 4 11:13:06 2008 @@ -67,7 +67,9 @@ if ($startsize < $pos) { @@ -527,72 +518,21 @@ $pos = 0; } -diff -Naur munin-1.3.4/node/node.d/postfix_mailstats.in munin-1.3.4-p/node/node.d/postfix_mailstats.in ---- munin-1.3.4/node/node.d/postfix_mailstats.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d/postfix_mailstats.in Fri Apr 4 11:13:06 2008 -@@ -127,7 +127,9 @@ - if ($startsize < $pos) - { - # Log rotated -- parseLogfile ($rotlogfile, $pos, (stat $rotlogfile)[7]); -+ if (-f $rotlogfile) { -+ parseLogfile ($rotlogfile, $pos, (stat $rotlogfile)[7]); -+ } - $pos = 0; - } - -diff -Naur munin-1.3.4/node/node.d.linux/iostat.in munin-1.3.4-p/node/node.d.linux/iostat.in ---- munin-1.3.4/node/node.d.linux/iostat.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d.linux/iostat.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d.linux/iostat.in munin-1.3.4-p/plugins/node.d.linux/iostat.in +--- munin-1.3.4/plugins/node.d.linux/iostat.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d.linux/iostat.in Fri Apr 4 11:13:06 2008 @@ -146,7 +146,7 @@ - if ($tmpnam =~ /\d+$/ ) { - # Special case for devices like cXdXpX, - # like the cciss driver -- next unless $tmpnam =~ /\/c\d+d\d+$/ -+ next unless $tmpnam =~ /\/.*d\d+$/ - } - next unless grep { $_ } @fields; - -diff -Naur munin-1.3.4/node/node.d.linux/iostat_ios.in munin-1.3.4-p/node/node.d.linux/iostat_ios.in ---- munin-1.3.4/node/node.d.linux/iostat_ios.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d.linux/iostat_ios.in Fri Apr 4 11:13:06 2008 -@@ -27,7 +27,7 @@ - - use constant STATEFILE => '@@PLUGSTATE@@/iostat-ios.state'; - --if ($ARGV[0] eq 'autoconf') { -+if ($ARGV[0] && $ARGV[0] eq 'autoconf') { - if (-r "/proc/diskstats" or -r "/proc/partitions") { - print "yes\n"; - exit 0; -@@ -37,7 +37,7 @@ - } - } - --if ($ARGV[0] eq 'config') { -+if ($ARGV[0] && $ARGV[0] eq 'config') { - print_config(); - exit; - } -@@ -127,9 +127,12 @@ - "graph_vlabel ms\n"); - - for my $d ( @{ get_ios(1) } ) { -- print("$d.label $d\n", -- "$d.type GAUGE\n", -- "$d.draw LINE2\n"); -+ print("${d}_rtime.label $d rtime\n", -+ "${d}_wtime.label $d wtime\n", -+ "${d}_rtime.type GAUGE\n", -+ "${d}_rtime.draw LINE2\n", -+ "${d}_wtime.type GAUGE\n", -+ "${d}_wtime.draw LINE2\n"); - } - } - -diff -Naur munin-1.3.4/node/node.d.linux/load.in munin-1.3.4-p/node/node.d.linux/load.in ---- munin-1.3.4/node/node.d.linux/load.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d.linux/load.in Fri Apr 4 11:15:15 2008 + if ($tmpnam =~ /\d+$/ and !$include_numbered) { + # Special case for devices like cXdXpX, + # like the cciss driver +- next unless $tmpnam =~ /\/c\d+d\d+$/ ++ next unless $tmpnam =~ /\/.*d\d+$/ + } + next unless grep { $_ } @fields; + +diff -Naur munin-1.3.4/plugins/node.d.linux/load.in munin-1.3.4-p/plugins/node.d.linux/load.in +--- munin-1.3.4/plugins/node.d.linux/load.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d.linux/load.in Fri Apr 4 11:15:15 2008 @@ -35,20 +35,20 @@ # one machine answer for several) @@ -617,9 +557,9 @@ # required subfield. - echo 'load.label load' + echo "load.label load" - # These two are optional. They are only used if you have - # configured your munin to tell a Nagios-server about any - # problems + # These two read the environment for warning values for the field + # "load". If "load_warning" or "warning" aren't set in the + # environment, no warning levels are set. Likewise for "load_critical" @@ -57,8 +57,8 @@ # This one is purely to add an explanation to the web page. The first # one is for the graph itself, while the second one is for the field @@ -631,9 +571,9 @@ # Last, if run with the "config"-parameter, quit here (don't # display any data) -diff -Naur munin-1.3.4/node/node.d.linux/nfs_client.in munin-1.3.4-p/node/node.d.linux/nfs_client.in ---- munin-1.3.4/node/node.d.linux/nfs_client.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d.linux/nfs_client.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d.linux/nfs_client.in munin-1.3.4-p/plugins/node.d.linux/nfs_client.in +--- munin-1.3.4/plugins/node.d.linux/nfs_client.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d.linux/nfs_client.in Fri Apr 4 11:13:06 2008 @@ -11,7 +11,7 @@ proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit" @@ -717,9 +657,9 @@ + print "commit.value " nfs_commit }' $NFS - -diff -Naur munin-1.3.4/node/node.d.linux/nfsd.in munin-1.3.4-p/node/node.d.linux/nfsd.in ---- munin-1.3.4/node/node.d.linux/nfsd.in Sat Mar 8 02:42:39 2008 -+++ munin-1.3.4-p/node/node.d.linux/nfsd.in Fri Apr 4 11:13:06 2008 +diff -Naur munin-1.3.4/plugins/node.d.linux/nfsd.in munin-1.3.4-p/plugins/node.d.linux/nfsd.in +--- munin-1.3.4/plugins/node.d.linux/nfsd.in Sat Mar 8 02:42:39 2008 ++++ munin-1.3.4-p/plugins/node.d.linux/nfsd.in Fri Apr 4 11:13:06 2008 @@ -12,7 +12,7 @@ proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit" @@ -802,8 +742,8 @@ + print "pathconf.value " nfs_pathconf + print "commit.value " nfs_commit +}' $NFSD ---- munin-1.3.4/node/node.d.linux/ip_.in~ 2008-03-08 02:42:39.000000000 +0100 -+++ munin-1.3.4/node/node.d.linux/ip_.in 2008-05-20 13:00:17.000000000 +0200 +--- munin-1.3.4/plugins/node.d.linux/ip_.in~ 2008-03-08 02:42:39.000000000 +0100 ++++ munin-1.3.4/plugins/node.d.linux/ip_.in 2008-05-20 13:00:17.000000000 +0200 @@ -40,16 +40,16 @@ # This is a fun hack to make the plugin ip6 compatible. # Suggested in ticket #439 by "jodal". @@ -821,29 +761,35 @@ if [ $? -gt 0 ]; then <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin-Makefile.patch?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin-plugins.patch?r1=1.26&r2=1.27&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin-separate-configs.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin-templatedir.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin.spec?r1=1.72&r2=1.73&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit