X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmunin.git;a=blobdiff_plain;f=munin-plugins.patch;fp=munin-plugins.patch;h=3dc24ed63fb771dbf349998a45293d78b4635b7f;hp=d59036bd96b683b6092e24bf56bff53801433eca;hb=1342d283cc5c3ac190405acb3b922cdd17141ec3;hpb=311ac2dde740f49b86d1b3232194529739695dad diff --git a/munin-plugins.patch b/munin-plugins.patch index d59036b..3dc24ed 100644 --- a/munin-plugins.patch +++ b/munin-plugins.patch @@ -1,149 +1,7 @@ -diff -urNpa munin-2.0.42.orig/dists/tarball/plugins.conf munin-2.0.42/dists/tarball/plugins.conf ---- munin-2.0.42.orig/dists/tarball/plugins.conf 2018-10-11 15:00:48.919033000 +0000 -+++ munin-2.0.42/dists/tarball/plugins.conf 2018-10-11 15:01:25.723033000 +0000 -@@ -14,6 +14,9 @@ - # - # - -+[*] -+env.logtail /usr/bin/logtail -+ - [mysql*] - #env.mysqlopts -u someuser - -@@ -31,3 +34,128 @@ user root - - [postfix*] - user root -+env.logdir /var/log -+env.logfile maillog -+ -+[netstat] -+group proc -+ -+[amavis*] -+user root -+env.amavislog /var/log/maillog -+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 -+ -+[fw*] -+group proc -+ -+[if*] -+group proc -+ -+[dhcpd3] -+user root -+env.leasefile /var/lib/dhcpd/dhcpd.leases -+env.configfile /etc/dhcpd.conf -+ -+[ip_*] -+user root -+ -+[munin*] -+user munin -+ -+[ping_*] -+group adm -+ -+[port_*] -+group proc -+ -+[processes] -+group proc -+ -+[ps_*] -+group proc -+ -+[psu_*] -+group proc -+ -+[nfs*] -+group proc -+ -+[entropy] -+group proc -+ -+[open_*] -+group proc -+ -+[nut*] -+env.upsname SmartUPS -+env.upshost 127.0.0.1 -+ -+[df*] -+#user root # if you have mode 0000 /vservers dir -+group proc -+ -+# Sane defaults for plugins from MuninExchange -+ -+[apache_smaps] -+#user root # if you have kernel with grsecurity -+group proc -+env.pname httpd.prefork -+env.puser http -+ -+[dovecot] -+user root -+env.logfile /var/log/maillog -+ -+[php_eaccelerator] -+env.user admin -+env.password eAccelerator -+env.url http://127.0.0.1/eaccelerator/control.php -+ -+[proftpd*] -+user root -+env.logfile /var/log/xferlog -+ -+[vsftpd*] -+user root -+env.logfile /var/log/vsftpd.log -+ -+[postgrey*] -+user root -+env.logfile /var/log/maillog -+ -+[nagiosstatus] -+user root -+env.statuslog /var/lib/nagios/status.dat -+ -+[freeradius] -+user root -+env.radius_log /var/log/freeradius/radius.log -+ -+[ipmitool_sensor*] -+user root -+timeout 20 -+ -+[openvpn_clients] -+user root -+env.logfile /var/log/openvpn/status.log -+ -+[cupsys_pages] -+user root -diff -urNpa munin-2.0.42.orig/plugins/node.d/amavis.in munin-2.0.42/plugins/node.d/amavis.in ---- munin-2.0.42.orig/plugins/node.d/amavis.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d/amavis.in 2018-10-11 15:22:35.158033000 +0000 -@@ -76,7 +76,7 @@ GPLv2 +diff -ur munin-2.0.65.orig/plugins/node.d/amavis.in munin-2.0.65/plugins/node.d/amavis.in +--- munin-2.0.65.orig/plugins/node.d/amavis.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/amavis.in 2021-01-04 17:53:09.637969144 +0100 +@@ -76,7 +76,7 @@ AMAVIS_LOG=${amavislog:-/var/log/mail/mail.info} LOGTAIL=${logtail:-logtail} @@ -152,7 +10,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/amavis.in munin-2.0.42/plugins/node if [ "$1" = "autoconf" ]; then if [ -f "${AMAVIS_LOG}" ] && [ -n "${LOGTAIL}" ] && [ -x "${LOGTAIL}" ] ; then -@@ -99,7 +99,7 @@ fi +@@ -99,7 +99,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Amavis filter statistics' @@ -161,7 +19,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/amavis.in munin-2.0.42/plugins/node echo 'graph_category antivirus' echo 'virus.label virus' echo 'virus.info Number of viruses caught in email' -@@ -117,7 +117,7 @@ virus=U +@@ -117,7 +117,7 @@ spamm=U spams=U @@ -170,18 +28,18 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/amavis.in munin-2.0.42/plugins/node if [ -n "$TEMP_FILE" ] && [ -f "$TEMP_FILE" ]; then if [ "$ARGS" != 0 ]; then -diff -urNpa munin-2.0.42.orig/plugins/node.d/apache_accesses.in munin-2.0.42/plugins/node.d/apache_accesses.in ---- munin-2.0.42.orig/plugins/node.d/apache_accesses.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d/apache_accesses.in 2018-10-11 15:01:25.724033000 +0000 -@@ -103,6 +103,7 @@ if (! eval "require LWP::UserAgent;") +diff -ur munin-2.0.65.orig/plugins/node.d/apache_accesses.in munin-2.0.65/plugins/node.d/apache_accesses.in +--- munin-2.0.65.orig/plugins/node.d/apache_accesses.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/apache_accesses.in 2021-01-04 17:53:09.638969144 +0100 +@@ -99,6 +99,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 ( defined $ARGV[0] and $ARGV[0] eq "autoconf" ) - { -@@ -143,7 +144,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a + + # Convert an URL with the %d placeholder into a string. Allow URL without placeholder. +@@ -147,7 +148,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" ) { @@ -194,18 +52,18 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/apache_accesses.in munin-2.0.42/plu print "graph_args --base 1000\n"; print "graph_vlabel accesses / \${graph_period}\n"; print "graph_category apache\n"; -diff -urNpa munin-2.0.42.orig/plugins/node.d/apache_processes.in munin-2.0.42/plugins/node.d/apache_processes.in ---- munin-2.0.42.orig/plugins/node.d/apache_processes.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d/apache_processes.in 2018-10-11 15:01:25.724033000 +0000 -@@ -110,6 +110,7 @@ if (! eval "require LWP::UserAgent;") +diff -ur munin-2.0.65.orig/plugins/node.d/apache_processes.in munin-2.0.65/plugins/node.d/apache_processes.in +--- munin-2.0.65.orig/plugins/node.d/apache_processes.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/apache_processes.in 2021-01-04 17:53:09.638969144 +0100 +@@ -106,6 +106,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; my $SHOWFREE = !exists $ENV{'showfree'} || $ENV{'showfree'}; - if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" ) -@@ -150,7 +151,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a + +@@ -154,7 +155,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" ) { @@ -218,18 +76,18 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/apache_processes.in munin-2.0.42/pl print "graph_args --base 1000 -l 0\n"; print "graph_category apache\n"; print "graph_order "; -diff -urNpa munin-2.0.42.orig/plugins/node.d/apache_volume.in munin-2.0.42/plugins/node.d/apache_volume.in ---- munin-2.0.42.orig/plugins/node.d/apache_volume.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d/apache_volume.in 2018-10-11 15:01:25.724033000 +0000 -@@ -103,6 +103,7 @@ if (! eval "require LWP::UserAgent;") +diff -ur munin-2.0.65.orig/plugins/node.d/apache_volume.in munin-2.0.65/plugins/node.d/apache_volume.in +--- munin-2.0.65.orig/plugins/node.d/apache_volume.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/apache_volume.in 2021-01-04 17:53:09.639969144 +0100 +@@ -99,6 +99,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 ( defined $ARGV[0] and $ARGV[0] eq "autoconf" ) - { -@@ -143,7 +144,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a + + # Convert an URL with the %d placeholder into a string. Allow URL without placeholder. +@@ -147,7 +148,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" ) { @@ -242,10 +100,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/apache_volume.in munin-2.0.42/plugi print "graph_args --base 1000\n"; print "graph_vlabel bytes per \${graph_period}\n"; print "graph_category apache\n"; -diff -urNpa munin-2.0.42.orig/plugins/node.d/bind9.in munin-2.0.42/plugins/node.d/bind9.in ---- munin-2.0.42.orig/plugins/node.d/bind9.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d/bind9.in 2018-10-11 15:01:25.724033000 +0000 -@@ -53,7 +53,7 @@ GPLv2 +diff -ur munin-2.0.65.orig/plugins/node.d/bind9.in munin-2.0.65/plugins/node.d/bind9.in +--- munin-2.0.65.orig/plugins/node.d/bind9.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/bind9.in 2021-01-04 17:53:09.639969144 +0100 +@@ -53,7 +53,7 @@ use strict; my $QUERYLOG = $ENV{logfile} || '/var/log/bind9/query.log'; @@ -254,7 +112,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/bind9.in munin-2.0.42/plugins/node. my $OTHER=0; my %IN; -@@ -63,7 +63,7 @@ sub get_state { +@@ -63,7 +63,7 @@ open(Q, ">", $STATEFILE); close(Q); } @@ -263,10 +121,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/bind9.in munin-2.0.42/plugins/node. while () { chomp; my ($q,$n) = split(/\s+/,$_,2); -diff -urNpa munin-2.0.42.orig/plugins/node.d/courier_.in munin-2.0.42/plugins/node.d/courier_.in ---- munin-2.0.42.orig/plugins/node.d/courier_.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d/courier_.in 2018-10-11 15:01:25.725033000 +0000 -@@ -55,7 +55,7 @@ Unknown +diff -ur munin-2.0.65.orig/plugins/node.d/courier_.in munin-2.0.65/plugins/node.d/courier_.in +--- munin-2.0.65.orig/plugins/node.d/courier_.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/courier_.in 2021-01-04 17:53:09.639969144 +0100 +@@ -55,7 +55,7 @@ COURIER_LOG=${logfile:-/var/log/mail.log} SERVICE=${service:-$(basename "$0" | sed 's/^courier_//g')} OFFSET_FILE=${MUNIN_PLUGSTATE}/courier_${SERVICE}.offset @@ -275,10 +133,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/courier_.in munin-2.0.42/plugins/no case $1 in -diff -urNpa munin-2.0.42.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.42/plugins/node.d/courier_mta_mailstats.in ---- munin-2.0.42.orig/plugins/node.d/courier_mta_mailstats.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d/courier_mta_mailstats.in 2018-10-11 15:01:25.725033000 +0000 -@@ -108,7 +108,9 @@ if(!defined $pos) { +diff -ur munin-2.0.65.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.65/plugins/node.d/courier_mta_mailstats.in +--- munin-2.0.65.orig/plugins/node.d/courier_mta_mailstats.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/courier_mta_mailstats.in 2021-01-04 17:53:09.639969144 +0100 +@@ -108,7 +108,9 @@ if($startsize < $pos) { # Log rotated @@ -289,10 +147,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0. $pos = 0; } -diff -urNpa munin-2.0.42.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.42/plugins/node.d/courier_mta_mailvolume.in ---- munin-2.0.42.orig/plugins/node.d/courier_mta_mailvolume.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d/courier_mta_mailvolume.in 2018-10-11 15:01:25.725033000 +0000 -@@ -98,7 +98,9 @@ if(!defined $pos) { +diff -ur munin-2.0.65.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.65/plugins/node.d/courier_mta_mailvolume.in +--- munin-2.0.65.orig/plugins/node.d/courier_mta_mailvolume.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/courier_mta_mailvolume.in 2021-01-04 17:53:09.639969144 +0100 +@@ -98,7 +98,9 @@ if($startsize < $pos) { # Log rotated @@ -303,10 +161,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0 $pos = 0; } -diff -urNpa munin-2.0.42.orig/plugins/node.d/cupsys_pages.in munin-2.0.42/plugins/node.d/cupsys_pages.in ---- munin-2.0.42.orig/plugins/node.d/cupsys_pages.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d/cupsys_pages.in 2018-10-11 15:01:25.725033000 +0000 -@@ -100,7 +100,9 @@ if (!defined $pos) { +diff -ur munin-2.0.65.orig/plugins/node.d/cupsys_pages.in munin-2.0.65/plugins/node.d/cupsys_pages.in +--- munin-2.0.65.orig/plugins/node.d/cupsys_pages.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/cupsys_pages.in 2021-01-04 17:53:09.640969144 +0100 +@@ -105,7 +105,9 @@ } if ($startsize < $pos) { # Log rotated @@ -317,7 +175,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/cupsys_pages.in munin-2.0.42/plugin $pos = 0; } -@@ -146,7 +148,7 @@ sub parselogfile { +@@ -152,7 +154,7 @@ while (tell(LOGFILE) < $stop) { my $line = ; chomp ($line); @@ -326,9 +184,9 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/cupsys_pages.in munin-2.0.42/plugin if(!defined($printers{$1}) && keys(%printers) < $MAXLABEL) { $printers{$1} += int($2)*int($3); } elsif(defined($printers{$1})) { -diff -urNpa munin-2.0.42.orig/plugins/node.d/foldingathome_rank.in munin-2.0.42/plugins/node.d/foldingathome_rank.in ---- munin-2.0.42.orig/plugins/node.d/foldingathome_rank.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/foldingathome_rank.in 2018-10-11 15:01:25.726033000 +0000 +diff -ur munin-2.0.65.orig/plugins/node.d/foldingathome_rank.in munin-2.0.65/plugins/node.d/foldingathome_rank.in +--- munin-2.0.65.orig/plugins/node.d/foldingathome_rank.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/foldingathome_rank.in 2021-01-04 17:53:09.640969144 +0100 @@ -12,7 +12,7 @@ # scripts): #%# family=contrib @@ -338,10 +196,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/foldingathome_rank.in munin-2.0.42/ if [ "$1" = "config" ]; then echo 'graph_title Folding@Home Rank' -diff -urNpa munin-2.0.42.orig/plugins/node.d/mailman.in munin-2.0.42/plugins/node.d/mailman.in ---- munin-2.0.42.orig/plugins/node.d/mailman.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/mailman.in 2018-10-11 15:01:25.726033000 +0000 -@@ -39,7 +39,13 @@ $members = 0; +diff -ur munin-2.0.65.orig/plugins/node.d/mailman.in munin-2.0.65/plugins/node.d/mailman.in +--- munin-2.0.65.orig/plugins/node.d/mailman.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/mailman.in 2021-01-04 17:53:09.640969144 +0100 +@@ -39,7 +39,13 @@ # System paths $logfile = $ENV{'logfile'} || "/var/log/mailman/post"; $libdir = $ENV{'libdir'} || "/var/lib/mailman"; @@ -356,21 +214,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/mailman.in munin-2.0.42/plugins/nod if (-f "$logfile.0") { -@@ -104,7 +110,9 @@ if(!defined $pos) { - $startsize = 0; - } elsif($startsize < $pos) { - # Log rotated -- parseMailmanLog($rotlogfile, $pos, (stat $rotlogfile)[7]); -+ if (-f $rotlogfile) { -+ parseMailmanLog($rotlogfile, $pos, (stat $rotlogfile)[7]); -+ } - $pos = 0; - } - -diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_.in munin-2.0.42/plugins/node.d/mysql_.in ---- munin-2.0.42.orig/plugins/node.d/mysql_.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/mysql_.in 2018-10-11 15:01:25.727033000 +0000 -@@ -50,6 +50,7 @@ Non-default example: +diff -ur munin-2.0.65.orig/plugins/node.d/mysql_.in munin-2.0.65/plugins/node.d/mysql_.in +--- munin-2.0.65.orig/plugins/node.d/mysql_.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/mysql_.in 2021-01-04 17:53:09.641969144 +0100 +@@ -50,6 +50,7 @@ env.mysqlconnection DBI:mysql:information_schema;host=127.0.0.1;port=3306 env.mysqluser munin env.mysqlpassword geheim @@ -378,7 +225,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_.in munin-2.0.42/plugins/node env.cachenamespace munin_mysql_pri [mysql2_*] env.mysqlconnection DBI:mysql:information_schema;host=127.0.0.1;port=13306 -@@ -189,6 +190,7 @@ my %config = ( +@@ -194,6 +195,7 @@ 'user' => $ENV{'mysqluser'} || 'root', 'password' => $ENV{'mysqlpassword'} || '', 'cache_namespace' => $ENV{'cachenamespace'} || 'munin_mysql', @@ -386,7 +233,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_.in munin-2.0.42/plugins/node ); -@@ -1111,8 +1113,10 @@ sub update_data { +@@ -1117,8 +1119,10 @@ update_variables($dbh); update_plugins($dbh); update_innodb($dbh); @@ -399,19 +246,19 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_.in munin-2.0.42/plugins/node $shared_memory_cache->set('data', $data); $shared_memory_cache->set('graphs', nfreeze(\%graphs)); -diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_innodb.in munin-2.0.42/plugins/node.d/mysql_innodb.in ---- munin-2.0.42.orig/plugins/node.d/mysql_innodb.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/mysql_innodb.in 2018-10-11 15:01:25.727033000 +0000 +diff -ur munin-2.0.65.orig/plugins/node.d/mysql_innodb.in munin-2.0.65/plugins/node.d/mysql_innodb.in +--- munin-2.0.65.orig/plugins/node.d/mysql_innodb.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/mysql_innodb.in 2021-01-04 17:53:09.641969144 +0100 @@ -1,4 +1,4 @@ -#!@@GOODSH@@ +#!@@BASH@@ : << =cut -diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.42/plugins/node.d/mysql_slowqueries.in ---- munin-2.0.42.orig/plugins/node.d/mysql_slowqueries.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/mysql_slowqueries.in 2018-10-11 15:18:55.849033000 +0000 -@@ -61,6 +61,6 @@ if [ "$1" = "config" ]; then +diff -ur munin-2.0.65.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.65/plugins/node.d/mysql_slowqueries.in +--- munin-2.0.65.orig/plugins/node.d/mysql_slowqueries.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/mysql_slowqueries.in 2021-01-04 17:53:09.641969144 +0100 +@@ -61,6 +61,6 @@ exit 0 fi @@ -419,10 +266,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.42/p +/bin/printf "queries.value " # shellcheck disable=SC2086 ("$MYSQLADMIN" $MYSQLOPTS status 2>/dev/null || echo a a a a a a a a U) | awk '{print $9}' -diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_threads.in munin-2.0.42/plugins/node.d/mysql_threads.in ---- munin-2.0.42.orig/plugins/node.d/mysql_threads.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/mysql_threads.in 2018-10-11 15:19:08.599033000 +0000 -@@ -70,6 +70,6 @@ if [ "$1" = "config" ]; then +diff -ur munin-2.0.65.orig/plugins/node.d/mysql_threads.in munin-2.0.65/plugins/node.d/mysql_threads.in +--- munin-2.0.65.orig/plugins/node.d/mysql_threads.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/mysql_threads.in 2021-01-04 17:53:09.641969144 +0100 +@@ -70,6 +70,6 @@ exit 0 fi @@ -430,30 +277,22 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_threads.in munin-2.0.42/plugi +/bin/printf "threads.value " # shellcheck disable=SC2086 ("$MYSQLADMIN" $MYSQLOPTS status 2>/dev/null || echo 'a a a U') | awk '{print $4}' -diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_.in munin-2.0.42/plugins/node.d/ntp_.in ---- munin-2.0.42.orig/plugins/node.d/ntp_.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/ntp_.in 2018-10-11 15:01:25.728033000 +0000 -@@ -57,26 +57,26 @@ use Net::DNS; - use Net::IP; - - if ($ARGV[0] and $ARGV[0] eq "autoconf") { -- `ntpq -c help >/dev/null 2>/dev/null`; -+ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`; - if ($CHILD_ERROR eq "0") { -- if (`ntpq -n -c peers | wc -l` > 0) { -+ if (`/usr/sbin/ntpq -n -c peers | wc -l` > 0) { - print "yes\n"; - exit 0; - } else { -- print "no (ntpq -p returned no peers)\n"; -+ print "no (/usr/sbin/ntpq -p returned no peers)\n"; - exit 0; - } +diff -ur munin-2.0.65.orig/plugins/node.d/ntp_.in munin-2.0.65/plugins/node.d/ntp_.in +--- munin-2.0.65.orig/plugins/node.d/ntp_.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/ntp_.in 2021-01-04 17:57:57.057969144 +0100 +@@ -68,9 +68,9 @@ + if (!$has_requirements) { + print "no (missing Net::DNS or Net::IP modules)\n"; } else { -- print "no (ntpq not found)\n"; -+ print "no (/usr/sbin/ntpq not found)\n"; - exit 0; - } +- `ntpq -c help >/dev/null 2>/dev/null`; ++ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`; + if ($CHILD_ERROR eq "0") { +- if (`ntpq -n -c peers | wc -l` > 0) { ++ if (`/usr/sbin/ntpq -n -c peers | wc -l` > 0) { + print "yes\n"; + } else { + print "no (ntpq -p returned no peers)\n"; +@@ -83,10 +83,10 @@ } if ($ARGV[0] and $ARGV[0] eq "suggest") { @@ -466,19 +305,34 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_.in munin-2.0.42/plugins/node.d $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 @@ my $srcadr; - my $delay; - my $offset; - my $jitter; +@@ -118,12 +118,12 @@ + my $delay = "U"; + my $offset = "U"; + my $jitter = "U"; -my @associations = `ntpq -c associations`; +my @associations = `/usr/sbin/ntpq -c associations`; foreach my $line (@associations) { if ($line =~ m/^\s*\d+/) { -diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.42/plugins/node.d/ntp_kernel_err.in ---- munin-2.0.42.orig/plugins/node.d/ntp_kernel_err.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/ntp_kernel_err.in 2018-10-11 15:21:12.578033000 +0000 -@@ -32,7 +32,7 @@ EOF + my (undef, undef, $assid, undef, undef, undef, undef, undef, undef, undef) = split(/\s+/, $line); +- chomp(my $peerinfo = `ntpq -n -c "readvar $assid srcadr,delay,offset,jitter"`); ++ chomp(my $peerinfo = `/usr/sbin/ntpq -n -c "readvar $assid srcadr,delay,offset,jitter"`); + $peerinfo =~ s/\R/ /g; + ($srcadr) = ($peerinfo =~ m/srcadr=([^, ]+)/); + ($delay) = ($peerinfo =~ m/delay=([^, ]+)/); +@@ -163,7 +163,7 @@ + ASSOCS: foreach my $line (@associations) { + if ($line =~ m/^\s*\d+/) { + my (undef, undef, $assid, undef, undef, undef, undef, undef, undef, undef) = split(/\s+/, $line); +- chomp(my $peerinfo = `ntpq -n -c "readvar $assid srcadr,delay,offset,jitter"`); ++ chomp(my $peerinfo = `/usr/sbin/ntpq -n -c "readvar $assid srcadr,delay,offset,jitter"`); + $peerinfo =~ s/\R/ /g; + ($srcadr) = ($peerinfo =~ m/srcadr=([^, ]+)/); + ($delay) = ($peerinfo =~ m/delay=([^, ]+)/); +diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.65/plugins/node.d/ntp_kernel_err.in +--- munin-2.0.65.orig/plugins/node.d/ntp_kernel_err.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/ntp_kernel_err.in 2021-01-04 17:56:35.893969144 +0100 +@@ -32,7 +32,7 @@ export PATH=/usr/local/sbin:$PATH if [ "$1" = "autoconf" ]; then @@ -487,23 +341,25 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.42/plug awk 'BEGIN { ev=1; } /^estimated error:/ { ev=0; } END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }' -@@ -51,9 +51,9 @@ fi +@@ -51,10 +51,10 @@ printf 'ntp_err.value ' --if [ "$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ] -+if [ "$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ] - then -- ntpq -c kerninfo | awk '/^estimated error:/ { print $3 / 1000 }' -+ /usr/sbin/ntpq -c kerninfo | awk '/^estimated error:/ { print $3 / 1000 }' +-ntpq_name=$(ntpq -c version | sed 's/[^[:alpha:]].*//') +-ntpq_version=$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]') ++ntpq_name=$(/usr/sbin/ntpq -c version | sed 's/[^[:alpha:]].*//') ++ntpq_version=$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]') + if [ "$ntpq_name" = "ntpq" ] && [ "$(echo "$ntpq_version" | tr -d '.')" -lt 427 ]; then +- ntpdc -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3) }' ++ /usr/sbin/ntpdc -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3) }' else -- ntpdc -c kerninfo | awk '/^estimated error:/ { print $3 }' -+ /usr/sbin/ntpdc -c kerninfo | awk '/^estimated error:/ { print $3 }' +- ntpq -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3 / 1000) }' ++ /usr/sbin/ntpq -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3 / 1000) }' fi -diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.42/plugins/node.d/ntp_kernel_pll_freq.in ---- munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_freq.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/ntp_kernel_pll_freq.in 2018-10-11 15:20:02.850033000 +0000 -@@ -39,7 +39,7 @@ EOF +diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.65/plugins/node.d/ntp_kernel_pll_freq.in +--- munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/ntp_kernel_pll_freq.in 2021-01-04 17:55:34.045969144 +0100 +@@ -35,7 +35,7 @@ export PATH=/usr/local/sbin:$PATH if [ "$1" = "autoconf" ]; then @@ -512,25 +368,27 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.42 awk 'BEGIN { ev=1; } /^pll frequency:/ { ev=0; } END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }' -@@ -65,11 +65,11 @@ fi +@@ -61,12 +61,12 @@ printf 'ntp_pll_freq.value ' --if [ "$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ] -+if [ "$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ] - then -- cmd=ntpq -+ cmd=/usr/sbin/ntpq - else +-ntpq_name=$(ntpq -c version | sed 's/[^[:alpha:]].*//') +-ntpq_version=$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]') ++ntpq_name=$(/usr/sbin/ntpq -c version | sed 's/[^[:alpha:]].*//') ++ntpq_version=$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]') + if [ "$ntpq_name" = "ntpq" ] && [ "$(echo "$ntpq_version" | tr -d '.')" -lt 427 ]; then - cmd=ntpdc + cmd=/usr/sbin/ntpdc + else +- cmd=ntpq ++ cmd=/usr/sbin/ntpq fi - $cmd -c kerninfo | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }' -diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.42/plugins/node.d/ntp_kernel_pll_off.in ---- munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_off.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/ntp_kernel_pll_off.in 2018-10-11 15:20:26.379033000 +0000 -@@ -32,7 +32,7 @@ EOF + "$cmd" -c kerninfo | awk -v "fcomp=$fcomp" '/^pll frequency:/ { printf("%.9f\n", $3 + fcomp) }' +diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.65/plugins/node.d/ntp_kernel_pll_off.in +--- munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_off.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/ntp_kernel_pll_off.in 2021-01-04 17:54:55.598969144 +0100 +@@ -32,7 +32,7 @@ export PATH=/usr/local/sbin:$PATH if [ "$1" = "autoconf" ]; then @@ -539,23 +397,25 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.42/ awk 'BEGIN { ev=1; } /^pll offset:/ { ev=0; } END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }' -@@ -51,9 +51,9 @@ fi +@@ -51,10 +51,10 @@ printf 'ntp_pll_off.value ' --if [ "$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ] -+if [ "$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ] - then -- ntpq -c kerninfo | awk '/^pll offset:/ { print $3 / 1000 }' -+ /usr/sbin/ntpq -c kerninfo | awk '/^pll offset:/ { print $3 / 1000 }' +-ntpq_name=$(ntpq -c version | sed 's/[^[:alpha:]].*//') +-ntpq_version=$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]') ++ntpq_name=$(/usr/sbin/ntpq -c version | sed 's/[^[:alpha:]].*//') ++ntpq_version=$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]') + if [ "$ntpq_name" = "ntpq" ] && [ "$(echo "$ntpq_version" | tr -d '.')" -lt 427 ]; then +- ntpdc -c kerninfo | awk '/^pll offset:/ { printf("%.9f\n", $3) }' ++ /usr/sbin/ntpdc -c kerninfo | awk '/^pll offset:/ { printf("%.9f\n", $3) }' else -- ntpdc -c kerninfo | awk '/^pll offset:/ { print $3 }' -+ /usr/sbin/ntpdc -c kerninfo | awk '/^pll offset:/ { print $3 }' +- ntpq -c kerninfo | awk '/^pll offset:/ { printf("%.9f\n", $3 / 1000) }' ++ /usr/sbin/ntpq -c kerninfo | awk '/^pll offset:/ { printf("%.9f\n", $3 / 1000) }' fi -diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_offset.in munin-2.0.42/plugins/node.d/ntp_offset.in ---- munin-2.0.42.orig/plugins/node.d/ntp_offset.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/ntp_offset.in 2018-10-11 15:01:25.729033000 +0000 -@@ -42,9 +42,9 @@ nodelay=${nodelay:-} +diff -ur munin-2.0.65.orig/plugins/node.d/ntp_offset.in munin-2.0.65/plugins/node.d/ntp_offset.in +--- munin-2.0.65.orig/plugins/node.d/ntp_offset.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/ntp_offset.in 2021-01-04 17:53:09.693969144 +0100 +@@ -42,9 +42,9 @@ do_autoconf () { @@ -567,7 +427,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_offset.in munin-2.0.42/plugins/ 0) echo 'no (unable to list peers)' exit 0 -@@ -61,7 +61,7 @@ do_autoconf () { +@@ -61,7 +61,7 @@ } do_config () { @@ -576,7 +436,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_offset.in munin-2.0.42/plugins/ # shellcheck disable=SC2086 set - $syspeer -@@ -91,7 +91,7 @@ EOF +@@ -91,7 +91,7 @@ do_ () { # Fetch operation @@ -585,10 +445,22 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_offset.in munin-2.0.42/plugins/ # shellcheck disable=SC2086 set - $syspeer -diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_states.in munin-2.0.42/plugins/node.d/ntp_states.in ---- munin-2.0.42.orig/plugins/node.d/ntp_states.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/ntp_states.in 2018-10-11 15:01:25.729033000 +0000 -@@ -77,10 +77,10 @@ sub make_hash { +diff -ur munin-2.0.65.orig/plugins/node.d/ntp_states.in munin-2.0.65/plugins/node.d/ntp_states.in +--- munin-2.0.65.orig/plugins/node.d/ntp_states.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/ntp_states.in 2021-01-04 17:55:58.249969144 +0100 +@@ -54,9 +54,9 @@ + if (!$has_net_dns) { + print "no (missing perl module Net::DNS)\n"; + } else { +- `ntpq -c help >/dev/null 2>/dev/null`; ++ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`; + if ($CHILD_ERROR eq "0") { +- if (`ntpq -n -c peers | wc -l` > 0) { ++ if (`/usr/sbin/ntpq -n -c peers | wc -l` > 0) { + print "yes\n"; + } else { + print "no (ntpq -p returned no peers)\n"; +@@ -98,10 +98,10 @@ # 1 63933 931a yes yes none outlier sys_peer 1 # 2 63934 943a yes yes none candidate sys_peer 3 @@ -601,32 +473,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_states.in munin-2.0.42/plugins/ $peerinfo =~ s/\s//g; my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/); -@@ -141,17 +141,17 @@ sub make_names { - } - - if ($ARGV[0] and $ARGV[0] eq "autoconf") { -- `ntpq -c help >/dev/null 2>/dev/null`; -+ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`; - if ($CHILD_ERROR eq "0") { -- if (`ntpq -n -c peers | wc -l` > 0) { -+ if (`/usr/sbin/ntpq -n -c peers | wc -l` > 0) { - print "yes\n"; - exit 0; - } else { -- print "no (ntpq -p returned no peers)\n"; -+ print "no (/usr/sbin/ntpq -p returned no peers)\n"; - exit 0; - } - } else { -- print "no (ntpq not found)\n"; -+ print "no (/usr/sbin/ntpq not found)\n"; - exit 0; - } - } -diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_misc.in munin-2.0.42/plugins/node.d/nut_misc.in ---- munin-2.0.42.orig/plugins/node.d/nut_misc.in 2018-10-11 15:00:48.916033000 +0000 -+++ munin-2.0.42/plugins/node.d/nut_misc.in 2018-10-11 15:01:25.729033000 +0000 -@@ -38,7 +38,8 @@ use strict; +diff -ur munin-2.0.65.orig/plugins/node.d/nut_misc.in munin-2.0.65/plugins/node.d/nut_misc.in +--- munin-2.0.65.orig/plugins/node.d/nut_misc.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/nut_misc.in 2021-01-04 17:53:09.694969144 +0100 +@@ -38,7 +38,8 @@ my %status; my %config = ( @@ -636,7 +486,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_misc.in munin-2.0.42/plugins/no upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc' ); -@@ -48,11 +49,6 @@ my %graph = ( +@@ -48,11 +49,6 @@ type => 'GAUGE', draw => 'LINE2' }, @@ -648,7 +498,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_misc.in munin-2.0.42/plugins/no 'battery_runtime' => { label => 'runtime - min', type => 'GAUGE', -@@ -76,7 +72,12 @@ my %graph = ( +@@ -76,7 +72,12 @@ ); if ( defined $ARGV[0] and $ARGV[0] eq 'config' ) { @@ -662,7 +512,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_misc.in munin-2.0.42/plugins/no #print "graph_args -l 110\n"; #print "graph_vlabel Misc\n"; foreach my $key (keys %graph) { -@@ -89,7 +90,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq 'c +@@ -89,7 +90,7 @@ } sub fetch_values { @@ -671,10 +521,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_misc.in munin-2.0.42/plugins/no while ($data =~ /([a-z.]+): (.+)\b/g) { my $label = $1; my $value = $2; -diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_volts.in munin-2.0.42/plugins/node.d/nut_volts.in ---- munin-2.0.42.orig/plugins/node.d/nut_volts.in 2018-10-11 15:00:48.917033000 +0000 -+++ munin-2.0.42/plugins/node.d/nut_volts.in 2018-10-11 15:01:25.730033000 +0000 -@@ -14,7 +14,8 @@ use strict; +diff -ur munin-2.0.65.orig/plugins/node.d/nut_volts.in munin-2.0.65/plugins/node.d/nut_volts.in +--- munin-2.0.65.orig/plugins/node.d/nut_volts.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/nut_volts.in 2021-01-04 17:53:09.694969144 +0100 +@@ -14,7 +14,8 @@ my %status; my %config = ( @@ -684,7 +534,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_volts.in munin-2.0.42/plugins/n upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc' ); -@@ -24,16 +25,6 @@ my %graph = ( +@@ -24,16 +25,6 @@ type => 'GAUGE', draw => 'LINE2' }, @@ -701,7 +551,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_volts.in munin-2.0.42/plugins/n 'output_voltage' => { label => 'output', type => 'GAUGE', -@@ -42,7 +33,12 @@ my %graph = ( +@@ -42,7 +33,12 @@ ); if ( defined $ARGV[0] and $ARGV[0] eq 'config' ) { @@ -715,7 +565,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_volts.in munin-2.0.42/plugins/n print "graph_args -l 115\n"; print "graph_vlabel Volts\n"; foreach my $key (keys %graph) { -@@ -55,7 +51,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq 'c +@@ -55,7 +51,7 @@ } sub fetch_values { @@ -724,10 +574,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_volts.in munin-2.0.42/plugins/n while ($data =~ /([a-z.]+): (.+)\b/g) { my $label = $1; my $value = $2; -diff -urNpa munin-2.0.42.orig/plugins/node.d/perdition.in munin-2.0.42/plugins/node.d/perdition.in ---- munin-2.0.42.orig/plugins/node.d/perdition.in 2018-10-11 15:00:48.917033000 +0000 -+++ munin-2.0.42/plugins/node.d/perdition.in 2018-10-11 15:01:25.730033000 +0000 -@@ -53,7 +53,7 @@ Unknown +diff -ur munin-2.0.65.orig/plugins/node.d/perdition.in munin-2.0.65/plugins/node.d/perdition.in +--- munin-2.0.65.orig/plugins/node.d/perdition.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/perdition.in 2021-01-04 17:53:09.695969144 +0100 +@@ -53,7 +53,7 @@ # Set the location of the perdition logs PERDITION_LOG=${logfile:-/var/log/perdition.log} OFFSET_FILE=${MUNIN_PLUGSTATE}/perdition.offset @@ -736,10 +586,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/perdition.in munin-2.0.42/plugins/n case $1 in autoconf|detect) -diff -urNpa munin-2.0.42.orig/plugins/node.d/pop_stats.in munin-2.0.42/plugins/node.d/pop_stats.in ---- munin-2.0.42.orig/plugins/node.d/pop_stats.in 2018-10-11 15:00:48.917033000 +0000 -+++ munin-2.0.42/plugins/node.d/pop_stats.in 2018-10-11 15:01:25.730033000 +0000 -@@ -68,7 +68,9 @@ if (!defined $pos) +diff -ur munin-2.0.65.orig/plugins/node.d/pop_stats.in munin-2.0.65/plugins/node.d/pop_stats.in +--- munin-2.0.65.orig/plugins/node.d/pop_stats.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/pop_stats.in 2021-01-04 17:53:09.695969144 +0100 +@@ -68,7 +68,9 @@ if ($startsize < $pos) { # Log rotated @@ -750,10 +600,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/pop_stats.in munin-2.0.42/plugins/n $pos = 0; } -diff -urNpa munin-2.0.42.orig/plugins/node.d/postgres_scans_.in munin-2.0.42/plugins/node.d/postgres_scans_.in ---- munin-2.0.42.orig/plugins/node.d/postgres_scans_.in 2018-10-11 15:00:48.917033000 +0000 -+++ munin-2.0.42/plugins/node.d/postgres_scans_.in 2018-10-11 15:01:25.730033000 +0000 -@@ -65,7 +65,6 @@ my $pg = Munin::Plugin::Pgsql->new( +diff -ur munin-2.0.65.orig/plugins/node.d/postgres_scans_.in munin-2.0.65/plugins/node.d/postgres_scans_.in +--- munin-2.0.65.orig/plugins/node.d/postgres_scans_.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/postgres_scans_.in 2021-01-04 17:53:09.695969144 +0100 +@@ -65,7 +65,6 @@ vlabel => 'Scans / sec', basequery => "SELECT COALESCE(sum(seq_scan),0) AS sequential, COALESCE(sum(idx_scan),0) AS index FROM pg_stat_user_tables", @@ -761,10 +611,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/postgres_scans_.in munin-2.0.42/plu pivotquery => 1, configquery => "VALUES ('sequential','Sequential scans'), ('index','Index scans')", -diff -urNpa munin-2.0.42.orig/plugins/node.d/postgres_tuples_.in munin-2.0.42/plugins/node.d/postgres_tuples_.in ---- munin-2.0.42.orig/plugins/node.d/postgres_tuples_.in 2018-10-11 15:00:48.917033000 +0000 -+++ munin-2.0.42/plugins/node.d/postgres_tuples_.in 2018-10-11 15:01:25.730033000 +0000 -@@ -74,7 +74,6 @@ my $pg = Munin::Plugin::Pgsql->new( +diff -ur munin-2.0.65.orig/plugins/node.d/postgres_tuples_.in munin-2.0.65/plugins/node.d/postgres_tuples_.in +--- munin-2.0.65.orig/plugins/node.d/postgres_tuples_.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/postgres_tuples_.in 2021-01-04 17:53:09.695969144 +0100 +@@ -74,7 +74,6 @@ . " COALESCE(sum(n_tup_del),0) AS deleted FROM pg_stat_user_tables", ], ], @@ -772,10 +622,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/postgres_tuples_.in munin-2.0.42/pl pivotquery => 1, configquery => [ "VALUES ('seqread','Tuples sequentally read'), ('idxfetch','Tuples index fetched'), ('inserted','Tuples inserted')," -diff -urNpa munin-2.0.42.orig/plugins/node.d/slapd_.in munin-2.0.42/plugins/node.d/slapd_.in ---- munin-2.0.42.orig/plugins/node.d/slapd_.in 2018-10-11 15:00:48.917033000 +0000 -+++ munin-2.0.42/plugins/node.d/slapd_.in 2018-10-11 15:01:25.730033000 +0000 -@@ -37,7 +37,7 @@ use vars qw ( $config $param $act $scope +diff -ur munin-2.0.65.orig/plugins/node.d/slapd_.in munin-2.0.65/plugins/node.d/slapd_.in +--- munin-2.0.65.orig/plugins/node.d/slapd_.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d/slapd_.in 2021-01-04 17:53:09.696969144 +0100 +@@ -37,7 +37,7 @@ # Change these to reflect your LDAP ACL. The given DN must have # read access to the Monitor branch. @@ -784,10 +634,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d/slapd_.in munin-2.0.42/plugins/node my $server = ($ENV{'server'} || 'localhost'); my $userdn = ($ENV{'binddn'} || ''); my $userpw = ($ENV{'bindpw'} || ''); -diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/iostat.in munin-2.0.42/plugins/node.d.linux/iostat.in ---- munin-2.0.42.orig/plugins/node.d.linux/iostat.in 2018-10-11 15:00:48.914033000 +0000 -+++ munin-2.0.42/plugins/node.d.linux/iostat.in 2018-10-11 15:01:25.731033000 +0000 -@@ -173,7 +173,7 @@ sub fetch_detailed() { +diff -ur munin-2.0.65.orig/plugins/node.d.linux/iostat.in munin-2.0.65/plugins/node.d.linux/iostat.in +--- munin-2.0.65.orig/plugins/node.d.linux/iostat.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d.linux/iostat.in 2021-01-04 17:53:09.715969144 +0100 +@@ -169,7 +169,7 @@ if ($tmpnam =~ /\d+$/ and !$include_numbered) { # Special case for devices like cXdXpX, # like the cciss driver @@ -796,10 +646,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/iostat.in munin-2.0.42/plugin } next unless grep { $_ } @fields; -diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/ip_.in munin-2.0.42/plugins/node.d.linux/ip_.in ---- munin-2.0.42.orig/plugins/node.d.linux/ip_.in 2018-10-11 15:00:48.914033000 +0000 -+++ munin-2.0.42/plugins/node.d.linux/ip_.in 2018-10-11 15:12:04.650033000 +0000 -@@ -128,14 +128,14 @@ case $IP in +diff -ur munin-2.0.65.orig/plugins/node.d.linux/ip_.in munin-2.0.65/plugins/node.d.linux/ip_.in +--- munin-2.0.65.orig/plugins/node.d.linux/ip_.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d.linux/ip_.in 2021-01-04 17:53:09.715969144 +0100 +@@ -128,14 +128,14 @@ # This is a fun hack to make the plugin ip6 compatible. # Suggested in ticket #439 by "jodal". eval 'iptables() { @@ -816,7 +666,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/ip_.in munin-2.0.42/plugins/n echo "no (could not run iptables as user $(whoami))" exit 0 else -@@ -148,10 +148,10 @@ if [[ "$1" == "autoconf" ]]; then +@@ -148,10 +148,10 @@ fi fi @@ -831,7 +681,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/ip_.in munin-2.0.42/plugins/n fi exit 0 fi -@@ -185,5 +185,5 @@ fi; +@@ -185,5 +185,5 @@ # Escape .'s so they don't match _everything_? escaped_ip=${IP//./\\.} @@ -839,10 +689,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/ip_.in munin-2.0.42/plugins/n -iptables -L "$OUTPUT" -v -n -x -w | awk "/$escaped_ip"'[ /]/ { print "out.value " $2; exit 0; }' +/usr/sbin/iptables -L "$INPUT" -v -n -x -w | awk "/$escaped_ip"'[ /]/ { print "in.value " $2; exit 0; }' +/usr/sbin/iptables -L "$OUTPUT" -v -n -x -w | awk "/$escaped_ip"'[ /]/ { print "out.value " $2; exit 0; }' -diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/load.in munin-2.0.42/plugins/node.d.linux/load.in ---- munin-2.0.42.orig/plugins/node.d.linux/load.in 2018-10-11 15:00:48.914033000 +0000 -+++ munin-2.0.42/plugins/node.d.linux/load.in 2018-10-11 15:01:25.731033000 +0000 -@@ -59,20 +59,20 @@ if [ "$1" = "config" ]; then +diff -ur munin-2.0.65.orig/plugins/node.d.linux/load.in munin-2.0.65/plugins/node.d.linux/load.in +--- munin-2.0.65.orig/plugins/node.d.linux/load.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d.linux/load.in 2021-01-04 17:53:09.715969144 +0100 +@@ -59,20 +59,20 @@ # one machine answer for several) # The title of the graph @@ -869,7 +719,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/load.in munin-2.0.42/plugins/ # 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 @@ if [ "$1" = "config" ]; then +@@ -82,8 +82,8 @@ # 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". @@ -880,10 +730,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/load.in munin-2.0.42/plugins/ # Last, if run with the "config"-parameter, quit here (don't # display any data) -diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/nfs_client.in munin-2.0.42/plugins/node.d.linux/nfs_client.in ---- munin-2.0.42.orig/plugins/node.d.linux/nfs_client.in 2018-10-11 15:00:48.914033000 +0000 -+++ munin-2.0.42/plugins/node.d.linux/nfs_client.in 2018-10-11 15:12:43.768033000 +0000 -@@ -31,7 +31,7 @@ NFS=/proc/net/rpc/nfs +diff -ur munin-2.0.65.orig/plugins/node.d.linux/nfs_client.in munin-2.0.65/plugins/node.d.linux/nfs_client.in +--- munin-2.0.65.orig/plugins/node.d.linux/nfs_client.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d.linux/nfs_client.in 2021-01-04 17:53:09.715969144 +0100 +@@ -31,7 +31,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 @@ -892,7 +742,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/nfs_client.in munin-2.0.42/pl if grep -q proc3 "$NFS"; then echo yes else -@@ -56,11 +56,66 @@ if [ "$1" = "config" ]; then +@@ -56,11 +56,66 @@ exit 0 fi @@ -966,10 +816,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/nfs_client.in munin-2.0.42/pl + print "commit.value " nfs_commit }' $NFS - -diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/nfsd.in munin-2.0.42/plugins/node.d.linux/nfsd.in ---- munin-2.0.42.orig/plugins/node.d.linux/nfsd.in 2018-10-11 15:00:48.914033000 +0000 -+++ munin-2.0.42/plugins/node.d.linux/nfsd.in 2018-10-11 15:13:00.220033000 +0000 -@@ -31,7 +31,7 @@ NFSD=/proc/net/rpc/nfsd +diff -ur munin-2.0.65.orig/plugins/node.d.linux/nfsd.in munin-2.0.65/plugins/node.d.linux/nfsd.in +--- munin-2.0.65.orig/plugins/node.d.linux/nfsd.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d.linux/nfsd.in 2021-01-04 17:53:09.716969144 +0100 +@@ -31,7 +31,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 @@ -978,7 +828,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/nfsd.in munin-2.0.42/plugins/ grep -q proc3 "$NFSD" if grep -q proc3 "$NFSD"; then echo yes -@@ -57,9 +57,66 @@ if [ "$1" = "config" ]; then +@@ -57,9 +57,66 @@ exit 0 fi @@ -1051,10 +901,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/nfsd.in munin-2.0.42/plugins/ + print "pathconf.value " nfs_pathconf + print "commit.value " nfs_commit +}' $NFSD -diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.42/plugins/node.d.linux/vlan_inetuse_.in ---- munin-2.0.42.orig/plugins/node.d.linux/vlan_inetuse_.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d.linux/vlan_inetuse_.in 2018-10-11 15:13:31.770033000 +0000 -@@ -37,7 +37,7 @@ my %contraries = ("dpt" => "spt", "spt" +diff -ur munin-2.0.65.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.65/plugins/node.d.linux/vlan_inetuse_.in +--- munin-2.0.65.orig/plugins/node.d.linux/vlan_inetuse_.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d.linux/vlan_inetuse_.in 2021-01-04 17:53:09.716969144 +0100 +@@ -37,7 +37,7 @@ my %in_octets = (); my %out_octets = (); @@ -1063,7 +913,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.42 die "Could not run iptables: $!\n"; while () { -@@ -51,7 +51,7 @@ while () +@@ -51,7 +51,7 @@ close IN; die "Error running iptables. Dying\n" if $?; @@ -1072,7 +922,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.42 die "Could not run iptables: $!\n"; while () { -@@ -67,7 +67,7 @@ while () +@@ -67,7 +67,7 @@ } } close IN; @@ -1081,10 +931,10 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.42 if ($ARGV[0] and $ARGV[0] eq "config") { -diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.42/plugins/node.d.linux/vlan_linkuse_.in ---- munin-2.0.42.orig/plugins/node.d.linux/vlan_linkuse_.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d.linux/vlan_linkuse_.in 2018-10-11 15:13:55.670033000 +0000 -@@ -29,7 +29,7 @@ my %contraries = ("dpt" => "spt", "spt" +diff -ur munin-2.0.65.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.65/plugins/node.d.linux/vlan_linkuse_.in +--- munin-2.0.65.orig/plugins/node.d.linux/vlan_linkuse_.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d.linux/vlan_linkuse_.in 2021-01-04 17:53:09.716969144 +0100 +@@ -29,7 +29,7 @@ my %in_octets = (); my %out_octets = (); @@ -1093,7 +943,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.42 die "Could not run iptables: $!\n"; while () { -@@ -60,7 +60,7 @@ while () +@@ -60,7 +60,7 @@ close IN; die "Error running iptables. Dying\n" if $?; @@ -1102,17 +952,17 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.42 die "Could not run iptables: $!\n"; while () { -@@ -84,5 +84,5 @@ while () +@@ -84,5 +84,5 @@ } } close IN; -die "Error running iptables. Dying\n" if $?; +die "Error running /usr/sbin/iptables. Dying\n" if $?; # vim:syntax=perl -diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vserver_resources.in munin-2.0.42/plugins/node.d.linux/vserver_resources.in ---- munin-2.0.42.orig/plugins/node.d.linux/vserver_resources.in 2018-10-11 15:00:48.915033000 +0000 -+++ munin-2.0.42/plugins/node.d.linux/vserver_resources.in 2018-10-11 15:18:05.899033000 +0000 -@@ -247,6 +247,12 @@ if [ "$1" = "config" ]; then +diff -ur munin-2.0.65.orig/plugins/node.d.linux/vserver_resources.in munin-2.0.65/plugins/node.d.linux/vserver_resources.in +--- munin-2.0.65.orig/plugins/node.d.linux/vserver_resources.in 2020-10-28 22:36:02.000000000 +0100 ++++ munin-2.0.65/plugins/node.d.linux/vserver_resources.in 2021-01-04 17:53:09.716969144 +0100 +@@ -247,6 +247,12 @@ echo 'graph_vlabel ANON pages' echo 'graph_info Shows anonymous memory (human readable) used by each vserver.' ;; @@ -1125,7 +975,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vserver_resources.in munin-2. FILES) echo 'graph_title Files used by vserver' echo 'graph_args --base 1024k -l 0' -@@ -283,6 +289,30 @@ if [ "$1" = "config" ]; then +@@ -283,6 +289,30 @@ echo 'graph_vlabel SHM pages' echo 'graph_info Shows shared memory (human readable) used by each vserver.' ;; @@ -1156,7 +1006,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vserver_resources.in munin-2. *) echo "$RESOURCE not defined." exit 1 -@@ -301,53 +331,108 @@ if [ "$1" = "config" ]; then +@@ -301,53 +331,108 @@ case "$RESOURCE" in PROC) @@ -1292,8 +1142,8 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vserver_resources.in munin-2. ;; *) echo "$RESOURCE not defined." -@@ -358,7 +443,7 @@ if [ "$1" = "config" ]; then - if [ ! -z "$LIMITS" ] && [ "$LIMITS" = 1 ]; then +@@ -358,7 +443,7 @@ + if [ -n "$LIMITS" ] && [ "$LIMITS" = 1 ]; then LIMIT=$(grep "$RESOURCE" "/proc/virtual/$xid/limit" | cut -f 4) if [ "${LIMIT:-0}" -gt 0 ]; then - echo "$NAME.critical $LIMIT" @@ -1301,7 +1151,7 @@ diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vserver_resources.in munin-2. fi fi done -@@ -369,8 +454,18 @@ fi +@@ -369,8 +454,18 @@ for xid in $XIDS ; do LABEL=$(grep "NodeName" "/proc/virtual/$xid/$NAMELOC" | cut -f 2) NAME=$(echo "$LABEL" | cut -d. -f1 | tr '-' '_')