packages: munin-plugins-muninexchange/munin-plugins-muninexchange-apache.pa...

baggins baggins at pld-linux.org
Sat Mar 26 17:05:12 CET 2011 

Author: baggins                      Date: Sat Mar 26 16:05:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 20110326

---- Files affected:
packages/munin-plugins-muninexchange:
   munin-plugins-muninexchange-apache.patch (1.1 -> 1.2) , munin-plugins-muninexchange-openvpn.patch (1.1 -> 1.2) , munin-plugins-muninexchange-other.patch (1.3 -> 1.4) , munin-plugins-muninexchange-php.patch (1.1 -> 1.2) , munin-plugins-muninexchange-postfix.patch (1.3 -> 1.4) , munin-plugins-muninexchange-samba.patch (1.1 -> 1.2) , munin-plugins-muninexchange-vserver.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/munin-plugins-muninexchange/munin-plugins-muninexchange-apache.patch
diff -u packages/munin-plugins-muninexchange/munin-plugins-muninexchange-apache.patch:1.1 packages/munin-plugins-muninexchange/munin-plugins-muninexchange-apache.patch:1.2
--- packages/munin-plugins-muninexchange/munin-plugins-muninexchange-apache.patch:1.1	Wed Apr 29 13:55:21 2009
+++ packages/munin-plugins-muninexchange/munin-plugins-muninexchange-apache.patch	Sat Mar 26 17:05:07 2011
@@ -1,5 +1,5 @@
---- ./apache/apache_watch_~	2008-11-30 01:59:30.000000000 +0100
-+++ ./apache/apache_watch_	2009-04-26 20:30:15.107587925 +0200
+--- ./other/apache_watch_~	2008-11-30 01:59:30.000000000 +0100
++++ ./other/apache_watch_	2009-04-26 20:30:15.107587925 +0200
 @@ -95,7 +95,7 @@
    print "graph_vlabel activity\n";
    my $i = 0;

================================================================
Index: packages/munin-plugins-muninexchange/munin-plugins-muninexchange-openvpn.patch
diff -u packages/munin-plugins-muninexchange/munin-plugins-muninexchange-openvpn.patch:1.1 packages/munin-plugins-muninexchange/munin-plugins-muninexchange-openvpn.patch:1.2
--- packages/munin-plugins-muninexchange/munin-plugins-muninexchange-openvpn.patch:1.1	Sun Nov 30 01:54:24 2008
+++ packages/munin-plugins-muninexchange/munin-plugins-muninexchange-openvpn.patch	Sat Mar 26 17:05:07 2011
@@ -1,5 +1,5 @@
---- munin-plugins-muninexchange-20081128/openvpn/openvpn_clients~	2008-11-29 13:19:37.000000000 +0100
-+++ munin-plugins-muninexchange-20081128/openvpn/openvpn_clients	2008-11-30 01:43:48.000000000 +0100
+--- munin-plugins-muninexchange-20081128/other/openvpn_clients~	2008-11-29 13:19:37.000000000 +0100
++++ munin-plugins-muninexchange-20081128/other/openvpn_clients	2008-11-30 01:43:48.000000000 +0100
 @@ -42,7 +42,7 @@
  
  use strict;

================================================================
Index: packages/munin-plugins-muninexchange/munin-plugins-muninexchange-other.patch
diff -u packages/munin-plugins-muninexchange/munin-plugins-muninexchange-other.patch:1.3 packages/munin-plugins-muninexchange/munin-plugins-muninexchange-other.patch:1.4
--- packages/munin-plugins-muninexchange/munin-plugins-muninexchange-other.patch:1.3	Wed Jan 13 14:34:49 2010
+++ packages/munin-plugins-muninexchange/munin-plugins-muninexchange-other.patch	Sat Mar 26 17:05:07 2011
@@ -46,11 +46,3 @@
  	$type = "service";
      }
  }
---- munin-plugins-muninexchange-20081128/other/cpuutil~	2010-01-13 14:31:43.185387210 +0100
-+++ munin-plugins-muninexchange-20081128/other/cpuutil	2010-01-13 14:32:48.222048274 +0100
-@@ -1,4 +1,4 @@
--#!/sbin/sh
-+#!/bin/sh
- 
- # See /usr/include/sys/dk.h !
- PATH=/usr/bin:/usr/sbin:/sbin

