SOURCES: munin-plugins.patch - fancy feature for apache plugins - ...

[baggins]

Author: baggins                      Date: Mon Oct 10 20:47:27 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fancy feature for apache plugins - show configurable host name in graph title

---- Files affected:
SOURCES:
   munin-plugins.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/munin-plugins.patch
diff -u SOURCES/munin-plugins.patch:1.5 SOURCES/munin-plugins.patch:1.6
--- SOURCES/munin-plugins.patch:1.5	Mon Oct 10 22:29:06 2005
+++ SOURCES/munin-plugins.patch	Mon Oct 10 22:47:21 2005
@@ -454,3 +454,75 @@
      $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" )
+ {
+@@ -65,7 +66,11 @@
+ 
+ if ( exists $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 -ur munin-1.3.2/node/node.d/apache_volume.in munin-1.3.2-apache/node/node.d/apache_volume.in
+--- munin-1.3.2/node/node.d/apache_volume.in	2005-04-15 22:29:18.000000000 +0200
++++ munin-1.3.2-apache/node/node.d/apache_volume.in	2005-10-10 22:45:30.091300104 +0200
+@@ -35,6 +35,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" )
+ {
+@@ -63,7 +64,11 @@
+ 
+ if ( exists $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";
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/munin-plugins.patch?r1=1.5&r2=1.6&f=u