SOURCES: munin-plugins.patch, munin-Makefile.patch - updated for 1...
zagrodzki
zagrodzki at pld-linux.org
Fri Apr 4 11:30:47 CEST 2008
Author: zagrodzki Date: Fri Apr 4 09:30:47 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.3.4
---- Files affected:
SOURCES:
munin-plugins.patch (1.17 -> 1.18) , munin-Makefile.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/munin-plugins.patch
diff -u SOURCES/munin-plugins.patch:1.17 SOURCES/munin-plugins.patch:1.18
--- SOURCES/munin-plugins.patch:1.17 Wed Jan 23 19:06:59 2008
+++ SOURCES/munin-plugins.patch Fri Apr 4 11:30:42 2008
@@ -1,7 +1,7 @@
-diff -ur munin-1.3.2/dists/tarball/plugins.conf munin-1.3.2-plugins/dists/tarball/plugins.conf
---- munin-1.3.2/dists/tarball/plugins.conf 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-plugins/dists/tarball/plugins.conf 2005-10-09 14:06:36.770701544 +0200
-@@ -29,3 +29,74 @@
+diff -Naur munin-1.3.4/dists/tarball/plugins.conf munin-1.3.4-p/dists/tarball/plugins.conf
+--- munin-1.3.4/dists/tarball/plugins.conf Sat Mar 8 02:42:39 2008
++++ munin-1.3.4-p/dists/tarball/plugins.conf Fri Apr 4 11:13:06 2008
+@@ -31,3 +31,74 @@
[postfix*]
user root
@@ -76,9 +76,81 @@
+env.upsname SmartUPS
+env.upshost 127.0.0.1
+
-diff -ur munin-1.3.2/node/node.d/bind9.in munin-1.3.2-plugins/node/node.d/bind9.in
---- munin-1.3.2/node/node.d/bind9.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-plugins/node/node.d/bind9.in 2005-10-09 13:56:09.446270008 +0200
+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
+@@ -86,6 +86,7 @@
+
+ my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
+ my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
++my $HOST = exists $ENV{'host'} ? $ENV{'host'} : undef;
+
+ if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
+ {
+@@ -114,7 +115,11 @@
+
+ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
+ {
+- print "graph_title Apache accesses\n";
++ print "graph_title Apache accesses";
++ if ( $HOST ) {
++ print " for $HOST";
++ }
++ print "\n";
+ 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
+@@ -88,6 +88,7 @@
+
+ my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
+ my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
++my $HOST = exists $ENV{'host'} ? $ENV{'host'} : undef;
+
+ if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
+ {
+@@ -119,7 +120,11 @@
+
+ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
+ {
+- print "graph_title Apache processes\n";
++ print "graph_title Apache processes";
++ if ( $HOST ) {
++ print " for $HOST";
++ }
++ print "\n";
+ 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
+@@ -86,6 +86,7 @@
+
+ my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
+ my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
++my $HOST = exists $ENV{'host'} ? $ENV{'host'} : undef;
+
+ if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
+ {
+@@ -114,7 +115,11 @@
+
+ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
+ {
+- print "graph_title Apache volume\n";
++ print "graph_title Apache volume";
++ if ( $HOST ) {
++ print " for $HOST";
++ }
++ print "\n";
+ 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
@@ -19,7 +19,7 @@
my %IN;
@@ -88,10 +160,10 @@
while (<Q>) {
chomp;
my ($q,$n) = split(/\s+/,$_,2);
-diff -ur munin-1.3.2/node/node.d/courier_.in munin-1.3.2-plugins/node/node.d/courier_.in
---- munin-1.3.2/node/node.d/courier_.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-plugins/node/node.d/courier_.in 2005-10-09 13:56:34.916397960 +0200
-@@ -34,7 +34,7 @@
+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
+@@ -35,7 +35,7 @@
COURIER_LOG=${logfile:-/var/log/mail.log}
SERVICE=${service:-`basename $0 | sed 's/^courier_//g'`}
OFFSET_FILE=@@PLUGSTATE@@/courier_${SERVICE}.offset
@@ -100,9 +172,9 @@
mktempfile () {
@@MKTEMP@@
-diff -ur munin-1.3.2/node/node.d/courier_mta_mailstats.in munin-1.3.2-rotlog/node/node.d/courier_mta_mailstats.in
---- munin-1.3.2/node/node.d/courier_mta_mailstats.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-rotlog/node/node.d/courier_mta_mailstats.in 2005-10-10 22:18:45.170285184 +0200
+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
@@ -101,7 +101,9 @@
if($startsize < $pos) {
@@ -114,9 +186,9 @@
$pos = 0;
}
-diff -ur munin-1.3.2/node/node.d/courier_mta_mailvolume.in munin-1.3.2-rotlog/node/node.d/courier_mta_mailvolume.in
---- munin-1.3.2/node/node.d/courier_mta_mailvolume.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-rotlog/node/node.d/courier_mta_mailvolume.in 2005-10-10 22:19:00.722920824 +0200
+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
@@ -92,7 +92,9 @@
if($startsize < $pos) {
@@ -128,10 +200,10 @@
$pos = 0;
}
-diff -ur munin-1.3.2/node/node.d/cupsys_pages.in munin-1.3.2-rotlog/node/node.d/cupsys_pages.in
---- munin-1.3.2/node/node.d/cupsys_pages.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-rotlog/node/node.d/cupsys_pages.in 2005-10-10 22:19:22.973538216 +0200
-@@ -91,7 +91,9 @@
+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
+@@ -94,7 +94,9 @@
}
if ($startsize < $pos) {
# Log rotated
@@ -142,24 +214,10 @@
$pos = 0;
}
-diff -ur munin-1.3.2/node/node.d/exim_mailstats.in munin-1.3.2-rotlog/node/node.d/exim_mailstats.in
---- munin-1.3.2/node/node.d/exim_mailstats.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-rotlog/node/node.d/exim_mailstats.in 2005-10-10 22:19:45.239153328 +0200
-@@ -183,7 +183,9 @@
- if ($startsize < $pos)
- {
- # Log rotated
-- parseEximfile ($rotlogfile, $pos, (stat $rotlogfile)[7]);
-+ if (-f $rotlogfile) {
-+ parseEximfile ($rotlogfile, $pos, (stat $rotlogfile)[7]);
-+ }
- $pos = 0;
- }
-
-diff -ur munin-1.3.2/node/node.d/mailman.in munin-1.3.2-plugins/node/node.d/mailman.in
---- munin-1.3.2/node/node.d/mailman.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-plugins/node/node.d/mailman.in 2005-10-09 14:04:27.503353168 +0200
-@@ -67,7 +67,9 @@
+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
+@@ -69,7 +69,9 @@
if($startsize < $pos) {
# Log rotated
@@ -170,370 +228,126 @@
$pos = 0;
}
-diff -ur munin-1.3.2/node/node.d.linux/iostat_ios.in munin-1.3.2-plugins/node/node.d.linux/iostat_ios.in
---- munin-1.3.2/node/node.d.linux/iostat_ios.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-plugins/node/node.d.linux/iostat_ios.in 2005-10-09 14:03:10.930993936 +0200
-@@ -27,7 +27,7 @@
- use constant STATEFILE => '@@PLUGSTATE@@/iostat-ios.state';
+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
+@@ -47,5 +47,5 @@
+ exit 0
+ fi
+
+-/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
+@@ -45,5 +45,5 @@
+ exit 0
+ fi
+-/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
+@@ -32,9 +32,9 @@
+ my $nodelay = $ENV{'nodelay'} || 0;
--if ($ARGV[0] eq 'config') {
-+if ($ARGV[0] && $ARGV[0] eq 'config') {
- print_config();
- exit;
+ if ($ARGV[0] and $ARGV[0] eq "autoconf") {
+- `ntpq -c help >/dev/null 2>/dev/null`;
++ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`;
+ if ($? eq "0") {
+- if (`ntpq -c "hostnames no" -c peers | wc -l` > 0) {
++ if (`/usr/sbin/ntpq -c "hostnames no" -c peers | wc -l` > 0) {
+ print "yes\n";
+ exit 0;
+ } else {
+@@ -42,13 +42,13 @@
+ exit 1;
+ }
+ } else {
+- print "no (ntpq not found)\n";
++ print "no (/usr/sbin/ntpq not found)\n";
+ exit 1;
+ }
}
-@@ -52,7 +52,7 @@
-
- sub filter {
-- my ($major, $minor, $tmpnam);
-+ my ($major, $minor, $tmpnam) = @_;
- return 0 if ($major == 1); # RAM devices
- return 0 if ($major == 9); # MD devices
- return 0 if ($major == 58); # LVM devices
-@@ -122,9 +122,12 @@
- "graph_vlabel ms\n");
+ if ($ARGV[0] and $ARGV[0] eq "suggest") {
+- my @lines = `ntpq -c "hostnames no" -c peers`;
++ my @lines = `/usr/sbin/ntpq -c "hostnames no" -c peers`;
+ foreach (@lines) {
+ next unless /^.(\d+\.\d+\.\d+\.\d+)/;
+ next if /^.224\.0\.1\.1/;
+@@ -73,7 +73,7 @@
+ exit 2 unless defined $name;
- 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");
- }
+ if ($ARGV[0] and $ARGV[0] eq "config") {
+- my @lines = `ntpq -c "hostnames no" -c peers`;
++ my @lines = `/usr/sbin/ntpq -c "hostnames no" -c peers`;
+ my $host;
+ foreach (@lines) {
+ next unless /^.(\d+\.\d+\.\d+\.\d+)/;
+@@ -108,7 +108,7 @@
+ exit 0;
}
-diff -ur munin-1.3.2/node/node.d.linux/nfs_client.in munin-1.3.2-plugins/node/node.d.linux/nfs_client.in
---- munin-1.3.2/node/node.d.linux/nfs_client.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-plugins/node/node.d.linux/nfs_client.in 2005-10-09 14:04:42.692044136 +0200
-@@ -10,7 +10,7 @@
- proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit"
+-my @lines = `ntpq -c "hostnames no" -c peers`;
++my @lines = `/usr/sbin/ntpq -c "hostnames no" -c peers`;
+ 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
+@@ -35,9 +35,9 @@
+ );
- if [ "$1" = "autoconf" ]; then
-- if [ -x "$NFS" ]; then
-+ if [ -r "$NFS" ]; then
- echo yes
- exit 0
- else
-@@ -30,11 +30,66 @@
- exit 0
- fi
+ if ($ARGV[0] and $ARGV[0] eq "autoconf") {
+- `ntpq -c help >/dev/null 2>/dev/null`;
++ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`;
+ if ($? eq "0") {
+- if (`ntpq -c "hostnames no" -c peers | wc -l` > 0) {
++ if (`/usr/sbin/ntpq -c "hostnames no" -c peers | wc -l` > 0) {
+ print "yes\n";
+ exit 0;
+ } else {
+@@ -45,7 +45,7 @@
+ exit 0;
+ }
+ } else {
+- print "no (ntpq not found)\n";
++ print "no (/usr/sbin/ntpq not found)\n";
+ exit 1;
+ }
+ }
+@@ -54,7 +54,7 @@
+ print "graph_title NTP states\n";
+ print "graph_args --base 1000 --vertical-label msec --lower-limit 0\n";
+ print "graph_category time\n";
+- foreach (`ntpq -c "hostnames no" -c peers`) {
++ foreach (`/usr/sbin/ntpq -c "hostnames no" -c peers`) {
+ next unless /^.(\d+\.\d+\.\d+\.\d+)/;
+ next if /^.224\.0\.1\.1/;
+ my $addr = $1;
+@@ -75,7 +75,7 @@
+ exit 0;
+ }
--awk '/proc3/ {
-- split("'"$proc"'", names)
-- split($0,values)
-- for (e in names) {
-- printf("%s.value %d\n", names[++i], values[i+3]);
-- }
--}' $NFS
--
-+awk '/proc2/ {
-+ nfs_getattr+=$4
-+ nfs_setattr+=$5
-+ nfs_lookup+=$6
-+ nfs_readlink+=$7
-+ nfs_read+=$8
-+ nfs_write+=$9
-+ nfs_create+=$10
-+ nfs_mkdir+=$11
-+ nfs_symlink+=$12
-+ nfs_remove+=$13
-+ nfs_rmdir+=$14
-+ nfs_rename+=$15
-+ nfs_link+=$16
-+ nfs_readdir+=$17
-+ nfs_fsstat+=$18
-+}
-+/proc[34]/ {
-+ nfs_getattr+=$4
-+ nfs_setattr+=$5
-+ nfs_lookup+=$6
-+ nfs_access+=$7
-+ nfs_readlink+=$8
-+ nfs_read+=$9
-+ nfs_write+=$10
-+ nfs_create+=$11
-+ nfs_mkdir+=$12
-+ nfs_symlink+=$13
-+ nfs_mknod+=$14
-+ nfs_remove+=$15
-+ nfs_rmdir+=$16
-+ nfs_rename+=$17
-+ nfs_link+=$18
-+ nfs_readdir+=$19
-+ nfs_readdirplus+=$20
-+ nfs_fsstat+=$21
-+ nfs_fsinfo+=$22
-+ nfs_pathconf+=$23
-+ nfs_commit+=$24
-+}
-+END {
-+ print "getattr.value " nfs_getattr
-+ print "setattr.value " nfs_setattr
-+ print "lookup.value " nfs_lookup
-+ print "access.value " nfs_access
-+ print "readlink.value " nfs_readlink
-+ print "read.value " nfs_read
-+ print "write.value " nfs_write
-+ print "create.value " nfs_create
-+ print "mkdir.value " nfs_mkdir
-+ print "symlink.value " nfs_symlink
-+ print "mknod.value " nfs_mknod
-+ print "remove.value " nfs_remove
-+ print "rmdir.value " nfs_rmdir
-+ print "rename.value " nfs_rename
-+ print "link.value " nfs_link
-+ print "readdir.value " nfs_readdir
-+ print "readdirplus.value " nfs_readdirplus
-+ print "fsstat.value " nfs_fsstat
-+ print "fsinfo.value " nfs_fsinfo
-+ print "pathconf.value " nfs_pathconf
-+ print "commit.value " nfs_commit
-+}' $NFS
-diff -ur munin-1.3.2/node/node.d.linux/nfsd.in munin-1.3.2-plugins/node/node.d.linux/nfsd.in
---- munin-1.3.2/node/node.d.linux/nfsd.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-plugins/node/node.d.linux/nfsd.in 2005-10-09 14:04:49.220051728 +0200
-@@ -10,7 +10,7 @@
- proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit"
+-foreach (`ntpq -c "hostnames no" -c peers`) {
++foreach (`/usr/sbin/ntpq -c "hostnames no" -c peers`) {
+ 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@@
- if [ "$1" = "autoconf" ]; then
-- if [ -f "$NFSD" ]; then
-+ if [ -r "$NFSD" ]; then
- echo yes
- exit 0
- else
-@@ -30,9 +30,66 @@
- exit 0
- fi
+ use strict;
--awk '/proc3/ {
-- split("'"$proc"'", names)
-- split($0,values)
-- for (e in names)
-- printf("%s.value %d\n", names[++i], values[i+3]);
-- }' $NFSD
-+awk '/proc2/ {
-+ nfs_getattr+=$4
-+ nfs_setattr+=$5
-+ nfs_lookup+=$6
-+ nfs_readlink+=$7
-+ nfs_read+=$8
-+ nfs_write+=$9
-+ nfs_create+=$10
-+ nfs_mkdir+=$11
-+ nfs_symlink+=$12
-+ nfs_remove+=$13
-+ nfs_rmdir+=$14
-+ nfs_rename+=$15
-+ nfs_link+=$16
-+ nfs_readdir+=$17
-+ nfs_fsstat+=$18
-+}
-+/proc[34]/ {
-+ nfs_getattr+=$4
-+ nfs_setattr+=$5
-+ nfs_lookup+=$6
-+ nfs_access+=$7
-+ nfs_readlink+=$8
-+ nfs_read+=$9
-+ nfs_write+=$10
-+ nfs_create+=$11
-+ nfs_mkdir+=$12
-+ nfs_symlink+=$13
-+ nfs_mknod+=$14
-+ nfs_remove+=$15
-+ nfs_rmdir+=$16
-+ nfs_rename+=$17
-+ nfs_link+=$18
-+ nfs_readdir+=$19
-+ nfs_readdirplus+=$20
-+ nfs_fsstat+=$21
-+ nfs_fsinfo+=$22
-+ nfs_pathconf+=$23
-+ nfs_commit+=$24
-+}
-+END {
-+ print "getattr.value " nfs_getattr
-+ print "setattr.value " nfs_setattr
-+ print "lookup.value " nfs_lookup
-+ print "access.value " nfs_access
-+ print "readlink.value " nfs_readlink
-+ print "read.value " nfs_read
-+ print "write.value " nfs_write
-+ print "create.value " nfs_create
-+ print "mkdir.value " nfs_mkdir
-+ print "symlink.value " nfs_symlink
-+ print "mknod.value " nfs_mknod
-+ print "remove.value " nfs_remove
-+ print "rmdir.value " nfs_rmdir
-+ print "rename.value " nfs_rename
-+ print "link.value " nfs_link
-+ print "readdir.value " nfs_readdir
-+ print "readdirplus.value " nfs_readdirplus
-+ print "fsstat.value " nfs_fsstat
-+ print "fsinfo.value " nfs_fsinfo
-+ print "pathconf.value " nfs_pathconf
-+ print "commit.value " nfs_commit
-+}' $NFSD
-diff -ur munin-1.3.2/node/node.d/perdition.in munin-1.3.2-plugins/node/node.d/perdition.in
---- munin-1.3.2/node/node.d/perdition.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-plugins/node/node.d/perdition.in 2005-10-09 18:50:05.680496376 +0200
-@@ -26,7 +26,7 @@
- # Set the location of the perdition logs
- PERDITION_LOG=${logfile:-/var/log/perdition.log}
- OFFSET_FILE=@@PLUGSTATE@@/perdition.offset
--LOGTAIL=${logtail:-/usr/sbin/logtail}
-+LOGTAIL=${logtail:-`which logtail`}
-
- if [ ! -f "$TEMP_FILE" ]; then
- exit 3
-diff -ur munin-1.3.2/node/node.d/pop_stats.in munin-1.3.2-rotlog/node/node.d/pop_stats.in
---- munin-1.3.2/node/node.d/pop_stats.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-rotlog/node/node.d/pop_stats.in 2005-10-10 22:20:53.958706368 +0200
-@@ -67,7 +67,9 @@
- if ($startsize < $pos)
- {
- # Log rotated
-- parseEximfile ($pop{'rotlogfile'}, $pos, (stat $pop{'rotlogfile'})[7]);
-+ if (-f $pop{'rotlogfile'}) {
-+ parseEximfile ($pop{'rotlogfile'}, $pos, (stat $pop{'rotlogfile'})[7]);
-+ }
- $pos = 0;
- }
-
-diff -ur munin-1.3.2/node/node.d/postfix_mailstats.in munin-1.3.2-rotlog/node/node.d/postfix_mailstats.in
---- munin-1.3.2/node/node.d/postfix_mailstats.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-rotlog/node/node.d/postfix_mailstats.in 2005-10-10 22:21:09.989269352 +0200
-@@ -122,7 +122,9 @@
- if ($startsize < $pos)
- {
- # Log rotated
-- parseLogfile ($rotlogfile, $pos, (stat $rotlogfile)[7]);
-+ if (-f $rotlogfile) {
-+ parseLogfile ($rotlogfile, $pos, (stat $rotlogfile)[7]);
-+ }
- $pos = 0;
- }
-
-diff -ur munin-1.3.2/node/node.d/postfix_mailvolume.in munin-1.3.2-rotlog/node/node.d/postfix_mailvolume.in
---- munin-1.3.2/node/node.d/postfix_mailvolume.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-rotlog/node/node.d/postfix_mailvolume.in 2005-10-10 22:21:17.923063232 +0200
-@@ -111,7 +111,9 @@
- if ($startsize < $pos)
- {
- # Log rotated
-- parseLogfile ($rotlogfile, $pos, (stat $rotlogfile)[7]);
-+ if (-f $rotlogfile) {
-+ parseLogfile ($rotlogfile, $pos, (stat $rotlogfile)[7]);
-+ }
- $pos = 0;
- }
-
-diff -ur munin-1.3.2/node/node.d/apache_accesses.in munin-1.3.2-apache/node/node.d/apache_accesses.in
---- munin-1.3.2/node/node.d/apache_accesses.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-apache/node/node.d/apache_accesses.in 2005-10-10 22:45:35.341501952 +0200
-@@ -36,6 +36,7 @@
-
- my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
- my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
-+my $HOST = exists $ENV{'host'} ? $ENV{'host'} : undef;
-
- if ( exists $ARGV[0] and $ARGV[0] eq "autoconf" )
- {
-@@ -64,7 +65,11 @@
-
- if ( exists $ARGV[0] and $ARGV[0] eq "config" )
- {
-- print "graph_title Apache accesses\n";
-+ print "graph_title Apache accesses";
-+ if ( $HOST ) {
-+ print " for $HOST";
-+ }
-+ print "\n";
- print "graph_args --base 1000\n";
- print "graph_vlabel accesses / \${graph_period}\n";
- print "graph_category apache\n";
-diff -ur munin-1.3.2/node/node.d/apache_processes.in munin-1.3.2-apache/node/node.d/apache_processes.in
---- munin-1.3.2/node/node.d/apache_processes.in 2005-04-15 22:29:18.000000000 +0200
-+++ munin-1.3.2-apache/node/node.d/apache_processes.in 2005-10-10 22:45:01.013720568 +0200
-@@ -34,6 +34,7 @@
-
- my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
- my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
-+my $HOST = exists $ENV{'host'} ? $ENV{'host'} : undef;
-
- if ( exists $ARGV[0] and $ARGV[0] eq "autoconf" )
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/munin-plugins.patch?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/munin-Makefile.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list