================================================================
Index: packages/munin-plugins-muninexchange/munin-plugins-muninexchange-php.patch
diff -u packages/munin-plugins-muninexchange/munin-plugins-muninexchange-php.patch:1.1 packages/munin-plugins-muninexchange/munin-plugins-muninexchange-php.patch:1.2
--- packages/munin-plugins-muninexchange/munin-plugins-muninexchange-php.patch:1.1	Sun Nov 30 00:48:38 2008
+++ packages/munin-plugins-muninexchange/munin-plugins-muninexchange-php.patch	Sat Mar 26 17:05:07 2011
@@ -1,5 +1,5 @@
---- munin-plugins-muninexchange-20081128/php/php_eaccelerator~	2008-11-29 13:19:37.000000000 +0100
-+++ munin-plugins-muninexchange-20081128/php/php_eaccelerator	2008-11-30 00:47:00.000000000 +0100
+--- munin-plugins-muninexchange-20081128/other/php_eaccelerator~	2008-11-29 13:19:37.000000000 +0100
++++ munin-plugins-muninexchange-20081128/other/php_eaccelerator	2008-11-30 00:47:00.000000000 +0100
 @@ -32,7 +32,7 @@
  url   = ENV['url'] || 'http://127.0.0.1/control.php'
  

================================================================
Index: packages/munin-plugins-muninexchange/munin-plugins-muninexchange-postfix.patch
diff -u packages/munin-plugins-muninexchange/munin-plugins-muninexchange-postfix.patch:1.3 packages/munin-plugins-muninexchange/munin-plugins-muninexchange-postfix.patch:1.4
--- packages/munin-plugins-muninexchange/munin-plugins-muninexchange-postfix.patch:1.3	Thu Jan 28 09:12:15 2010
+++ packages/munin-plugins-muninexchange/munin-plugins-muninexchange-postfix.patch	Sat Mar 26 17:05:07 2011
@@ -1,6 +1,5 @@
-diff -ur munin-plugins-muninexchange-20081128/postfix/dkimproxy_mails munin/postfix/dkimproxy_mails
---- munin-plugins-muninexchange-20081128/postfix/dkimproxy_mails	2008-11-29 13:19:37.000000000 +0100
-+++ munin/postfix/dkimproxy_mails	2008-11-29 13:19:43.000000000 +0100
+--- munin-plugins-muninexchange-20081128/other/dkimproxy_mails	2008-11-29 13:19:37.000000000 +0100
++++ munin/other/dkimproxy_mails	2008-11-29 13:19:43.000000000 +0100
 @@ -47,7 +47,7 @@
  if [ "$1" = "config" ]; then
          echo 'graph_title DKIM Proxy mails'
@@ -10,9 +9,8 @@
          echo 'graph_vlabel Count'
          echo 'graph_args --base 1000 -l 0'
  #       echo 'graph_total total'
-diff -ur munin-plugins-muninexchange-20081128/postfix/postfix_filtered munin/postfix/postfix_filtered
---- munin-plugins-muninexchange-20081128/postfix/postfix_filtered	2008-11-29 13:19:37.000000000 +0100
-+++ munin/postfix/postfix_filtered	2008-11-29 13:19:43.000000000 +0100
+--- munin-plugins-muninexchange-20081128/services/postfix_filtered	2008-11-29 13:19:37.000000000 +0100
++++ munin/services/postfix_filtered	2008-11-29 13:19:43.000000000 +0100
 @@ -60,7 +60,7 @@
  		else
  			echo 'graph_order allowed rbl policy helo client sender recipient relay'
@@ -22,9 +20,8 @@
  	echo 'graph_vlabel Mails per second'
  	echo 'graph_args --base 1000 -l 0'
  
-diff -ur munin-plugins-muninexchange-20081128/postfix/postfix_mailfiltered munin/postfix/postfix_mailfiltered
---- munin-plugins-muninexchange-20081128/postfix/postfix_mailfiltered	2008-11-29 13:19:37.000000000 +0100
-+++ munin/postfix/postfix_mailfiltered	2008-11-29 13:19:43.000000000 +0100
+--- munin-plugins-muninexchange-20081128/other/postfix_mailfiltered	2008-11-29 13:19:37.000000000 +0100
++++ munin/other/postfix_mailfiltered	2008-11-29 13:19:43.000000000 +0100
 @@ -30,7 +30,7 @@
  if [ "$1" = "config" ]; then
  	echo 'graph_title Postfix daily filtering'
