X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmunin.git;a=blobdiff_plain;f=munin-plugins.patch;h=d59036bd96b683b6092e24bf56bff53801433eca;hp=05a1cea3a7c333f233f28d0131a1e6bedb09b2c3;hb=d5910e0aa4a37928e95746cb73d3090e1dcce56e;hpb=81f73a805da4e81330a0c8d5635813f25935ed58

diff --git a/munin-plugins.patch b/munin-plugins.patch
index 05a1cea..d59036b 100644
--- a/munin-plugins.patch
+++ b/munin-plugins.patch
@@ -1,6 +1,6 @@
-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
+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 @@
  #
  #
@@ -140,17 +140,10 @@ diff -urNp munin-2.0.25.orig/dists/tarball/plugins.conf munin-2.0.25/dists/tarba
 +
 +[cupsys_pages]
 +user root
-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 () {
--    cmd=`echo $MUNIN_MKTEMP | sed s/\\$1/$1/`
--    $cmd
-+    mktemp -p /tmp/ $1
- }
+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
  
  AMAVIS_LOG=${amavislog:-/var/log/mail/mail.info}
  LOGTAIL=${logtail:-logtail}
@@ -158,8 +151,8 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/amavis.in munin-2.0.25/plugins/node.
 +STATEFILE=@@PLUGSTATE@@/amavis.offset
  
  if [ "$1" = "autoconf" ]; then
-         if [ -f "${AMAVIS_LOG}" -a -n "${LOGTAIL}" -a -x "${LOGTAIL}" ] ; then
-@@ -106,7 +105,7 @@ fi
+ 	if [ -f "${AMAVIS_LOG}" ] && [ -n "${LOGTAIL}" ] && [ -x "${LOGTAIL}" ] ; then
+@@ -99,7 +99,7 @@ fi
  
  if [ "$1" = "config" ]; then
  	echo 'graph_title Amavis filter statistics'
@@ -168,19 +161,19 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/amavis.in munin-2.0.25/plugins/node.
  	echo 'graph_category antivirus'
  	echo 'virus.label virus'
  	echo 'virus.info Number of viruses caught in email'
-@@ -124,7 +123,7 @@ virus=U
+@@ -117,7 +117,7 @@ virus=U
  spamm=U
  spams=U
  
--TEMP_FILE=$(mktempfile munin-amavis.XXXXXX)
-+TEMP_FILE=$(mktempfile munin-amavis.XXXXXXXXXX)
+-TEMP_FILE=$(@@MKTEMP@@ munin-amavis.XXXXXX)
++TEMP_FILE=$(@@MKTEMP@@ munin-amavis.XXXXXXXXXX)
  
- if [ -n "$TEMP_FILE" -a -f "$TEMP_FILE" ]
- then
-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;")
+ 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;")
  
  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);
