packages: munin/munin-plugins.patch, munin/munin-separate-configs.patch, mu...

baggins baggins at pld-linux.org
Tue Feb 2 11:46:55 CET 2010 

Author: baggins                      Date: Tue Feb  2 10:46:55 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.4.3

---- Files affected:
packages/munin:
   munin-plugins.patch (1.37 -> 1.38) , munin-separate-configs.patch (1.3 -> 1.4) , munin-templatedir.patch (1.3 -> 1.4) , munin-timeout.patch (1.1 -> 1.2) , munin.spec (1.84 -> 1.85) 

---- Diffs:

================================================================
Index: packages/munin/munin-plugins.patch
diff -u packages/munin/munin-plugins.patch:1.37 packages/munin/munin-plugins.patch:1.38
--- packages/munin/munin-plugins.patch:1.37	Fri Jan 29 18:27:05 2010
+++ packages/munin/munin-plugins.patch	Tue Feb  2 11:46:49 2010
@@ -576,9 +576,9 @@
  	# one is for the graph itself, while the second one is for the field
  	# "load".
 -	echo 'graph_info The load average of the machine describes how many processes are in the run-queue (scheduled to run "immediately").'
--	echo 'load.info Average load for the five minutes.'
+-	echo 'load.info 5 minute load average'
 +	echo "graph_info The load average of the machine describes how many processes are in the run-queue (scheduled to run \"immediately\")."
-+	echo "load.info Average load for the five minutes."
++	echo "load.info 5 minute load average"
  
  	# Last, if run with the "config"-parameter, quit here (don't
  	# display any data)
@@ -781,11 +781,11 @@
  if [ "$1" = "suggest" ]; then
 -    iptables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$8 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}$/ { if (done[$8]!=1) {print $8; done[$8]=1;}}'
 +    /usr/sbin/iptables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$8 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}$/ { if (done[$8]!=1) {print $8; done[$8]=1;}}'
--#    if [ -x /sbin/ip6tables ]; then
--# 	ip6tables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
-+#    if [ -x /usr/sbin/ip6tables ]; then
-+# 	/usr/sbin/ip6tables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
- #    fi
+-    if [ -x /sbin/ip6tables ]; then
+- 	ip6tables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
++    if [ -x /usr/sbin/ip6tables ]; then
++ 	/usr/sbin/ip6tables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
+     fi
      exit 0
  fi
 @@ -84,8 +84,8 @@
@@ -912,17 +912,6 @@
      print "$_.label $_\n" foreach @drives;
 --- munin-1.4.0/plugins/node.d.linux/vserver_cpu_.in~	2009-11-27 12:17:05.000000000 +0100
 +++ munin-1.4.0/plugins/node.d.linux/vserver_cpu_.in	2009-11-30 23:37:51.904724363 +0100