@@ -34,9 +31,8 @@
  	echo 'graph_vlabel Count'
  	echo 'graph_args --base 1000 -l 0'
  	echo 'graph_total total'
-diff -ur munin-plugins-muninexchange-20081128/postfix/postfix-policyd munin/postfix/postfix-policyd
---- munin-plugins-muninexchange-20081128/postfix/postfix-policyd	2008-11-29 13:19:37.000000000 +0100
-+++ munin/postfix/postfix-policyd	2008-11-29 13:19:43.000000000 +0100
+--- munin-plugins-muninexchange-20081128/other/postfix-policyd	2008-11-29 13:19:37.000000000 +0100
++++ munin/other/postfix-policyd	2008-11-29 13:19:43.000000000 +0100
 @@ -25,7 +25,7 @@
  if [ "$1" = "config" ]; then
          echo 'graph_title Postfix-Policyd daily filtering'
@@ -46,16 +42,8 @@
          echo 'graph_vlabel Count'
          echo 'graph_scale no'
  
-@@ -50,4 +50,4 @@
- echo "delayed.value ${DELAYED}"
- echo "passed.value ${PASSED}"
- echo "whitelisted.value ${WHITELISTED}"
--echo "blacklisted.value ${BLACKLISTED}"
-\ No newline at end of file
-+echo "blacklisted.value ${BLACKLISTED}"
-diff -ur munin-plugins-muninexchange-20081128/postfix/postfix_stats munin/postfix/postfix_stats
---- munin-plugins-muninexchange-20081128/postfix/postfix_stats	2008-11-29 13:19:37.000000000 +0100
-+++ munin/postfix/postfix_stats	2008-11-29 13:19:43.000000000 +0100
+--- munin-plugins-muninexchange-20081128/other/postfix_stats	2008-11-29 13:19:37.000000000 +0100
++++ munin/other/postfix_stats	2008-11-29 13:19:43.000000000 +0100
 @@ -19,7 +19,7 @@
  system.type COUNTER
  graph_title Postfix statistics
@@ -65,9 +53,8 @@
  graph_total Total
  received.label received
  delivered.label delivered
-diff -ur munin-plugins-muninexchange-20081128/postfix/postgrey munin/postfix/postgrey
---- munin-plugins-muninexchange-20081128/postfix/postgrey	2008-11-29 13:19:37.000000000 +0100
-+++ munin/postfix/postgrey	2008-11-29 13:19:43.000000000 +0100
+--- munin-plugins-muninexchange-20081128/other/postgrey	2008-11-29 13:19:37.000000000 +0100
++++ munin/other/postgrey	2008-11-29 13:19:43.000000000 +0100
 @@ -30,7 +30,7 @@
  if [ "$1" = "config" ]; then
  	echo 'graph_title Postgrey daily filtering'
@@ -77,11 +64,25 @@
  	echo 'graph_vlabel Count'
  	echo 'graph_scale no'
  