@@ -188,7 +181,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/apache_accesses.in munin-2.0.25/plug
  
  if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
  {
-@@ -129,7 +130,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
+@@ -143,7 +144,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
  
  if ( defined $ARGV[0] and $ARGV[0] eq "config" )
  {
@@ -201,10 +194,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/apache_accesses.in munin-2.0.25/plug
  	print "graph_args --base 1000\n";
  	print "graph_vlabel accesses / \${graph_period}\n";
  	print "graph_category apache\n";
-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;")
+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;")
  
  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);
@@ -212,7 +205,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/apache_processes.in munin-2.0.25/plu
  my $SHOWFREE = !exists $ENV{'showfree'} || $ENV{'showfree'};
  
  if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
-@@ -136,7 +137,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
+@@ -150,7 +151,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
  
  if ( defined $ARGV[0] and $ARGV[0] eq "config" )
  {
@@ -225,10 +218,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/apache_processes.in munin-2.0.25/plu
          print "graph_args --base 1000 -l 0\n";
  		print "graph_category apache\n";
  	print "graph_order ";
-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;")
+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;")
  
  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);
@@ -236,7 +229,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/apache_volume.in munin-2.0.25/plugin
  
  if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
  {
-@@ -129,7 +130,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
+@@ -143,7 +144,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
  
  if ( defined $ARGV[0] and $ARGV[0] eq "config" )
  {
@@ -249,9 +242,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/apache_volume.in munin-2.0.25/plugin
  	print "graph_args --base 1000\n";
  	print "graph_vlabel bytes per \${graph_period}\n";
  	print "graph_category apache\n";
-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
+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
  use strict;
  
@@ -270,21 +263,21 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/bind9.in munin-2.0.25/plugins/node.d
      while (<Q>) {
          chomp;
          my ($q,$n) = split(/\s+/,$_,2);
-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
+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
  COURIER_LOG=${logfile:-/var/log/mail.log}
- SERVICE=${service:-`basename $0 | sed 's/^courier_//g'`}
+ SERVICE=${service:-$(basename "$0" | sed 's/^courier_//g')}
  OFFSET_FILE=${MUNIN_PLUGSTATE}/courier_${SERVICE}.offset
 -LOGTAIL=${logtail:-/usr/sbin/logtail}
 +LOGTAIL=${logtail:-`which logtail`}
  
- mktempfile () {
- @@MKTEMP@@
-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
+ 
+ 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) {
  
  if($startsize < $pos) {
@@ -296,9 +289,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.2
      $pos = 0;
  }
  
-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
+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) {
  
  if($startsize < $pos) {
@@ -310,9 +303,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.
      $pos = 0;
  }
  
-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
+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) {
  }
  if ($startsize < $pos) {
@@ -333,22 +326,22 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/cupsys_pages.in munin-2.0.25/plugins
  	    if(!defined($printers{$1}) && keys(%printers) < $MAXLABEL) {
  		$printers{$1} += int($2)*int($3);
  	    } elsif(defined($printers{$1})) {
-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 @@
+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
+@@ -12,7 +12,7 @@
+ # scripts):
  #%# family=contrib
- #%# capabilities=autoconf
  
 -statefile=$MUNIN_PLUGSTATE/plugin-fah_rank.state
 +statefile=@@PLUGSTATE@@/plugin-fah_rank.state
  
- if [ "$1" = "autoconf" ]; then
-     # No real check of anything
-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;
+ 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;
  # System paths
  $logfile = $ENV{'logfile'} || "/var/log/mailman/post";
  $libdir  = $ENV{'libdir'}  || "/var/lib/mailman";
@@ -363,7 +356,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/mailman.in munin-2.0.25/plugins/node
  
  if (-f "$logfile.0")
  {
-@@ -94,7 +100,9 @@ if(!defined $pos) {
+@@ -104,7 +110,9 @@ if(!defined $pos) {
      $startsize = 0;
  } elsif($startsize < $pos) {
      # Log rotated
@@ -374,18 +367,18 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/mailman.in munin-2.0.25/plugins/node
      $pos = 0;
  }
  
-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
+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:
+     env.mysqlconnection DBI:mysql:information_schema;host=127.0.0.1;port=3306
+     env.mysqluser munin
      env.mysqlpassword geheim
 +    env.mysqlnosuperpriv 1
      env.cachenamespace munin_mysql_pri
    [mysql2_*]
-     env.mysqlconnection DBI:mysql:mysql;host=127.0.0.1;port=13306
-@@ -156,6 +157,7 @@ my %config = (
+     env.mysqlconnection DBI:mysql:information_schema;host=127.0.0.1;port=13306
+@@ -189,6 +190,7 @@ my %config = (
      'user'       => $ENV{'mysqluser'}       || 'root',
      'password'   => $ENV{'mysqlpassword'}   || '',
      'cache_namespace' => $ENV{'cachenamespace'} || 'munin_mysql',
@@ -393,9 +386,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_.in munin-2.0.25/plugins/node.
  );
  
  
-@@ -927,8 +929,10 @@ sub update_data {
- 
+@@ -1111,8 +1113,10 @@ sub update_data {
      update_variables($dbh);
+     update_plugins($dbh);
      update_innodb($dbh);
 -    update_master($dbh);
 -    update_slave($dbh);
@@ -405,39 +398,41 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_.in munin-2.0.25/plugins/node.
 +    }
  
      $shared_memory_cache->set('data', $data);
- }
-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
+     $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
 @@ -1,4 +1,4 @@
 -#!@@GOODSH@@
 +#!@@BASH@@
  
  : << =cut
  
-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
+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
  	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 -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
+ # 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
  	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 -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
+ # 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;
  
@@ -480,51 +475,49 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_.in munin-2.0.25/plugins/node.d/
  
  foreach my $line (@associations) {
          if ($line =~ m/^\s*\d+/) {
-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
+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
  export PATH=/usr/local/sbin:$PATH
  
  if [ "$1" = "autoconf" ]; then
 -    { ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
-+    { /usr/sbin/ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
++    { /usr/sbin/ntpq -c kerninfo; /usr/sbin/ntpdc -c kerninfo; } 2>/dev/null |
      awk 'BEGIN { ev=1; }
           /^estimated error:/ { ev=0; }
-          END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
-@@ -51,11 +51,11 @@ fi
+          END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }'
+@@ -51,9 +51,9 @@ fi
  
  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 ]
+-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
+-    ntpq -c kerninfo | awk '/^estimated error:/ { print $3 / 1000 }'
++    /usr/sbin/ntpq -c kerninfo | awk '/^estimated error:/ { print $3 / 1000 }'
  else
--    cmd=ntpdc
-+    cmd=/usr/sbin/ntpdc
+-    ntpdc -c kerninfo | awk '/^estimated error:/ { print $3 }'
++    /usr/sbin/ntpdc -c kerninfo | awk '/^estimated error:/ { print $3 }'
  fi
- 
- $cmd -c kerninfo | awk '/^estimated error:/ { print $3 }'
-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
+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
  export PATH=/usr/local/sbin:$PATH
  
  if [ "$1" = "autoconf" ]; then
 -    { ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
-+    { /usr/sbin/ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
++    { /usr/sbin/ntpq -c kerninfo; /usr/sbin/ntpdc -c kerninfo; } 2>/dev/null |
      awk 'BEGIN { ev=1; }
           /^pll frequency:/ { ev=0; }
-          END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
+          END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }'
 @@ -65,11 +65,11 @@ fi
  
  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 ]
+-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
@@ -534,38 +527,36 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.25/
  fi
  
  $cmd -c kerninfo | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }'
-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
+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
  export PATH=/usr/local/sbin:$PATH
  
  if [ "$1" = "autoconf" ]; then
 -    { ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
-+    { /usr/sbin/ntpq -c kerninfo; ntpdc -c kerninfo; } 2>/dev/null |
++    { /usr/sbin/ntpq -c kerninfo; /usr/sbin/ntpdc -c kerninfo; } 2>/dev/null |
      awk 'BEGIN { ev=1; }
           /^pll offset:/ { ev=0; }
-          END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
-@@ -51,11 +51,11 @@ fi
+          END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }'
+@@ -51,9 +51,9 @@ fi
  
  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 ]
+-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
+-    ntpq -c kerninfo | awk '/^pll offset:/ { print $3 / 1000 }'
++    /usr/sbin/ntpq -c kerninfo | awk '/^pll offset:/ { print $3 / 1000 }'
  else
--    cmd=ntpdc
-+    cmd=/usr/sbin/ntpdc
+-    ntpdc -c kerninfo | awk '/^pll offset:/ { print $3 }'
++    /usr/sbin/ntpdc -c kerninfo | awk '/^pll offset:/ { print $3 }'
  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:-}
  
- $cmd -c kerninfo | awk '/^pll offset:/ { print $3 }'
-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 () {
 -    ntpq -c help >/dev/null 2>&1 || { echo 'no (no ntpq program)'; exit 0; }
@@ -576,29 +567,29 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_offset.in munin-2.0.25/plugins/n
  	0)
              echo 'no (unable to list peers)'
  	    exit 0
-@@ -57,7 +57,7 @@ do_autoconf () {
+@@ -61,7 +61,7 @@ do_autoconf () {
  }
  
  do_config () {
 -    syspeer="$(ntpq -n -p | grep '^[*o]')"
 +    syspeer="$(/usr/sbin/ntpq -n -p | grep '^[*o]')"
  
+     # shellcheck disable=SC2086
      set - $syspeer
- 
-@@ -86,7 +86,7 @@ EOF
+@@ -91,7 +91,7 @@ EOF
  
  do_ () {
      # Fetch operation
 -    syspeer="$(ntpq -n -p | grep '^[*o]')"
 +    syspeer="$(/usr/sbin/ntpq -n -p | grep '^[*o]')"
  
+     # shellcheck disable=SC2086
      set - $syspeer
- 
-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
+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 {
+ #  1 63933  931a   yes   yes  none   outlier    sys_peer  1
  #  2 63934  943a   yes   yes  none candidate    sys_peer  3
  
 -        foreach my $line (`ntpq -c associations`) {
@@ -610,7 +601,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_states.in munin-2.0.25/plugins/n
                          $peerinfo =~ s/\s//g;
                          my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/);
  
-@@ -125,17 +125,17 @@ sub make_names {
+@@ -141,17 +141,17 @@ sub make_names {
  }
  
  if ($ARGV[0] and $ARGV[0] eq "autoconf") {
@@ -632,9 +623,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_states.in munin-2.0.25/plugins/n
                  exit 0;
          }
  }
-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
+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;
  my %status;
  
@@ -680,9 +671,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/nut_misc.in munin-2.0.25/plugins/nod
  	while ($data =~ /([a-z.]+): (.+)\b/g) {
  		my $label = $1;
  		my $value = $2;
-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
+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;
  my %status;
  
@@ -733,10 +724,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/nut_volts.in munin-2.0.25/plugins/no
  	while ($data =~ /([a-z.]+): (.+)\b/g) {
  		my $label = $1;
  		my $value = $2;
-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 () {
+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
  # Set the location of the perdition logs
  PERDITION_LOG=${logfile:-/var/log/perdition.log}
  OFFSET_FILE=${MUNIN_PLUGSTATE}/perdition.offset
@@ -745,9 +736,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/perdition.in munin-2.0.25/plugins/no
  
  case $1 in
      autoconf|detect)
-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
+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)
  if ($startsize < $pos)
  {
@@ -759,9 +750,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/pop_stats.in munin-2.0.25/plugins/no
  	$pos = 0;
  }
  
-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
+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(
      vlabel   => 'Scans / sec',
      basequery =>
@@ -770,9 +761,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/postgres_scans_.in munin-2.0.25/plug
      pivotquery    => 1,
      configquery =>
          "VALUES ('sequential','Sequential scans'), ('index','Index scans')",
-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
+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(
                  . " COALESCE(sum(n_tup_del),0) AS deleted FROM pg_stat_user_tables",
          ],
@@ -781,9 +772,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/postgres_tuples_.in munin-2.0.25/plu
      pivotquery    => 1,
      configquery   => [
          "VALUES ('seqread','Tuples sequentally read'), ('idxfetch','Tuples index fetched'), ('inserted','Tuples inserted'),"
-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
+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
  
  # Change these to reflect your LDAP ACL. The given DN must have
@@ -793,9 +784,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/slapd_.in munin-2.0.25/plugins/node.
  my $server = ($ENV{'server'} || 'localhost');
  my $userdn = ($ENV{'binddn'} || '');
  my $userpw = ($ENV{'bindpw'} || '');
-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
+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() {
  		if ($tmpnam =~ /\d+$/ and !$include_numbered) {
  		    # Special case for devices like cXdXpX,
@@ -805,56 +796,52 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat.in munin-2.0.25/plugins
  		}
  		next unless grep { $_ } @fields;
  
-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
+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
          # This is a fun hack to make the plugin ip6 compatible.
          # Suggested in ticket #439 by "jodal".
          eval 'iptables() {
 -            ip6tables "$@"
 +            /usr/sbin/ip6tables "$@"
-+        }'
-+        ;;
-+    *) eval 'iptables() {
-+            /usr/sbin/iptables "$@"
          }'
          ;;
  esac
  
  if [[ "$1" == "autoconf" ]]; then
      if [[ -r /proc/net/dev ]]; then
--        if ! iptables -L ${INPUT} -v -n -x >/dev/null 2>/dev/null; then
-+        if ! /usr/sbin/iptables -L ${INPUT} -v -n -x >/dev/null 2>/dev/null; then
+-        if ! iptables -L "$INPUT" -v -n -w -x >/dev/null 2>/dev/null; then
++        if ! /usr/sbin/iptables -L "$INPUT" -v -n -w -x >/dev/null 2>/dev/null; then
              echo "no (could not run iptables as user $(whoami))"
              exit 0
          else
-@@ -147,10 +151,10 @@ if [[ "$1" == "autoconf" ]]; then
+@@ -148,10 +148,10 @@ if [[ "$1" == "autoconf" ]]; then
      fi
  fi
  
 -if [[ "$1" == "suggest" ]]; then
--    iptables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$8 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}$/ { if (done[$8]!=1) {print $8; done[$8]=1;}}'
+-    iptables -L "$INPUT" -v -n -x -w 2>/dev/null | awk --posix '$8 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}$/ { if (done[$8]!=1) {print $8; done[$8]=1;}}'
 -    if [[ -x /sbin/ip6tables ]]; then
--        ip6tables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
-+if [ "$1" = "suggest" ]; then
-+    /usr/sbin/iptables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$8 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}$/ { if (done[$8]!=1) {print $8; done[$8]=1;}}'
+-        ip6tables -L "$INPUT" -v -n -x -w 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
++if [ "$1" == "suggest" ]; then
++    /usr/sbin/iptables -L "$INPUT" -v -n -x -w 2>/dev/null | awk --posix '$8 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}$/ { if (done[$8]!=1) {print $8; done[$8]=1;}}'
 +    if [[ -x /usr/sbin/ip6tables ]]; then
-+        /usr/sbin/ip6tables -L ${INPUT} -v -n -x 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
++        /usr/sbin/ip6tables -L "$INPUT" -v -n -x -w 2>/dev/null | awk --posix '$7 ~ /\/128$/ { if (done[$7]!=1) {a=$7;gsub(/\/128$/, "", a); print a; done[$7]=1;}}'
      fi
      exit 0
  fi
-@@ -183,5 +187,5 @@ fi;
+@@ -185,5 +185,5 @@ fi;
  
  # Escape .'s so they don't match _everything_?
- IP=$(echo $IP | sed 's~\.~\\.~g')
--iptables -L ${INPUT} -v -n -x   | awk "/$IP"'[ /]/ { print "in.value " $2; exit 0; }'
--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 -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
+ escaped_ip=${IP//./\\.}
+-iptables -L "$INPUT" -v -n -x -w  | awk "/$escaped_ip"'[ /]/ { print "in.value " $2; exit 0; }'
+-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
          # one machine answer for several)
  
@@ -893,19 +880,19 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/load.in munin-2.0.25/plugins/n
  
          # Last, if run with the "config"-parameter, quit here (don't
          # display any data)
-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
+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
  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
 -	if [ -f "$NFS" ]; then
 +	if [ -r "$NFS" ]; then
- 		echo yes
- 		exit 0
- 	else
-@@ -51,11 +51,66 @@ if [ "$1" = "config" ]; then
+ 		if grep -q proc3 "$NFS"; then
+ 			echo yes
+ 		else
+@@ -56,11 +56,66 @@ if [ "$1" = "config" ]; then
  	exit 0
  fi
  
@@ -979,19 +966,19 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/nfs_client.in munin-2.0.25/plu
 +	print "commit.value " nfs_commit
  }' $NFS
 -
-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
+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
  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
 -	if [ -f "$NFSD" ]; then
 +	if [ -r "$NFSD" ]; then
- 		echo yes
- 		exit 0
- 	else
-@@ -51,9 +51,66 @@ if [ "$1" = "config" ]; then
+ 		grep -q proc3 "$NFSD"
+ 		if grep -q proc3 "$NFSD"; then
+ 			echo yes
+@@ -57,9 +57,66 @@ if [ "$1" = "config" ]; then
  	exit 0
  fi
  
@@ -1064,34 +1051,27 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/nfsd.in munin-2.0.25/plugins/n
 +	print "pathconf.value " nfs_pathconf
 +	print "commit.value " nfs_commit
 +}' $NFSD
-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"
+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"
  my %in_octets = ();
  my %out_octets = ();
  
--open (IN, "/sbin/iptables -v -x -L $INTERFACE-in |") or 
--	die "Could not run iptables: $!\n";
-+open (IN, "/usr/sbin/iptables -v -x -L $INTERFACE-in |") or 
-+	die "Could not run /usr/sbin/iptables: $!\n";
+-open (IN, "/sbin/iptables -v -x -w -L $INTERFACE-in |") or
++open (IN, "/usr/sbin/iptables -v -x -w -L $INTERFACE-in |") or
+ 	die "Could not run iptables: $!\n";
  while (<IN>)
  {
- 	if (/^\s*\d+\s+(\d+)  +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
-@@ -49,10 +49,10 @@ while (<IN>)
- 	}
- }
+@@ -51,7 +51,7 @@ while (<IN>)
  close IN;
--die "Error running iptables. Dying\n" if $?;
-+die "Error running /usr/sbin/iptables. Dying\n" if $?;
+ die "Error running iptables. Dying\n" if $?;
  
--open (IN, "/sbin/iptables -v -x -L $INTERFACE-out |") or 
--	die "Could not run iptables: $!\n";
-+open (IN, "/usr/sbin/iptables -v -x -L $INTERFACE-out |") or 
-+	die "Could not run /usr/sbin/iptables: $!\n";
+-open (IN, "/sbin/iptables -v -x -w -L $INTERFACE-out |") or
++open (IN, "/usr/sbin/iptables -v -x -w -L $INTERFACE-out |") or
+ 	die "Could not run iptables: $!\n";
  while (<IN>)
  {
- 	if (/^\s*\d+\s+(\d+)  +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
 @@ -67,7 +67,7 @@ while (<IN>)
  	}
  }
@@ -1101,34 +1081,27 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.25/
  
  if ($ARGV[0] and $ARGV[0] eq "config")
  {
-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"
+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"
  my %in_octets = ();
  my %out_octets = ();
  
--open (IN, "/sbin/iptables -v -x -L $INTERFACE-in |") or 
--	die "Could not run iptables: $!\n";
-+open (IN, "/usr/sbin/iptables -v -x -L $INTERFACE-in |") or 
-+	die "Could not run /usr/sbin/iptables: $!\n";
+-open (IN, "/sbin/iptables -v -x -w -L $INTERFACE-in |") or
++open (IN, "/usr/sbin/iptables -v -x -w -L $INTERFACE-in |") or
+ 	die "Could not run iptables: $!\n";
  while (<IN>)
  {
- 	if (/^\s*\d+\s+(\d+)  +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
-@@ -58,10 +58,10 @@ while (<IN>)
- 	}
- }
+@@ -60,7 +60,7 @@ while (<IN>)
  close IN;
--die "Error running iptables. Dying\n" if $?;
-+die "Error running /usr/sbin/iptables. Dying\n" if $?;
+ die "Error running iptables. Dying\n" if $?;
  
--open (IN, "/sbin/iptables -v -x -L $INTERFACE-out |") or 
--	die "Could not run iptables: $!\n";
-+open (IN, "/usr/sbin/iptables -v -x -L $INTERFACE-out |") or 
-+	die "Could not run /usr/sbin/iptables: $!\n";
+-open (IN, "/sbin/iptables -v -x -w -L $INTERFACE-out |") or
++open (IN, "/usr/sbin/iptables -v -x -w -L $INTERFACE-out |") or
+ 	die "Could not run iptables: $!\n";
  while (<IN>)
  {
- 	if (/^\s*\d+\s+(\d+)  +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
 @@ -84,5 +84,5 @@ while (<IN>)
  	}
  }
@@ -1136,10 +1109,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.25/
 -die "Error running iptables. Dying\n" if $?;
 +die "Error running /usr/sbin/iptables. Dying\n" if $?;
  # vim:syntax=perl
-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
+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
  	    echo 'graph_vlabel ANON pages'
  	    echo 'graph_info Shows anonymous memory (human readable) used by each vserver.'
  	    ;;
@@ -1152,7 +1125,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/vserver_resources.in munin-2.0
  	FILES)
  	    echo 'graph_title Files used by vserver'
  	    echo 'graph_args --base 1024k -l 0'
-@@ -281,6 +287,30 @@ if [ "$1" = "config" ]; then
+@@ -283,6 +289,30 @@ if [ "$1" = "config" ]; then
  	    echo 'graph_vlabel SHM pages'
  	    echo 'graph_info Shows shared memory (human readable) used by each vserver.'
  	    ;;
@@ -1183,7 +1156,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/vserver_resources.in munin-2.0
  	*)
  	    echo "$RESOURCE not defined."
  	    exit 1
-@@ -299,53 +329,108 @@ if [ "$1" = "config" ]; then
+@@ -301,53 +331,108 @@ if [ "$1" = "config" ]; then
  
  	case "$RESOURCE" in
  	    PROC)
@@ -1319,32 +1292,33 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/vserver_resources.in munin-2.0
  		;;
  	    *)
  		echo "$RESOURCE not defined."
-@@ -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
+@@ -358,7 +443,7 @@ if [ "$1" = "config" ]; then
+ 	if [ ! -z "$LIMITS" ] && [ "$LIMITS" = 1 ]; then
+ 	    LIMIT=$(grep "$RESOURCE" "/proc/virtual/$xid/limit" | cut -f 4)
+ 	    if [ "${LIMIT:-0}" -gt 0 ]; then
 -		echo "$NAME.critical $LIMIT"
 +		echo "${NAME}_${RESOURCE}.critical $LIMIT"
  	    fi
  	fi
      done
-@@ -367,8 +452,15 @@ fi
+@@ -369,8 +454,18 @@ fi
  for xid in $XIDS ; do
-     LABEL=`cat /proc/virtual/$xid/$NAMELOC |grep NodeName |cut -f2`
-     NAME=`echo $LABEL | cut -d. -f1 |  tr '-' '_'`
--    cat /proc/virtual/$xid/limit | awk -v name="${NAME}" -v resource="${RESOURCE}:" \
--	'{ if ( $1 == resource )
--            printf "%s.value %d\n", name, $2 }'
+     LABEL=$(grep "NodeName" "/proc/virtual/$xid/$NAMELOC" | cut -f 2)
+     NAME=$(echo "$LABEL" | cut -d. -f1 |  tr '-' '_')
+-    awk -v name="${NAME}" -v resource="${RESOURCE}:" \
+-        '{ if ( $1 == resource ) printf "%s.value %d\n", name, $2 }' \
 +    if [ $RESOURCE = "ALL" ]; then
-+    cat /proc/virtual/$xid/limit | awk -v name="${NAME}" \
-+	'{ if ( $1 ~ /[A-Z]*:/ ) {
++        awk -v name="${NAME}" \
++        '{ if ( $1 ~ /[A-Z]*:/ ) {
 +            resource = $1 ; gsub(/:/, "", resource);
 +            printf "%s_%s.value %d\n", name, resource, $2
-+           }}'
++        }}' \
++        "/proc/virtual/$xid/limit"
 +    else
-+    cat /proc/virtual/$xid/limit | awk -v name="${NAME}" -v resource="${RESOURCE}" \
-+	'{ if ( $1 ~ resource )
-+            printf "%s_%s.value %d\n", name, resource, $2 }'
++    awk -v name="${NAME}" -v resource="${RESOURCE}" \
++       '{ if ( $1 ~ resource )
++            printf "%s_%s.value %d\n", name, resource, $2 }' \
+         "/proc/virtual/$xid/limit"
 +    fi
  done
--
+