-@@ -80,8 +80,8 @@
- =item Less use of /proc
- 
- use /proc less often (100 times more overhead than talking to the
--kernel directly) i.e. use something like pagesize=`perl -MPOSIX -e
--'print POSIX::sysconf(_SC_PAGESIZE), "\n";'`
-+kernel directly) i.e. use something like pagesize=\`perl -MPOSIX -e
-+'print POSIX::sysconf(_SC_PAGESIZE), "\n";'\`
- 
- =back
- 
 @@ -209,11 +209,11 @@
  			NAME=`echo $LABEL | cut -d. -f1 |  tr '-' '_'`
  			echo -n "${NAME}_$j.value "
@@ -971,17 +960,6 @@
  
  if [ "$1" = "autoconf" ]; then
      # No real check of anything
---- munin-1.4.0/plugins/node.d/postfix_mailstats.in~	2009-11-30 22:51:19.692786705 +0100
-+++ munin-1.4.0/plugins/node.d/postfix_mailstats.in	2009-12-01 00:01:23.586665321 +0100
-@@ -51,7 +51,7 @@
- 
- =cut
- 
--my $statefile = "$MUNIN_PLUGSTATE/munin-plugin-postfix_mailstats.state";
-+my $statefile = "@@PLUGSTATE@@/munin-plugin-postfix_mailstats.state";
- my $pos;
- my $delivered = 0;
- my $rejects = {};
 --- munin-1.4.0/plugins/node.d.linux/files_.in~	2009-11-27 12:17:05.000000000 +0100
 +++ munin-1.4.0/plugins/node.d.linux/files_.in	2009-12-01 00:03:16.224727207 +0100
 @@ -14,7 +14,7 @@
@@ -993,26 +971,6 @@
  
  if [ "$1" = "autoconf" ]; then
  	if [ -x /usr/sbin/lsof ]; then
---- munin-1.4.0/plugins/node.d/munin_update.in~	2009-11-27 12:17:11.000000000 +0100
-+++ munin-1.4.0/plugins/node.d/munin_update.in	2009-12-01 14:46:33.749288924 +0100
-@@ -35,7 +35,7 @@
- 	echo 'graph_category munin'
- 	[ -f $UPDATE_STATSFILE ] || exit 0
- 	cat $UPDATE_STATSFILE | grep "UD" | while read i; do
--		name=`echo $i | cut -d"|" -f2 |tr  '.-' '__'`
-+		name=`echo $i | cut -d"|" -f2 |tr  ';.-' '___'`
- 		printf "$name.label "
- 		echo $i | cut -d"|" -f2
- 		echo "$name.warning 100"
-@@ -47,7 +47,7 @@
- [ -f $UPDATE_STATSFILE ] || exit 0
- 
- cat $UPDATE_STATSFILE | grep "UD" | while read i; do
--        name=`echo $i | cut -d"|" -f2 | tr  '.-' '__'`
-+        name=`echo $i | cut -d"|" -f2 | tr  ';.-' '___'`
- 	printf "$name.value "
- 	echo $i | cut -d"|" -f3
- done
 --- munin-1.4.0/plugins/node.d/slapd_.in~	2009-11-27 12:17:11.000000000 +0100
 +++ munin-1.4.0/plugins/node.d/slapd_.in	2009-12-01 23:43:43.736623052 +0100
 @@ -36,8 +36,8 @@
@@ -1028,17 +986,6 @@
  
 --- munin/plugins/node.d.linux/vserver_resources.in~	2008-11-28 18:36:22.000000000 +0100
 +++ munin/plugins/node.d.linux/vserver_resources.in	2008-11-29 01:39:40.000000000 +0100
-@@ -151,8 +151,8 @@
- =item Use /proc less often
- 
- use /proc less often (100 times more overhead than talking to the
--kernel directly) i.e. use something like pagesize=`perl -MPOSIX -e
--'print POSIX::sysconf(_SC_PAGESIZE), "\n";'`
-+kernel directly) i.e. use something like pagesize=\`perl -MPOSIX -e
-+'print POSIX::sysconf(_SC_PAGESIZE), "\n";'\`
- 
- =back
- 
 @@ -188,6 +188,12 @@
  	    echo 'graph_vlabel ANON pages'
  	    echo 'graph_info Shows anonymous memory (human readable) used by each vserver.'

================================================================
Index: packages/munin/munin-separate-configs.patch
diff -u packages/munin/munin-separate-configs.patch:1.3 packages/munin/munin-separate-configs.patch:1.4
--- packages/munin/munin-separate-configs.patch:1.3	Tue Dec  1 00:04:48 2009
+++ packages/munin/munin-separate-configs.patch	Tue Feb  2 11:46:49 2010
@@ -137,9 +137,9 @@
 @@ -32,7 +32,7 @@
  use IPC::SysV qw(IPC_CREAT);
  
- my $GRAPHER = "@@LIBDIR@@/munin-graph";
--my $conffile = "@@CONFDIR@@/munin.conf";
-+my $conffile = "@@MCONFDIR@@/munin.conf";
+ my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
+-my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
++my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
  
  my %TIMES   = ( "day"   => ["--noweek", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"], 
  		"week"  => ["--noday", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"], 
@@ -161,9 +161,9 @@
 @@ -32,7 +32,7 @@
  use CGI::Fast;
  
- my $GRAPHER = "@@LIBDIR@@/munin-graph";
--my $conffile = "@@CONFDIR@@/munin.conf";
-+my $conffile = "@@MCONFDIR@@/munin.conf";
+ my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
+-my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
++my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
  
  my %TIMES   = ( "day"   => ["--noweek", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"], 
  		"week"  => ["--noday", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"], 
@@ -950,12 +950,17 @@
 diff -ur munin-1.4.0/plugins/node.d.linux/df.in munin-1.4.0.configs/plugins/node.d.linux/df.in
 --- munin-1.4.0/plugins/node.d.linux/df.in	2009-11-27 12:17:05.000000000 +0100
 +++ munin-1.4.0.configs/plugins/node.d.linux/df.in	2009-11-30 17:44:11.000000000 +0100
-@@ -28,11 +28,11 @@
+@@ -28,16 +28,16 @@
      env.warning 92
      env.critical 98
  
 -Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node.
 +Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node.
+ 
+ You may specify filesystem specific warning and critical levels:
+ 
+     env._dev_sda2_warning 98
+     env._dev_sda2_critical 99
  
  =head1 USAGE 
  

================================================================
Index: packages/munin/munin-templatedir.patch
diff -u packages/munin/munin-templatedir.patch:1.3 packages/munin/munin-templatedir.patch:1.4
--- packages/munin/munin-templatedir.patch:1.3	Mon Nov 30 17:54:30 2009
+++ packages/munin/munin-templatedir.patch	Tue Feb  2 11:46:49 2010
@@ -36,7 +36,7 @@
  	mkdir -p $(LIBDIR)
  	mkdir -p $(BINDIR)
 @@ -87,14 +87,14 @@
- 	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) 
+ 	$(CHMOD) 0755 $(DBDIR)
  
  	for p in master/www/*.tmpl master/www/*.png master/www/*.css resources/favicon.ico; do \
 -		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
@@ -50,9 +50,9 @@
  
 -	$(INSTALL) -m 0644 master/www/definitions.html $(CONFDIR)/templates/
 +	$(INSTALL) -m 0644 master/www/definitions.html $(TEMPLATEDIR)/
- 	$(INSTALL) -m 0755 master/VeraMono.ttf $(LIBDIR)/
+ 	$(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/
+ 	$(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/
  
- 	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
 @@ -217,6 +217,7 @@
               -e 's|@@BASH@@|$(BASH)|g'                          \
               -e 's|@@HASSETR@@|$(HASSETR)|g'                    \

================================================================
Index: packages/munin/munin-timeout.patch
diff -u packages/munin/munin-timeout.patch:1.1 packages/munin/munin-timeout.patch:1.2
--- packages/munin/munin-timeout.patch:1.1	Tue Dec  1 17:34:43 2009
+++ packages/munin/munin-timeout.patch	Tue Feb  2 11:46:49 2010
@@ -4,7 +4,7 @@
          tls     => undef,
          socket  => undef,
          master_capabilities => qw(multigraph),
--        io_timeout => 5,
+-        io_timeout => 120,
 +        io_timeout => $config->{timeout},
  	configref => $configref,
      };

================================================================
Index: packages/munin/munin.spec
diff -u packages/munin/munin.spec:1.84 packages/munin/munin.spec:1.85
--- packages/munin/munin.spec:1.84	Thu Jan 28 14:22:09 2010
+++ packages/munin/munin.spec	Tue Feb  2 11:46:49 2010
@@ -10,12 +10,12 @@
 Summary:	Munin - the Linpro RRD data agent
 Summary(pl.UTF-8):	Munin - agent danych RRD Linpro
 Name:		munin
-Version:	1.4.0
-Release:	7
+Version:	1.4.3
+Release:	0.1
 License:	GPL
 Group:		Applications/WWW
-Source0:	http://dl.sourceforge.net/munin/%{name}_%{version}.tar.gz
-# Source0-md5:	95be0e6eb98c4c7b2a4f2f922b358414
+Source0:	http://dl.sourceforge.net/munin/%{name}-%{version}.tar.gz
+# Source0-md5:	229646facc4e2bca6511b20b3e5eb73f
 Source1:	%{name}-node.init
 Source2:	%{name}.cron
 Source3:	%{name}-apache.conf
@@ -307,6 +307,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2010/02/02 10:46:49  baggins
+- up to 1.4.3
+
 Revision 1.84  2010/01/28 13:22:09  sparky
 - BR: rpm-pythonprov, which
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin-plugins.patch?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin-separate-configs.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin-templatedir.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin-timeout.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin.spec?r1=1.84&r2=1.85&f=u

More information about the pld-cvs-commit mailing list