---- munin-plugins-muninexchange-20091204/postfix/postfix_mail_stats~	2010-01-28 09:10:25.776080505 +0100
-+++ munin-plugins-muninexchange-20091204/postfix/postfix_mail_stats	2010-01-28 09:11:19.885332982 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/bash
-+#!/bin/bash
- #
- # Made by Boudewijn Ector, for Boudewijn Ector IT.
- # Comments can be sent to (boudewijn<AT>boudewijnector'dot'NL)
+--- munin-plugins-muninexchange-20110326/services/postfix_filtered_awk~	2011-03-26 15:54:42.725320884 +0100
++++ munin-plugins-muninexchange-20110326/services/postfix_filtered_awk	2011-03-26 15:57:20.174320884 +0100
+@@ -50,7 +50,7 @@
+ if [ "$1" = "config" ]; then
+ 	echo 'graph_title Postfix message filtering'
+ 
+-	echo 'graph_category mail'
++	echo 'graph_category postfix'
+ 	echo 'graph_vlabel Mails per second'
+ #	echo 'graph_args --base 1000 --logarithmic'
+ 	echo 'graph_args --base 1000 -l 0'
+--- munin-plugins-muninexchange-20110326/other/postgrey-new~	2011-03-26 15:54:42.787320884 +0100
++++ munin-plugins-muninexchange-20110326/other/postgrey-new	2011-03-26 15:58:43.796320879 +0100
+@@ -59,7 +59,7 @@
+ if(defined $ARGV[0] and $ARGV[0] eq "config") {
+ 	print "graph_title Postgrey Actions\n";
+ 	print "graph_order greylisted retry_early passed passed_w\n";
+-	print "graph_category mail\n";
++	print "graph_category postfix\n";
+ 	print "graph_vlabel Count\n";
+ 	print "graph_scale no\n";
+ 	

================================================================
Index: packages/munin-plugins-muninexchange/munin-plugins-muninexchange-samba.patch
diff -u packages/munin-plugins-muninexchange/munin-plugins-muninexchange-samba.patch:1.1 packages/munin-plugins-muninexchange/munin-plugins-muninexchange-samba.patch:1.2
--- packages/munin-plugins-muninexchange/munin-plugins-muninexchange-samba.patch:1.1	Tue Dec  2 00:29:44 2008
+++ packages/munin-plugins-muninexchange/munin-plugins-muninexchange-samba.patch	Sat Mar 26 17:05:07 2011
@@ -1,12 +1,12 @@
---- munin-plugins-muninexchange-20081128/samba/samba_users~	2008-11-30 01:58:28.000000000 +0100
-+++ munin-plugins-muninexchange-20081128/samba/samba_users	2008-12-02 00:28:40.000000000 +0100
+--- munin-plugins-muninexchange-20081128/other/samba_users~	2008-11-30 01:58:28.000000000 +0100
++++ munin-plugins-muninexchange-20081128/other/samba_users	2008-12-02 00:28:40.000000000 +0100
 @@ -36,3 +36,4 @@
  
  echo -n "samba_users.value "
  smbstatus -b 2> /dev/null | grep -c -v -e "^Samba" -e "^---" -e "^PID" -e ^$
 +exit 0
---- munin-plugins-muninexchange-20081128/samba/samba_locked~	2008-11-30 01:58:28.000000000 +0100
-+++ munin-plugins-muninexchange-20081128/samba/samba_locked	2008-12-02 00:28:33.000000000 +0100
+--- munin-plugins-muninexchange-20081128/other/samba_locked~	2008-11-30 01:58:28.000000000 +0100
++++ munin-plugins-muninexchange-20081128/other/samba_locked	2008-12-02 00:28:33.000000000 +0100
 @@ -36,5 +36,4 @@
  
  echo -n "samba_locked.value "

================================================================
Index: packages/munin-plugins-muninexchange/munin-plugins-muninexchange-vserver.patch
diff -u packages/munin-plugins-muninexchange/munin-plugins-muninexchange-vserver.patch:1.3 packages/munin-plugins-muninexchange/munin-plugins-muninexchange-vserver.patch:1.4
--- packages/munin-plugins-muninexchange/munin-plugins-muninexchange-vserver.patch:1.3	Sun Jan 31 19:41:22 2010
+++ packages/munin-plugins-muninexchange/munin-plugins-muninexchange-vserver.patch	Sat Mar 26 17:05:07 2011
@@ -1,99 +1,5 @@
---- /dev/null	2009-11-24 13:50:34.796667044 +0100
-+++ munin/vserver/vserver_jiffies	2008-12-06 02:00:43.000000000 +0100
-@@ -0,0 +1,91 @@
-+#!/bin/bash
-+#
-+# Copyright (C) 2006-2008 Holger Levsen and Micah Anderson
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; version 2 dated June,
-+# 1991.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+
-+# Graph Vserver cpu usage stats
-+#
-+# Configuration variables
-+#   vservers - specify the vservers to include in the graph (default: all)
-+#
-+# NOTE: If no configuration variable is set, the default will be used
-+#
-+# see vserver_resources for example uses of configuration files
-+
-+VSERVERS="$vservers"
-+
-+INFO=(`sed 's/.*:\t//' /proc/virtual/info 2>/dev/null || echo '<none>'`)
-+KCIN="$[ 16#${INFO[2]} ]";
-+
-+# If this is 1, then VCI_SPACES is present in the kernel (new in 2.6.19)
-+if [ $[ (KCIN >> 10) & 1 ] -eq 1 ]
-+then 
-+    NAMELOC="nsproxy"
-+else 
-+    NAMELOC="cvirt"
-+fi
-+
-+if [ -z "$VSERVERS" ] ; then
-+    XIDS=`find /proc/virtual/* -type d -exec basename {} \;`
-+else
-+    # it's really more performant to specify vservers by ids or by linking but not in the configuration-file by name
-+    XIDS=""
-+    for i in $VSERVERS ; do
-+	if [ -d /proc/virtual/$i ] ; then
-+	    XIDS="${XIDS}${i} "
-+	else
-+	    for j in `find /proc/virtual/* -type d -exec basename {} \;` ; do
-+		if [ "$i" = "`cat /proc/virtual/$j/$NAMELOC |grep NodeName |cut -f2`" ] ; then
-+		    XIDS="${XIDS}${j} "
-+		fi
-+	    done
-+	fi
-+    done
-+fi
-+
-+if [ "$1" = "config" ]; then
-+	echo 'graph_category vserver'
-+	echo 'graph_args --base 1000'
-+	echo 'graph_title Vserver cpu usage'
-+	echo 'graph_vlabel jiffies used per ${graph_period}'
-+	echo 'graph_info Shows jiffies used on each vserver.'
-+
-+	for i in $XIDS ; do 
-+		LABEL=`grep NodeName /proc/virtual/$i/$NAMELOC | cut -f2`
-+		NAME=`echo $LABEL | tr '-' '_'`
-+		echo "${NAME}_hold.label on hold for cpu on $LABEL"
-+		echo "${NAME}_hold.info on hold for cpu on $LABEL."
-+		echo "${NAME}_hold.type COUNTER"
-+		echo "${NAME}_scpu.label system cpu usage for $LABEL"
-+		echo "${NAME}_scpu.info system cpu usage for $LABEL."
-+		echo "${NAME}_scpu.type COUNTER"
-+		echo "${NAME}_ucpu.label user cpu usage for $LABEL"
-+		echo "${NAME}_ucpu.info user cpu usage for $LABEL."
-+		echo "${NAME}_ucpu.type COUNTER"
-+	done
-+	exit 0
-+fi
-+
-+for i in $XIDS ; do
-+	NAME=`grep NodeName /proc/virtual/$i/$NAMELOC | cut -f2 | tr '-' '_'`
-+	awk -v name=$NAME -v u=0 -v s=0 -v h=0 '
-+		/^cpu [0-9]+:/ { u+=$3; s+=$4; h+=$5}
-+		END {
-+			print name "_hold.value " h
-+			print name "_scpu.value " s
-+			print name "_ucpu.value " u
-+		}' /proc/virtual/$i/sched
-+done
---- munin-plugins-muninexchange-20091204/vserver/vserver_procs~	2010-01-28 09:10:25.827081278 +0100
-+++ munin-plugins-muninexchange-20091204/vserver/vserver_procs	2010-01-31 19:40:18.466259880 +0100
+--- munin-plugins-muninexchange-20091204/other/vserver_procs~	2010-01-28 09:10:25.827081278 +0100
++++ munin-plugins-muninexchange-20091204/other/vserver_procs	2010-01-31 19:40:18.466259880 +0100
 @@ -19,7 +19,7 @@
      echo 'graph_title Vserver Process Overview'
      echo 'graph_args --base 1000 -l 0 '
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin-plugins-muninexchange/munin-plugins-muninexchange-apache.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin-plugins-muninexchange/munin-plugins-muninexchange-openvpn.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin-plugins-muninexchange/munin-plugins-muninexchange-other.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin-plugins-muninexchange/munin-plugins-muninexchange-php.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin-plugins-muninexchange/munin-plugins-muninexchange-postfix.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin-plugins-muninexchange/munin-plugins-muninexchange-samba.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin-plugins-muninexchange/munin-plugins-muninexchange-vserver.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list