-diff -urN munin-2.0.17/dists/tarball/plugins.conf munin-2.0.17-plugins/dists/tarball/plugins.conf
---- munin-2.0.17/dists/tarball/plugins.conf 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/dists/tarball/plugins.conf 2013-08-17 13:18:51.817585940 +0200
+diff -urNp munin-2.0.25.orig/dists/tarball/plugins.conf munin-2.0.25/dists/tarball/plugins.conf
+--- munin-2.0.25.orig/dists/tarball/plugins.conf 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/dists/tarball/plugins.conf 2015-09-08 10:05:48.873593251 +0000
@@ -14,6 +14,9 @@
#
#
[mysql*]
#env.mysqlopts -u someuser
-@@ -31,3 +34,128 @@
+@@ -31,3 +34,128 @@ user root
[postfix*]
user root
+
+[cupsys_pages]
+user root
-diff -urN munin-2.0.17/plugins/node.d/amavis.in munin-2.0.17-plugins/plugins/node.d/amavis.in
---- munin-2.0.17/plugins/node.d/amavis.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/amavis.in 2013-08-17 13:18:51.820919315 +0200
-@@ -77,13 +77,12 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/amavis.in munin-2.0.25/plugins/node.d/amavis.in
+--- munin-2.0.25.orig/plugins/node.d/amavis.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/amavis.in 2015-09-08 10:05:48.874593251 +0000
+@@ -77,13 +77,12 @@ GPLv2
=cut
mktempfile () {
if [ "$1" = "autoconf" ]; then
if [ -f "${AMAVIS_LOG}" -a -n "${LOGTAIL}" -a -x "${LOGTAIL}" ] ; then
-@@ -106,7 +105,7 @@
+@@ -106,7 +105,7 @@ fi
if [ "$1" = "config" ]; then
echo 'graph_title Amavis filter statistics'
echo 'graph_category antivirus'
echo 'virus.label virus'
echo 'virus.info Number of viruses caught in email'
-@@ -124,7 +123,7 @@
+@@ -124,7 +123,7 @@ virus=U
spamm=U
spams=U
if [ -n "$TEMP_FILE" -a -f "$TEMP_FILE" ]
then
-diff -urN munin-2.0.17/plugins/node.d/apache_accesses.in munin-2.0.17-plugins/plugins/node.d/apache_accesses.in
---- munin-2.0.17/plugins/node.d/apache_accesses.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/apache_accesses.in 2013-08-17 13:18:51.817585940 +0200
-@@ -89,6 +89,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/apache_accesses.in munin-2.0.25/plugins/node.d/apache_accesses.in
+--- munin-2.0.25.orig/plugins/node.d/apache_accesses.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/apache_accesses.in 2015-09-08 10:05:48.875593251 +0000
+@@ -89,6 +89,7 @@ if (! eval "require LWP::UserAgent;")
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);
if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
{
-@@ -129,7 +130,11 @@
+@@ -129,7 +130,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
if ( defined $ARGV[0] and $ARGV[0] eq "config" )
{
print "graph_args --base 1000\n";
print "graph_vlabel accesses / \${graph_period}\n";
print "graph_category apache\n";
-diff -urN munin-2.0.17/plugins/node.d/apache_processes.in munin-2.0.17-plugins/plugins/node.d/apache_processes.in
---- munin-2.0.17/plugins/node.d/apache_processes.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/apache_processes.in 2013-08-17 13:18:51.817585940 +0200
-@@ -96,6 +96,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/apache_processes.in munin-2.0.25/plugins/node.d/apache_processes.in
+--- munin-2.0.25.orig/plugins/node.d/apache_processes.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/apache_processes.in 2015-09-08 10:05:48.876593251 +0000
+@@ -96,6 +96,7 @@ if (! eval "require LWP::UserAgent;")
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 $SHOWFREE = !exists $ENV{'showfree'} || $ENV{'showfree'};
if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
-@@ -136,7 +137,11 @@
+@@ -136,7 +137,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
if ( defined $ARGV[0] and $ARGV[0] eq "config" )
{
print "graph_args --base 1000 -l 0\n";
print "graph_category apache\n";
print "graph_order ";
-diff -urN munin-2.0.17/plugins/node.d/apache_volume.in munin-2.0.17-plugins/plugins/node.d/apache_volume.in
---- munin-2.0.17/plugins/node.d/apache_volume.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/apache_volume.in 2013-08-17 13:18:51.817585940 +0200
-@@ -89,6 +89,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/apache_volume.in munin-2.0.25/plugins/node.d/apache_volume.in
+--- munin-2.0.25.orig/plugins/node.d/apache_volume.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/apache_volume.in 2015-09-08 10:05:48.876593251 +0000
+@@ -89,6 +89,7 @@ if (! eval "require LWP::UserAgent;")
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);
if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
{
-@@ -129,7 +130,11 @@
+@@ -129,7 +130,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
if ( defined $ARGV[0] and $ARGV[0] eq "config" )
{
print "graph_args --base 1000\n";
print "graph_vlabel bytes per \${graph_period}\n";
print "graph_category apache\n";
-diff -urN munin-2.0.17/plugins/node.d/bind9.in munin-2.0.17-plugins/plugins/node.d/bind9.in
---- munin-2.0.17/plugins/node.d/bind9.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/bind9.in 2013-08-17 13:18:51.820919315 +0200
-@@ -53,7 +53,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/bind9.in munin-2.0.25/plugins/node.d/bind9.in
+--- munin-2.0.25.orig/plugins/node.d/bind9.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/bind9.in 2015-09-08 10:05:48.877593251 +0000
+@@ -53,7 +53,7 @@ GPLv2
use strict;
my $QUERYLOG = $ENV{logfile} || '/var/log/bind9/query.log';
my $OTHER=0;
my %IN;
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ sub get_state {
open(Q, ">", $STATEFILE);
close(Q);
}
while (<Q>) {
chomp;
my ($q,$n) = split(/\s+/,$_,2);
-diff -urN munin-2.0.17/plugins/node.d/courier_.in munin-2.0.17-plugins/plugins/node.d/courier_.in
---- munin-2.0.17/plugins/node.d/courier_.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/courier_.in 2013-08-17 13:18:51.817585940 +0200
-@@ -55,7 +55,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/courier_.in munin-2.0.25/plugins/node.d/courier_.in
+--- munin-2.0.25.orig/plugins/node.d/courier_.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/courier_.in 2015-09-08 10:05:48.877593251 +0000
+@@ -55,7 +55,7 @@ Unknown
COURIER_LOG=${logfile:-/var/log/mail.log}
SERVICE=${service:-`basename $0 | sed 's/^courier_//g'`}
OFFSET_FILE=${MUNIN_PLUGSTATE}/courier_${SERVICE}.offset
mktempfile () {
@@MKTEMP@@
-diff -urN munin-2.0.17/plugins/node.d/courier_mta_mailstats.in munin-2.0.17-plugins/plugins/node.d/courier_mta_mailstats.in
---- munin-2.0.17/plugins/node.d/courier_mta_mailstats.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/courier_mta_mailstats.in 2013-08-17 13:18:51.817585940 +0200
-@@ -108,7 +108,9 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.25/plugins/node.d/courier_mta_mailstats.in
+--- munin-2.0.25.orig/plugins/node.d/courier_mta_mailstats.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/courier_mta_mailstats.in 2015-09-08 10:05:48.878593251 +0000
+@@ -108,7 +108,9 @@ if(!defined $pos) {
if($startsize < $pos) {
# Log rotated
$pos = 0;
}
-diff -urN munin-2.0.17/plugins/node.d/courier_mta_mailvolume.in munin-2.0.17-plugins/plugins/node.d/courier_mta_mailvolume.in
---- munin-2.0.17/plugins/node.d/courier_mta_mailvolume.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/courier_mta_mailvolume.in 2013-08-17 13:18:51.817585940 +0200
-@@ -98,7 +98,9 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.25/plugins/node.d/courier_mta_mailvolume.in
+--- munin-2.0.25.orig/plugins/node.d/courier_mta_mailvolume.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/courier_mta_mailvolume.in 2015-09-08 10:05:48.878593251 +0000
+@@ -98,7 +98,9 @@ if(!defined $pos) {
if($startsize < $pos) {
# Log rotated
$pos = 0;
}
-diff -urN munin-2.0.17/plugins/node.d/cupsys_pages.in munin-2.0.17-plugins/plugins/node.d/cupsys_pages.in
---- munin-2.0.17/plugins/node.d/cupsys_pages.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/cupsys_pages.in 2013-08-17 13:18:51.817585940 +0200
-@@ -100,7 +100,9 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/cupsys_pages.in munin-2.0.25/plugins/node.d/cupsys_pages.in
+--- munin-2.0.25.orig/plugins/node.d/cupsys_pages.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/cupsys_pages.in 2015-09-08 10:05:48.878593251 +0000
+@@ -100,7 +100,9 @@ if (!defined $pos) {
}
if ($startsize < $pos) {
# Log rotated
$pos = 0;
}
-@@ -146,7 +148,7 @@
+@@ -146,7 +148,7 @@ sub parselogfile {
while (tell(LOGFILE) < $stop) {
my $line = <LOGFILE>;
chomp ($line);
if(!defined($printers{$1}) && keys(%printers) < $MAXLABEL) {
$printers{$1} += int($2)*int($3);
} elsif(defined($printers{$1})) {
-diff -urN munin-2.0.17/plugins/node.d/foldingathome_rank.in munin-2.0.17-plugins/plugins/node.d/foldingathome_rank.in
---- munin-2.0.17/plugins/node.d/foldingathome_rank.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/foldingathome_rank.in 2013-08-17 13:18:51.820919315 +0200
+diff -urNp munin-2.0.25.orig/plugins/node.d/foldingathome_rank.in munin-2.0.25/plugins/node.d/foldingathome_rank.in
+--- munin-2.0.25.orig/plugins/node.d/foldingathome_rank.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/foldingathome_rank.in 2015-09-08 10:05:48.879593251 +0000
@@ -13,7 +13,7 @@
#%# family=contrib
#%# capabilities=autoconf
if [ "$1" = "autoconf" ]; then
# No real check of anything
-diff -urN munin-2.0.17/plugins/node.d/mailman.in munin-2.0.17-plugins/plugins/node.d/mailman.in
---- munin-2.0.17/plugins/node.d/mailman.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/mailman.in 2013-08-17 13:18:51.817585940 +0200
-@@ -38,7 +38,13 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/mailman.in munin-2.0.25/plugins/node.d/mailman.in
+--- munin-2.0.25.orig/plugins/node.d/mailman.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mailman.in 2015-09-08 10:05:48.879593251 +0000
+@@ -38,7 +38,13 @@ $members = 0;
# System paths
$logfile = $ENV{'logfile'} || "/var/log/mailman/post";
$libdir = $ENV{'libdir'} || "/var/lib/mailman";
if (-f "$logfile.0")
{
-@@ -94,7 +100,9 @@
+@@ -94,7 +100,9 @@ if(!defined $pos) {
$startsize = 0;
} elsif($startsize < $pos) {
# Log rotated
$pos = 0;
}
-diff -urN munin-2.0.17/plugins/node.d/mysql_.in munin-2.0.17-plugins/plugins/node.d/mysql_.in
---- munin-2.0.17/plugins/node.d/mysql_.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/mysql_.in 2013-08-17 13:18:51.820919315 +0200
-@@ -39,6 +39,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_.in munin-2.0.25/plugins/node.d/mysql_.in
+--- munin-2.0.25.orig/plugins/node.d/mysql_.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mysql_.in 2015-09-08 10:05:48.881593251 +0000
+@@ -39,6 +39,7 @@ Non-default example:
env.mysqlconnection DBI:mysql:mysql;host=127.0.0.1;port=3306
env.mysqluser root
env.mysqlpassword geheim
env.cachenamespace munin_mysql_pri
[mysql2_*]
env.mysqlconnection DBI:mysql:mysql;host=127.0.0.1;port=13306
-@@ -156,6 +157,7 @@
+@@ -156,6 +157,7 @@ my %config = (
'user' => $ENV{'mysqluser'} || 'root',
'password' => $ENV{'mysqlpassword'} || '',
'cache_namespace' => $ENV{'cachenamespace'} || 'munin_mysql',
);
-@@ -927,8 +929,10 @@
+@@ -927,8 +929,10 @@ sub update_data {
update_variables($dbh);
update_innodb($dbh);
$shared_memory_cache->set('data', $data);
}
-diff -urN munin-2.0.17/plugins/node.d/mysql_innodb.in munin-2.0.17-plugins/plugins/node.d/mysql_innodb.in
---- munin-2.0.17/plugins/node.d/mysql_innodb.in 2013-08-17 13:19:03.501062149 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/mysql_innodb.in 2013-08-17 13:18:51.994254767 +0200
+diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_innodb.in munin-2.0.25/plugins/node.d/mysql_innodb.in
+--- munin-2.0.25.orig/plugins/node.d/mysql_innodb.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mysql_innodb.in 2015-09-08 10:05:48.881593251 +0000
@@ -1,4 +1,4 @@
-#!@@GOODSH@@
+#!@@BASH@@
: << =cut
-diff -urN munin-2.0.17/plugins/node.d/mysql_slowqueries.in munin-2.0.17-plugins/plugins/node.d/mysql_slowqueries.in
---- munin-2.0.17/plugins/node.d/mysql_slowqueries.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/mysql_slowqueries.in 2013-08-17 13:18:51.817585940 +0200
-@@ -64,5 +64,5 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.25/plugins/node.d/mysql_slowqueries.in
+--- munin-2.0.25.orig/plugins/node.d/mysql_slowqueries.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mysql_slowqueries.in 2015-09-08 10:05:48.882593251 +0000
+@@ -64,5 +64,5 @@ if [ "$1" = "config" ]; then
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 -urN munin-2.0.17/plugins/node.d/mysql_threads.in munin-2.0.17-plugins/plugins/node.d/mysql_threads.in
---- munin-2.0.17/plugins/node.d/mysql_threads.in 2013-08-17 13:19:03.501062149 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/mysql_threads.in 2013-08-17 13:18:51.994254767 +0200
-@@ -74,5 +74,5 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_threads.in munin-2.0.25/plugins/node.d/mysql_threads.in
+--- munin-2.0.25.orig/plugins/node.d/mysql_threads.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mysql_threads.in 2015-09-08 10:05:48.882593251 +0000
+@@ -74,5 +74,5 @@ if [ "$1" = "config" ]; then
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 -urN munin-2.0.17/plugins/node.d/ntp_.in munin-2.0.17-plugins/plugins/node.d/ntp_.in
---- munin-2.0.17/plugins/node.d/ntp_.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_.in 2013-08-17 13:18:51.817585940 +0200
-@@ -57,26 +57,26 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_.in munin-2.0.25/plugins/node.d/ntp_.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_.in 2015-09-08 10:05:48.883593251 +0000
+@@ -57,26 +57,26 @@ use Net::DNS;
use Net::IP;
if ($ARGV[0] and $ARGV[0] eq "autoconf") {
$peerinfo =~ s/\R/ /g;
my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/);
print $peer_addr, "\n" unless $peer_addr eq "0.0.0.0";
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ my $srcadr;
my $delay;
my $offset;
my $jitter;
foreach my $line (@associations) {
if ($line =~ m/^\s*\d+/) {
-diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_err.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_err.in
---- munin-2.0.17/plugins/node.d/ntp_kernel_err.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_err.in 2013-08-17 13:18:51.820919315 +0200
-@@ -32,7 +32,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.25/plugins/node.d/ntp_kernel_err.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_kernel_err.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_kernel_err.in 2015-09-08 10:05:48.884593251 +0000
+@@ -32,7 +32,7 @@ EOF
export PATH=/usr/local/sbin:$PATH
if [ "$1" = "autoconf" ]; then
awk 'BEGIN { ev=1; }
/^estimated error:/ { ev=0; }
END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
-@@ -51,11 +51,11 @@
+@@ -51,11 +51,11 @@ fi
printf 'ntp_err.value '
fi
$cmd -c kerninfo | awk '/^estimated error:/ { print $3 }'
-diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_freq.in
---- munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in 2013-08-17 13:19:03.501062149 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_freq.in 2013-08-17 13:18:51.994254767 +0200
-@@ -39,7 +39,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in 2015-09-08 10:05:48.884593251 +0000
+@@ -39,7 +39,7 @@ EOF
export PATH=/usr/local/sbin:$PATH
if [ "$1" = "autoconf" ]; then
awk 'BEGIN { ev=1; }
/^pll frequency:/ { ev=0; }
END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
-@@ -65,11 +65,11 @@
+@@ -65,11 +65,11 @@ fi
printf 'ntp_pll_freq.value '
fi
$cmd -c kerninfo | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }'
-diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_off.in
---- munin-2.0.17/plugins/node.d/ntp_kernel_pll_off.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_off.in 2013-08-17 13:18:51.820919315 +0200
-@@ -32,7 +32,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.25/plugins/node.d/ntp_kernel_pll_off.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_off.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_kernel_pll_off.in 2015-09-08 10:05:48.885593251 +0000
+@@ -32,7 +32,7 @@ EOF
export PATH=/usr/local/sbin:$PATH
if [ "$1" = "autoconf" ]; then
awk 'BEGIN { ev=1; }
/^pll offset:/ { ev=0; }
END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
-@@ -51,11 +51,11 @@
+@@ -51,11 +51,11 @@ fi
printf 'ntp_pll_off.value '
fi
$cmd -c kerninfo | awk '/^pll offset:/ { print $3 }'
-diff -urN munin-2.0.17/plugins/node.d/ntp_offset.in munin-2.0.17-plugins/plugins/node.d/ntp_offset.in
---- munin-2.0.17/plugins/node.d/ntp_offset.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_offset.in 2013-08-17 13:18:51.820919315 +0200
-@@ -38,9 +38,9 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_offset.in munin-2.0.25/plugins/node.d/ntp_offset.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_offset.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_offset.in 2015-09-08 10:05:48.885593251 +0000
+@@ -38,9 +38,9 @@ Loosely based on ntp_ plugin, but rework
=cut
do_autoconf () {
0)
echo 'no (unable to list peers)'
exit 0
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ do_autoconf () {
}
do_config () {
set - $syspeer
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ EOF
do_ () {
# Fetch operation
set - $syspeer
-diff -urN munin-2.0.17/plugins/node.d/ntp_states.in munin-2.0.17-plugins/plugins/node.d/ntp_states.in
---- munin-2.0.17/plugins/node.d/ntp_states.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_states.in 2013-08-17 13:18:51.820919315 +0200
-@@ -72,10 +72,10 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_states.in munin-2.0.25/plugins/node.d/ntp_states.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_states.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_states.in 2015-09-08 10:05:48.886593251 +0000
+@@ -72,10 +72,10 @@ sub make_hash {
# 1 63933 931a yes yes none outlyer sys_peer 1
# 2 63934 943a yes yes none candidate sys_peer 3
$peerinfo =~ s/\s//g;
my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/);
-@@ -125,17 +125,17 @@
+@@ -125,17 +125,17 @@ sub make_names {
}
if ($ARGV[0] and $ARGV[0] eq "autoconf") {
exit 0;
}
}
-diff -urN munin-2.0.17/plugins/node.d/nut_misc.in munin-2.0.17-plugins/plugins/node.d/nut_misc.in
---- munin-2.0.17/plugins/node.d/nut_misc.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/nut_misc.in 2013-08-17 13:18:51.820919315 +0200
-@@ -38,7 +38,8 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/nut_misc.in munin-2.0.25/plugins/node.d/nut_misc.in
+--- munin-2.0.25.orig/plugins/node.d/nut_misc.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/nut_misc.in 2015-09-08 10:05:48.886593251 +0000
+@@ -38,7 +38,8 @@ use strict;
my %status;
my %config = (
upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc'
);
-@@ -48,11 +49,6 @@
+@@ -48,11 +49,6 @@ my %graph = (
type => 'GAUGE',
draw => 'LINE2'
},
'battery_runtime' => {
label => 'runtime - min',
type => 'GAUGE',
-@@ -76,7 +72,12 @@
+@@ -76,7 +72,12 @@ my %graph = (
);
if ( defined $ARGV[0] and $ARGV[0] eq 'config' ) {
#print "graph_args -l 110\n";
#print "graph_vlabel Misc\n";
foreach my $key (keys %graph) {
-@@ -89,7 +90,7 @@
+@@ -89,7 +90,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq 'c
}
sub fetch_values {
while ($data =~ /([a-z.]+): (.+)\b/g) {
my $label = $1;
my $value = $2;
-diff -urN munin-2.0.17/plugins/node.d/nut_volts.in munin-2.0.17-plugins/plugins/node.d/nut_volts.in
---- munin-2.0.17/plugins/node.d/nut_volts.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/nut_volts.in 2013-08-17 13:18:51.820919315 +0200
-@@ -14,7 +14,8 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/nut_volts.in munin-2.0.25/plugins/node.d/nut_volts.in
+--- munin-2.0.25.orig/plugins/node.d/nut_volts.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/nut_volts.in 2015-09-08 10:05:48.887593251 +0000
+@@ -14,7 +14,8 @@ use strict;
my %status;
my %config = (
upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc'
);
-@@ -24,16 +25,6 @@
+@@ -24,16 +25,6 @@ my %graph = (
type => 'GAUGE',
draw => 'LINE2'
},
'output_voltage' => {
label => 'output',
type => 'GAUGE',
-@@ -42,7 +33,12 @@
+@@ -42,7 +33,12 @@ my %graph = (
);
if ( defined $ARGV[0] and $ARGV[0] eq 'config' ) {
print "graph_args -l 115\n";
print "graph_vlabel Volts\n";
foreach my $key (keys %graph) {
-@@ -55,7 +51,7 @@
+@@ -55,7 +51,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq 'c
}
sub fetch_values {
while ($data =~ /([a-z.]+): (.+)\b/g) {
my $label = $1;
my $value = $2;
-diff -urN munin-2.0.17/plugins/node.d/perdition.in munin-2.0.17-plugins/plugins/node.d/perdition.in
---- munin-2.0.17/plugins/node.d/perdition.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/perdition.in 2013-08-17 13:18:51.820919315 +0200
-@@ -56,7 +56,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/perdition.in munin-2.0.25/plugins/node.d/perdition.in
+--- munin-2.0.25.orig/plugins/node.d/perdition.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/perdition.in 2015-09-08 10:05:48.887593251 +0000
+@@ -56,7 +56,7 @@ mktempfile () {
# Set the location of the perdition logs
PERDITION_LOG=${logfile:-/var/log/perdition.log}
OFFSET_FILE=${MUNIN_PLUGSTATE}/perdition.offset
case $1 in
autoconf|detect)
-diff -urN munin-2.0.17/plugins/node.d/pop_stats.in munin-2.0.17-plugins/plugins/node.d/pop_stats.in
---- munin-2.0.17/plugins/node.d/pop_stats.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/pop_stats.in 2013-08-17 13:18:51.820919315 +0200
-@@ -68,7 +68,9 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/pop_stats.in munin-2.0.25/plugins/node.d/pop_stats.in
+--- munin-2.0.25.orig/plugins/node.d/pop_stats.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/pop_stats.in 2015-09-08 10:05:48.888593251 +0000
+@@ -68,7 +68,9 @@ if (!defined $pos)
if ($startsize < $pos)
{
# Log rotated
$pos = 0;
}
-diff -urN munin-2.0.17/plugins/node.d/postgres_scans_.in munin-2.0.17-plugins/plugins/node.d/postgres_scans_.in
---- munin-2.0.17/plugins/node.d/postgres_scans_.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/postgres_scans_.in 2013-08-17 13:18:51.820919315 +0200
-@@ -65,7 +65,6 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/postgres_scans_.in munin-2.0.25/plugins/node.d/postgres_scans_.in
+--- munin-2.0.25.orig/plugins/node.d/postgres_scans_.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/postgres_scans_.in 2015-09-08 10:05:48.888593251 +0000
+@@ -65,7 +65,6 @@ my $pg = Munin::Plugin::Pgsql->new(
vlabel => 'Scans / sec',
basequery =>
"SELECT COALESCE(sum(seq_scan),0) AS sequential, COALESCE(sum(idx_scan),0) AS index FROM pg_stat_user_tables",
pivotquery => 1,
configquery =>
"VALUES ('sequential','Sequential scans'), ('index','Index scans')",
-diff -urN munin-2.0.17/plugins/node.d/postgres_tuples_.in munin-2.0.17-plugins/plugins/node.d/postgres_tuples_.in
---- munin-2.0.17/plugins/node.d/postgres_tuples_.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/postgres_tuples_.in 2013-08-17 13:18:51.820919315 +0200
-@@ -74,7 +74,6 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/postgres_tuples_.in munin-2.0.25/plugins/node.d/postgres_tuples_.in
+--- munin-2.0.25.orig/plugins/node.d/postgres_tuples_.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/postgres_tuples_.in 2015-09-08 10:05:48.889593251 +0000
+@@ -74,7 +74,6 @@ my $pg = Munin::Plugin::Pgsql->new(
. " COALESCE(sum(n_tup_del),0) AS deleted FROM pg_stat_user_tables",
],
],
pivotquery => 1,
configquery => [
"VALUES ('seqread','Tuples sequentally read'), ('idxfetch','Tuples index fetched'), ('inserted','Tuples inserted'),"
-diff -urN munin-2.0.17/plugins/node.d/slapd_.in munin-2.0.17-plugins/plugins/node.d/slapd_.in
---- munin-2.0.17/plugins/node.d/slapd_.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/slapd_.in 2013-08-17 13:18:51.820919315 +0200
-@@ -37,7 +37,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/slapd_.in munin-2.0.25/plugins/node.d/slapd_.in
+--- munin-2.0.25.orig/plugins/node.d/slapd_.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/slapd_.in 2015-09-08 10:05:48.890593251 +0000
+@@ -37,7 +37,7 @@ use vars qw ( $config $param $act $scope
# Change these to reflect your LDAP ACL. The given DN must have
# read access to the Monitor branch.
my $server = ($ENV{'server'} || 'localhost');
my $userdn = ($ENV{'binddn'} || '');
my $userpw = ($ENV{'bindpw'} || '');
-diff -urN munin-2.0.17/plugins/node.d.linux/files_.in munin-2.0.17-plugins/plugins/node.d.linux/files_.in
---- munin-2.0.17/plugins/node.d.linux/files_.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/files_.in 2013-08-17 13:18:51.820919315 +0200
-@@ -14,7 +14,7 @@
- #%# capabilities=autoconf
-
- PROC=${0##*/files_}
--TMPFILE="$MUNIN_PLUGSTATE/munin-files_${PROC}.state"
-+TMPFILE="@@PLUGSTATE@@/munin-files_${PROC}.state"
-
- if [ "$1" = "autoconf" ]; then
- if [ -x /usr/sbin/lsof ]; then
-diff -urN munin-2.0.17/plugins/node.d.linux/iostat.in munin-2.0.17-plugins/plugins/node.d.linux/iostat.in
---- munin-2.0.17/plugins/node.d.linux/iostat.in 2013-08-17 13:19:03.504395523 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/iostat.in 2013-08-17 13:18:51.994254767 +0200
-@@ -173,7 +173,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat.in munin-2.0.25/plugins/node.d.linux/iostat.in
+--- munin-2.0.25.orig/plugins/node.d.linux/iostat.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/iostat.in 2015-09-08 10:05:55.475593251 +0000
+@@ -173,7 +173,7 @@ sub fetch_detailed() {
if ($tmpnam =~ /\d+$/ and !$include_numbered) {
# Special case for devices like cXdXpX,
# like the cciss driver
}
next unless grep { $_ } @fields;
-diff -urN munin-2.0.17/plugins/node.d.linux/ip_.in munin-2.0.17-plugins/plugins/node.d.linux/ip_.in
---- munin-2.0.17/plugins/node.d.linux/ip_.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/ip_.in 2013-08-17 13:18:51.820919315 +0200
-@@ -127,14 +127,18 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/ip_.in munin-2.0.25/plugins/node.d.linux/ip_.in
+--- munin-2.0.25.orig/plugins/node.d.linux/ip_.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/ip_.in 2015-09-08 10:05:55.476593251 +0000
+@@ -127,14 +127,18 @@ case $IP in
# This is a fun hack to make the plugin ip6 compatible.
# Suggested in ticket #439 by "jodal".
eval 'iptables() {
echo "no (could not run iptables as user $(whoami))"
exit 0
else
-@@ -147,10 +151,10 @@
+@@ -147,10 +151,10 @@ if [[ "$1" == "autoconf" ]]; then
fi
fi
fi
exit 0
fi
-@@ -183,5 +187,5 @@
+@@ -183,5 +187,5 @@ fi;
# Escape .'s so they don't match _everything_?
IP=$(echo $IP | sed 's~\.~\\.~g')
-iptables -L ${OUTPUT} -v -n -x | awk "/$IP"'[ /]/ { print "out.value " $2; exit 0; }'
+/usr/sbin/iptables -L ${INPUT} -v -n -x | awk "/$IP"'[ \/]/ { print "in.value " $2; exit 0; }'
+/usr/sbin/iptables -L ${OUTPUT} -v -n -x | awk "/$IP"'[ \/]/ { print "out.value " $2; exit 0; }'
-diff -urN munin-2.0.17/plugins/node.d.linux/load.in munin-2.0.17-plugins/plugins/node.d.linux/load.in
---- munin-2.0.17/plugins/node.d.linux/load.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/load.in 2013-08-17 13:18:51.820919315 +0200
-@@ -59,20 +59,20 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/load.in munin-2.0.25/plugins/node.d.linux/load.in
+--- munin-2.0.25.orig/plugins/node.d.linux/load.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/load.in 2015-09-08 10:05:55.476593251 +0000
+@@ -59,20 +59,20 @@ if [ "$1" = "config" ]; then
# one machine answer for several)
# The title of the graph
# These two read the environment for warning values for the field
# "load". If "load_warning" or "warning" aren't set in the
# environment, no warning levels are set. Likewise for "load_critical"
-@@ -82,8 +82,8 @@
+@@ -82,8 +82,8 @@ if [ "$1" = "config" ]; then
# This one is purely to add an explanation to the web page. The first
# one is for the graph itself, while the second one is for the field
# "load".
# Last, if run with the "config"-parameter, quit here (don't
# display any data)
-diff -urN munin-2.0.17/plugins/node.d.linux/nfs_client.in munin-2.0.17-plugins/plugins/node.d.linux/nfs_client.in
---- munin-2.0.17/plugins/node.d.linux/nfs_client.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/nfs_client.in 2013-08-17 13:18:51.820919315 +0200
-@@ -31,7 +31,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/nfs_client.in munin-2.0.25/plugins/node.d.linux/nfs_client.in
+--- munin-2.0.25.orig/plugins/node.d.linux/nfs_client.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/nfs_client.in 2015-09-08 10:05:55.477593251 +0000
+@@ -31,7 +31,7 @@ NFS=/proc/net/rpc/nfs
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
echo yes
exit 0
else
-@@ -51,11 +51,66 @@
+@@ -51,11 +51,66 @@ if [ "$1" = "config" ]; then
exit 0
fi
+ print "commit.value " nfs_commit
}' $NFS
-
-diff -urN munin-2.0.17/plugins/node.d.linux/nfsd.in munin-2.0.17-plugins/plugins/node.d.linux/nfsd.in
---- munin-2.0.17/plugins/node.d.linux/nfsd.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/nfsd.in 2013-08-17 13:18:51.820919315 +0200
-@@ -31,7 +31,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/nfsd.in munin-2.0.25/plugins/node.d.linux/nfsd.in
+--- munin-2.0.25.orig/plugins/node.d.linux/nfsd.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/nfsd.in 2015-09-08 10:05:55.477593251 +0000
+@@ -31,7 +31,7 @@ NFSD=/proc/net/rpc/nfsd
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
echo yes
exit 0
else
-@@ -51,9 +51,66 @@
+@@ -51,9 +51,66 @@ if [ "$1" = "config" ]; then
exit 0
fi
+ print "pathconf.value " nfs_pathconf
+ print "commit.value " nfs_commit
+}' $NFSD
-diff -urN munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.17-plugins/plugins/node.d.linux/vlan_inetuse_.in
---- munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/vlan_inetuse_.in 2013-08-17 13:18:51.820919315 +0200
-@@ -37,8 +37,8 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.25/plugins/node.d.linux/vlan_inetuse_.in
+--- munin-2.0.25.orig/plugins/node.d.linux/vlan_inetuse_.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/vlan_inetuse_.in 2015-09-08 10:05:55.477593251 +0000
+@@ -37,8 +37,8 @@ my %contraries = ("dpt" => "spt", "spt"
my %in_octets = ();
my %out_octets = ();
while (<IN>)
{
if (/^\s*\d+\s+(\d+) +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
-@@ -49,10 +49,10 @@
+@@ -49,10 +49,10 @@ while (<IN>)
}
}
close IN;
while (<IN>)
{
if (/^\s*\d+\s+(\d+) +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ while (<IN>)
}
}
close IN;
if ($ARGV[0] and $ARGV[0] eq "config")
{
-diff -urN munin-2.0.17/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.17-plugins/plugins/node.d.linux/vlan_linkuse_.in
---- munin-2.0.17/plugins/node.d.linux/vlan_linkuse_.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/vlan_linkuse_.in 2013-08-17 13:18:51.820919315 +0200
-@@ -29,8 +29,8 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.25/plugins/node.d.linux/vlan_linkuse_.in
+--- munin-2.0.25.orig/plugins/node.d.linux/vlan_linkuse_.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/vlan_linkuse_.in 2015-09-08 10:05:55.477593251 +0000
+@@ -29,8 +29,8 @@ my %contraries = ("dpt" => "spt", "spt"
my %in_octets = ();
my %out_octets = ();
while (<IN>)
{
if (/^\s*\d+\s+(\d+) +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
-@@ -58,10 +58,10 @@
+@@ -58,10 +58,10 @@ while (<IN>)
}
}
close IN;
while (<IN>)
{
if (/^\s*\d+\s+(\d+) +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
-@@ -84,5 +84,5 @@
+@@ -84,5 +84,5 @@ while (<IN>)
}
}
close IN;
-die "Error running iptables. Dying\n" if $?;
+die "Error running /usr/sbin/iptables. Dying\n" if $?;
# vim:syntax=perl
-diff -urN munin-2.0.17/plugins/node.d.linux/vserver_resources.in munin-2.0.17-plugins/plugins/node.d.linux/vserver_resources.in
---- munin-2.0.17/plugins/node.d.linux/vserver_resources.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/vserver_resources.in 2013-08-17 13:18:51.820919315 +0200
-@@ -245,6 +245,12 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/vserver_resources.in munin-2.0.25/plugins/node.d.linux/vserver_resources.in
+--- munin-2.0.25.orig/plugins/node.d.linux/vserver_resources.in 2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/vserver_resources.in 2015-09-08 10:05:55.478593251 +0000
+@@ -245,6 +245,12 @@ if [ "$1" = "config" ]; then
echo 'graph_vlabel ANON pages'
echo 'graph_info Shows anonymous memory (human readable) used by each vserver.'
;;
FILES)
echo 'graph_title Files used by vserver'
echo 'graph_args --base 1024k -l 0'
-@@ -281,6 +287,30 @@
+@@ -281,6 +287,30 @@ if [ "$1" = "config" ]; then
echo 'graph_vlabel SHM pages'
echo 'graph_info Shows shared memory (human readable) used by each vserver.'
;;
*)
echo "$RESOURCE not defined."
exit 1
-@@ -299,53 +329,108 @@
+@@ -299,53 +329,108 @@ if [ "$1" = "config" ]; then
case "$RESOURCE" in
PROC)
;;
*)
echo "$RESOURCE not defined."
-@@ -356,7 +441,7 @@
+@@ -356,7 +441,7 @@ if [ "$1" = "config" ]; then
if [ ! -z "$LIMITS" -a "$LIMITS" = 1 ]; then
LIMIT=`cat /proc/virtual/$xid/limit | grep $RESOURCE | cut -f4`
if [ ${LIMIT:-0} -gt 0 ]; then
fi
fi
done
-@@ -367,8 +452,15 @@
+@@ -367,8 +452,15 @@ fi
for xid in $XIDS ; do
LABEL=`cat /proc/virtual/$xid/$NAMELOC |grep NodeName |cut -f2`
NAME=`echo $LABEL | cut -d. -f1 | tr '-' '_'`
TLD / packages / munin.git / blobdiff