SOURCES: munin-plugins.patch (NEW) - fixes and configs for plugins

baggins baggins at pld-linux.org
Sun Oct 9 14:11:03 CEST 2005


Author: baggins                      Date: Sun Oct  9 12:11:03 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixes and configs for plugins

---- Files affected:
SOURCES:
   munin-plugins.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/munin-plugins.patch
diff -u /dev/null SOURCES/munin-plugins.patch:1.1
--- /dev/null	Sun Oct  9 14:11:03 2005
+++ SOURCES/munin-plugins.patch	Sun Oct  9 14:10:58 2005
@@ -0,0 +1,156 @@
+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,37 @@
+ 
+ [postfix*]
+ user root
++env.logdir /var/log
++env.logfile maillog
++
++[netstat]
++group proc
++
++[amavis]
++user root
++env.logfile /var/log/maillog
++
++[courier*]
++user root
++env.logfile /var/log/maillog
++
++[mailman]
++user mailman
++group mailman
++
++[bind9_rndc]
++group named
++env.querystats /var/lib/named/named.stats
++
++[squid*]
++group squid
++#env.squidport 3128
++#env.squiduser manager
++#env.squidpasswd <SECRET>
++
++[fw*]
++user root
++
++[dhcpd3]
++user root
++
+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
+@@ -19,7 +19,7 @@
+ my %IN;
+ 
+ sub get_state {
+-    open(Q,"< $STATEFILE") or die;
++    open(Q,"< $STATEFILE") or return;
+     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,9 +34,9 @@
+ # Set the location of the courier logs
+ COURIER_LOG=${logfile:-/var/log/mail.log}
+ SERVICE=${service:-`basename $0 | sed 's/^courier_//g'`}
+-TEMP_FILE=`mktemp -p /tmp/ munin-courier.XXXXXX`
++TEMP_FILE=`mktemp /tmp/munin-courier.XXXXXX`
+ OFFSET_FILE=@@PLUGSTATE@@/courier_${SERVICE}.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/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,8 @@
+     $startsize = 0;
+ }
+ 
+-if($startsize < $pos) {
++if($startsize < $pos &&
++   -f $rotlogfile) {
+     # Log rotated
+     parseMailmanLog($rotlogfile, $pos, (stat $rotlogfile)[7]);
+     $pos = 0;
+diff -ur munin-1.3.2/node/node.d.linux/fw_forwarded_local.in munin-1.3.2-plugins/node/node.d.linux/fw_forwarded_local.in
+--- munin-1.3.2/node/node.d.linux/fw_forwarded_local.in	2005-04-15 22:29:18.000000000 +0200
++++ munin-1.3.2-plugins/node/node.d.linux/fw_forwarded_local.in	2005-10-09 14:02:02.324423720 +0200
+@@ -39,10 +39,8 @@
+ 	echo 'graph_category network'
+ 	echo 'forward.label forward'
+ 	echo 'forward.type GAUGE'
+-	echo 'forward.max 500'''
+ 	echo 'local.label local'
+ 	echo 'local.type GAUGE'
+-	echo 'local.max 500'''
+ 	exit 0
+ fi
+ 
+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';
+ 
+ 
+-if ($ARGV[0] eq 'config') {
++if ($ARGV[0] && $ARGV[0] eq 'config') {
+     print_config();
+     exit;
+ }
+@@ -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");
+ 
+     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 -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"
+ 
+ if [ "$1" = "autoconf" ]; then
+-	if [ -x "$NFS" ]; then
++	if [ -r "$NFS" ]; then
+ 		echo yes
+ 		exit 0
+ 	else
+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"
+ 
+ if [ "$1" = "autoconf" ]; then
+-	if [ -x "$NFSD" ]; then
++	if [ -r "$NFSD" ]; then
+ 		echo yes
+ 		exit 0
+ 	else
================================================================



More information about the pld-cvs-commit mailing list