X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmunin.git;a=blobdiff_plain;f=munin-plugins.patch;h=3dc24ed63fb771dbf349998a45293d78b4635b7f;hp=2fade3f55d0c46744071abc201136ec35138e188;hb=HEAD;hpb=77c4bfbe37910bcd417dafcc6a671698f6cee6b3 diff --git a/munin-plugins.patch b/munin-plugins.patch index 2fade3f..8ee3d4d 100644 --- a/munin-plugins.patch +++ b/munin-plugins.patch @@ -1,156 +1,8 @@ -diff -urN munin-2.0.17/dists/tarball/plugins.conf munin-2.0.17-plugins/dists/tarball/plugins.conf ---- munin-2.0.17/dists/tarball/plugins.conf 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/dists/tarball/plugins.conf 2013-08-17 13:18:51.817585940 +0200 -@@ -14,6 +14,9 @@ - # - # - -+[*] -+env.logtail /usr/bin/logtail -+ - [mysql*] - #env.mysqlopts -u someuser - -@@ -31,3 +34,128 @@ - - [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 -urN munin-2.0.17/plugins/node.d/amavis.in munin-2.0.17-plugins/plugins/node.d/amavis.in ---- munin-2.0.17/plugins/node.d/amavis.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/amavis.in 2013-08-17 13:18:51.820919315 +0200 -@@ -77,13 +77,12 @@ - =cut - - mktempfile () { -- cmd=`echo $MUNIN_MKTEMP | sed s/\\$1/$1/` -- $cmd -+ mktemp -p /tmp/ $1 - } +Only in munin-2.0.69: munin-plugins.patch +diff -ur munin-2.0.69.orig/plugins/node.d/amavis.in munin-2.0.69/plugins/node.d/amavis.in +--- munin-2.0.69.orig/plugins/node.d/amavis.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/amavis.in 2022-08-27 15:12:36.150833006 +0200 +@@ -76,7 +76,7 @@ AMAVIS_LOG=${amavislog:-/var/log/mail/mail.info} LOGTAIL=${logtail:-logtail} @@ -158,8 +10,8 @@ diff -urN munin-2.0.17/plugins/node.d/amavis.in munin-2.0.17-plugins/plugins/nod +STATEFILE=@@PLUGSTATE@@/amavis.offset if [ "$1" = "autoconf" ]; then - if [ -f "${AMAVIS_LOG}" -a -n "${LOGTAIL}" -a -x "${LOGTAIL}" ] ; then -@@ -106,7 +105,7 @@ + if [ -f "${AMAVIS_LOG}" ] && [ -n "${LOGTAIL}" ] && [ -x "${LOGTAIL}" ] ; then +@@ -99,7 +99,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Amavis filter statistics' @@ -168,27 +20,27 @@ diff -urN munin-2.0.17/plugins/node.d/amavis.in munin-2.0.17-plugins/plugins/nod echo 'graph_category antivirus' echo 'virus.label virus' echo 'virus.info Number of viruses caught in email' -@@ -124,7 +123,7 @@ +@@ -117,7 +117,7 @@ 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 -urN munin-2.0.17/plugins/node.d/apache_accesses.in munin-2.0.17-plugins/plugins/node.d/apache_accesses.in ---- munin-2.0.17/plugins/node.d/apache_accesses.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/apache_accesses.in 2013-08-17 13:18:51.817585940 +0200 -@@ -89,6 +89,7 @@ + if [ -n "$TEMP_FILE" ] && [ -f "$TEMP_FILE" ]; then + if [ "$ARGS" != 0 ]; then +diff -ur munin-2.0.69.orig/plugins/node.d/apache_accesses.in munin-2.0.69/plugins/node.d/apache_accesses.in +--- munin-2.0.69.orig/plugins/node.d/apache_accesses.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/apache_accesses.in 2022-08-27 15:12:36.151833008 +0200 +@@ -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" ) - { -@@ -129,7 +130,11 @@ + + # 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" ) { @@ -201,18 +53,18 @@ diff -urN munin-2.0.17/plugins/node.d/apache_accesses.in munin-2.0.17-plugins/pl print "graph_args --base 1000\n"; print "graph_vlabel accesses / \${graph_period}\n"; print "graph_category apache\n"; -diff -urN munin-2.0.17/plugins/node.d/apache_processes.in munin-2.0.17-plugins/plugins/node.d/apache_processes.in ---- munin-2.0.17/plugins/node.d/apache_processes.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/apache_processes.in 2013-08-17 13:18:51.817585940 +0200 -@@ -96,6 +96,7 @@ +diff -ur munin-2.0.69.orig/plugins/node.d/apache_processes.in munin-2.0.69/plugins/node.d/apache_processes.in +--- munin-2.0.69.orig/plugins/node.d/apache_processes.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/apache_processes.in 2022-08-27 15:12:36.151833008 +0200 +@@ -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" ) -@@ -136,7 +137,11 @@ + +@@ -154,7 +155,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" ) { @@ -225,18 +77,18 @@ diff -urN munin-2.0.17/plugins/node.d/apache_processes.in munin-2.0.17-plugins/p print "graph_args --base 1000 -l 0\n"; print "graph_category apache\n"; print "graph_order "; -diff -urN munin-2.0.17/plugins/node.d/apache_volume.in munin-2.0.17-plugins/plugins/node.d/apache_volume.in ---- munin-2.0.17/plugins/node.d/apache_volume.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/apache_volume.in 2013-08-17 13:18:51.817585940 +0200 -@@ -89,6 +89,7 @@ +diff -ur munin-2.0.69.orig/plugins/node.d/apache_volume.in munin-2.0.69/plugins/node.d/apache_volume.in +--- munin-2.0.69.orig/plugins/node.d/apache_volume.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/apache_volume.in 2022-08-27 15:12:36.151833008 +0200 +@@ -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" ) - { -@@ -129,7 +130,11 @@ + + # 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" ) { @@ -249,9 +101,9 @@ diff -urN munin-2.0.17/plugins/node.d/apache_volume.in munin-2.0.17-plugins/plug print "graph_args --base 1000\n"; print "graph_vlabel bytes per \${graph_period}\n"; print "graph_category apache\n"; -diff -urN munin-2.0.17/plugins/node.d/bind9.in munin-2.0.17-plugins/plugins/node.d/bind9.in ---- munin-2.0.17/plugins/node.d/bind9.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/bind9.in 2013-08-17 13:18:51.820919315 +0200 +diff -ur munin-2.0.69.orig/plugins/node.d/bind9.in munin-2.0.69/plugins/node.d/bind9.in +--- munin-2.0.69.orig/plugins/node.d/bind9.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/bind9.in 2022-08-27 15:12:36.151833008 +0200 @@ -53,7 +53,7 @@ use strict; @@ -270,21 +122,21 @@ diff -urN munin-2.0.17/plugins/node.d/bind9.in munin-2.0.17-plugins/plugins/node while () { chomp; my ($q,$n) = split(/\s+/,$_,2); -diff -urN munin-2.0.17/plugins/node.d/courier_.in munin-2.0.17-plugins/plugins/node.d/courier_.in ---- munin-2.0.17/plugins/node.d/courier_.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/courier_.in 2013-08-17 13:18:51.817585940 +0200 +diff -ur munin-2.0.69.orig/plugins/node.d/courier_.in munin-2.0.69/plugins/node.d/courier_.in +--- munin-2.0.69.orig/plugins/node.d/courier_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/courier_.in 2022-08-27 15:12:36.152833010 +0200 @@ -55,7 +55,7 @@ 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 -urN munin-2.0.17/plugins/node.d/courier_mta_mailstats.in munin-2.0.17-plugins/plugins/node.d/courier_mta_mailstats.in ---- munin-2.0.17/plugins/node.d/courier_mta_mailstats.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/courier_mta_mailstats.in 2013-08-17 13:18:51.817585940 +0200 + + case $1 in +diff -ur munin-2.0.69.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.69/plugins/node.d/courier_mta_mailstats.in +--- munin-2.0.69.orig/plugins/node.d/courier_mta_mailstats.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/courier_mta_mailstats.in 2022-08-27 15:12:36.152833010 +0200 @@ -108,7 +108,9 @@ if($startsize < $pos) { @@ -296,9 +148,9 @@ diff -urN munin-2.0.17/plugins/node.d/courier_mta_mailstats.in munin-2.0.17-plug $pos = 0; } -diff -urN munin-2.0.17/plugins/node.d/courier_mta_mailvolume.in munin-2.0.17-plugins/plugins/node.d/courier_mta_mailvolume.in ---- munin-2.0.17/plugins/node.d/courier_mta_mailvolume.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/courier_mta_mailvolume.in 2013-08-17 13:18:51.817585940 +0200 +diff -ur munin-2.0.69.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.69/plugins/node.d/courier_mta_mailvolume.in +--- munin-2.0.69.orig/plugins/node.d/courier_mta_mailvolume.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/courier_mta_mailvolume.in 2022-08-27 15:12:36.152833010 +0200 @@ -98,7 +98,9 @@ if($startsize < $pos) { @@ -310,10 +162,10 @@ diff -urN munin-2.0.17/plugins/node.d/courier_mta_mailvolume.in munin-2.0.17-plu $pos = 0; } -diff -urN munin-2.0.17/plugins/node.d/cupsys_pages.in munin-2.0.17-plugins/plugins/node.d/cupsys_pages.in ---- munin-2.0.17/plugins/node.d/cupsys_pages.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/cupsys_pages.in 2013-08-17 13:18:51.817585940 +0200 -@@ -100,7 +100,9 @@ +diff -ur munin-2.0.69.orig/plugins/node.d/cupsys_pages.in munin-2.0.69/plugins/node.d/cupsys_pages.in +--- munin-2.0.69.orig/plugins/node.d/cupsys_pages.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/cupsys_pages.in 2022-08-27 15:12:36.155833015 +0200 +@@ -105,7 +105,9 @@ } if ($startsize < $pos) { # Log rotated @@ -324,7 +176,7 @@ diff -urN munin-2.0.17/plugins/node.d/cupsys_pages.in munin-2.0.17-plugins/plugi $pos = 0; } -@@ -146,7 +148,7 @@ +@@ -152,7 +154,7 @@ while (tell(LOGFILE) < $stop) { my $line = ; chomp ($line); @@ -333,22 +185,22 @@ diff -urN munin-2.0.17/plugins/node.d/cupsys_pages.in munin-2.0.17-plugins/plugi if(!defined($printers{$1}) && keys(%printers) < $MAXLABEL) { $printers{$1} += int($2)*int($3); } elsif(defined($printers{$1})) { -diff -urN munin-2.0.17/plugins/node.d/foldingathome_rank.in munin-2.0.17-plugins/plugins/node.d/foldingathome_rank.in ---- munin-2.0.17/plugins/node.d/foldingathome_rank.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/foldingathome_rank.in 2013-08-17 13:18:51.820919315 +0200 -@@ -13,7 +13,7 @@ +diff -ur munin-2.0.69.orig/plugins/node.d/foldingathome_rank.in munin-2.0.69/plugins/node.d/foldingathome_rank.in +--- munin-2.0.69.orig/plugins/node.d/foldingathome_rank.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/foldingathome_rank.in 2022-08-27 15:12:36.155833015 +0200 +@@ -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 -urN munin-2.0.17/plugins/node.d/mailman.in munin-2.0.17-plugins/plugins/node.d/mailman.in ---- munin-2.0.17/plugins/node.d/mailman.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/mailman.in 2013-08-17 13:18:51.817585940 +0200 -@@ -38,7 +38,13 @@ + if [ "$1" = "config" ]; then + echo 'graph_title Folding@Home Rank' +diff -ur munin-2.0.69.orig/plugins/node.d/mailman.in munin-2.0.69/plugins/node.d/mailman.in +--- munin-2.0.69.orig/plugins/node.d/mailman.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/mailman.in 2022-08-27 15:12:36.156833017 +0200 +@@ -39,7 +39,13 @@ # System paths $logfile = $ENV{'logfile'} || "/var/log/mailman/post"; $libdir = $ENV{'libdir'} || "/var/lib/mailman"; @@ -363,29 +215,18 @@ diff -urN munin-2.0.17/plugins/node.d/mailman.in munin-2.0.17-plugins/plugins/no if (-f "$logfile.0") { -@@ -94,7 +100,9 @@ - $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 -urN munin-2.0.17/plugins/node.d/mysql_.in munin-2.0.17-plugins/plugins/node.d/mysql_.in ---- munin-2.0.17/plugins/node.d/mysql_.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/mysql_.in 2013-08-17 13:18:51.820919315 +0200 -@@ -39,6 +39,7 @@ - env.mysqlconnection DBI:mysql:mysql;host=127.0.0.1;port=3306 - env.mysqluser root +diff -ur munin-2.0.69.orig/plugins/node.d/mysql_.in munin-2.0.69/plugins/node.d/mysql_.in +--- munin-2.0.69.orig/plugins/node.d/mysql_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/mysql_.in 2022-08-27 15:12:36.156833017 +0200 +@@ -50,6 +50,7 @@ + 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 @@ + env.mysqlconnection DBI:mysql:information_schema;host=127.0.0.1;port=13306 +@@ -194,6 +195,7 @@ 'user' => $ENV{'mysqluser'} || 'root', 'password' => $ENV{'mysqlpassword'} || '', 'cache_namespace' => $ENV{'cachenamespace'} || 'munin_mysql', @@ -393,9 +234,9 @@ diff -urN munin-2.0.17/plugins/node.d/mysql_.in munin-2.0.17-plugins/plugins/nod ); -@@ -927,8 +929,10 @@ - +@@ -1117,8 +1119,10 @@ update_variables($dbh); + update_plugins($dbh); update_innodb($dbh); - update_master($dbh); - update_slave($dbh); @@ -405,60 +246,54 @@ diff -urN munin-2.0.17/plugins/node.d/mysql_.in munin-2.0.17-plugins/plugins/nod + } $shared_memory_cache->set('data', $data); - } -diff -urN munin-2.0.17/plugins/node.d/mysql_innodb.in munin-2.0.17-plugins/plugins/node.d/mysql_innodb.in ---- munin-2.0.17/plugins/node.d/mysql_innodb.in 2013-08-17 13:19:03.501062149 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/mysql_innodb.in 2013-08-17 13:18:51.994254767 +0200 + $shared_memory_cache->set('graphs', nfreeze(\%graphs)); +diff -ur munin-2.0.69.orig/plugins/node.d/mysql_innodb.in munin-2.0.69/plugins/node.d/mysql_innodb.in +--- munin-2.0.69.orig/plugins/node.d/mysql_innodb.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/mysql_innodb.in 2022-08-27 15:12:36.156833017 +0200 @@ -1,4 +1,4 @@ -#!@@GOODSH@@ +#!@@BASH@@ : << =cut -diff -urN munin-2.0.17/plugins/node.d/mysql_slowqueries.in munin-2.0.17-plugins/plugins/node.d/mysql_slowqueries.in ---- munin-2.0.17/plugins/node.d/mysql_slowqueries.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/mysql_slowqueries.in 2013-08-17 13:18:51.817585940 +0200 -@@ -64,5 +64,5 @@ +diff -ur munin-2.0.69.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.69/plugins/node.d/mysql_slowqueries.in +--- munin-2.0.69.orig/plugins/node.d/mysql_slowqueries.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/mysql_slowqueries.in 2022-08-27 15:12:36.156833017 +0200 +@@ -61,6 +61,6 @@ exit 0 fi -/usr/bin/printf "queries.value " +/bin/printf "queries.value " - ($MYSQLADMIN $MYSQLOPTS status 2>/dev/null || echo a a a a a a a a U) | awk '{print $9}' -diff -urN munin-2.0.17/plugins/node.d/mysql_threads.in munin-2.0.17-plugins/plugins/node.d/mysql_threads.in ---- munin-2.0.17/plugins/node.d/mysql_threads.in 2013-08-17 13:19:03.501062149 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/mysql_threads.in 2013-08-17 13:18:51.994254767 +0200 -@@ -74,5 +74,5 @@ + # shellcheck disable=SC2086 + ("$MYSQLADMIN" $MYSQLOPTS status 2>/dev/null || echo a a a a a a a a U) | awk '{print $9}' +diff -ur munin-2.0.69.orig/plugins/node.d/mysql_threads.in munin-2.0.69/plugins/node.d/mysql_threads.in +--- munin-2.0.69.orig/plugins/node.d/mysql_threads.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/mysql_threads.in 2022-08-27 15:12:36.156833017 +0200 +@@ -70,6 +70,6 @@ exit 0 fi -/usr/bin/printf "threads.value " +/bin/printf "threads.value " - ($MYSQLADMIN $MYSQLOPTS status 2>/dev/null || echo 'a a a U') | awk '{print $4}' -diff -urN munin-2.0.17/plugins/node.d/ntp_.in munin-2.0.17-plugins/plugins/node.d/ntp_.in ---- munin-2.0.17/plugins/node.d/ntp_.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/ntp_.in 2013-08-17 13:18:51.817585940 +0200 -@@ -57,26 +57,26 @@ - 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; - } + # shellcheck disable=SC2086 + ("$MYSQLADMIN" $MYSQLOPTS status 2>/dev/null || echo 'a a a U') | awk '{print $4}' +diff -ur munin-2.0.69.orig/plugins/node.d/ntp_.in munin-2.0.69/plugins/node.d/ntp_.in +--- munin-2.0.69.orig/plugins/node.d/ntp_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_.in 2022-08-27 15:12:36.157833019 +0200 +@@ -70,9 +70,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"; +@@ -85,10 +85,10 @@ } if ($ARGV[0] and $ARGV[0] eq "suggest") { @@ -471,101 +306,118 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_.in munin-2.0.17-plugins/plugins/node. $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 $delay; - my $offset; - my $jitter; +@@ -120,12 +120,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 -urN munin-2.0.17/plugins/node.d/ntp_kernel_err.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_err.in ---- munin-2.0.17/plugins/node.d/ntp_kernel_err.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_err.in 2013-08-17 13:18:51.820919315 +0200 + 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=([^, ]+)/); +@@ -165,7 +165,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.69.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.69/plugins/node.d/ntp_kernel_err.in +--- munin-2.0.69.orig/plugins/node.d/ntp_kernel_err.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_kernel_err.in 2022-08-27 15:12:36.157833019 +0200 @@ -32,7 +32,7 @@ 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 @@ + END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }' +@@ -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 -- cmd=ntpq -+ cmd=/usr/sbin/ntpq +-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 -- cmd=ntpdc -+ cmd=/usr/sbin/ntpdc +- 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 - - $cmd -c kerninfo | awk '/^estimated error:/ { print $3 }' -diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_freq.in ---- munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in 2013-08-17 13:19:03.501062149 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_freq.in 2013-08-17 13:18:51.994254767 +0200 -@@ -39,7 +39,7 @@ +diff -ur munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.69/plugins/node.d/ntp_kernel_pll_freq.in +--- munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_freq.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_kernel_pll_freq.in 2022-08-27 15:12:36.157833019 +0200 +@@ -35,7 +35,7 @@ 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; }' -@@ -65,11 +65,11 @@ + END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }' +@@ -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 -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_off.in ---- munin-2.0.17/plugins/node.d/ntp_kernel_pll_off.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_off.in 2013-08-17 13:18:51.820919315 +0200 + "$cmd" -c kerninfo | awk -v "fcomp=$fcomp" '/^pll frequency:/ { printf("%.9f\n", $3 + fcomp) }' +diff -ur munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.69/plugins/node.d/ntp_kernel_pll_off.in +--- munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_off.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_kernel_pll_off.in 2022-08-27 15:12:36.159833023 +0200 @@ -32,7 +32,7 @@ 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 @@ + END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }' +@@ -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 -- cmd=ntpq -+ cmd=/usr/sbin/ntpq +-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 -- cmd=ntpdc -+ cmd=/usr/sbin/ntpdc +- 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 -ur munin-2.0.69.orig/plugins/node.d/ntp_offset.in munin-2.0.69/plugins/node.d/ntp_offset.in +--- munin-2.0.69.orig/plugins/node.d/ntp_offset.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_offset.in 2022-08-27 15:12:36.160833025 +0200 +@@ -43,9 +43,9 @@ - $cmd -c kerninfo | awk '/^pll offset:/ { print $3 }' -diff -urN munin-2.0.17/plugins/node.d/ntp_offset.in munin-2.0.17-plugins/plugins/node.d/ntp_offset.in ---- munin-2.0.17/plugins/node.d/ntp_offset.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/ntp_offset.in 2013-08-17 13:18:51.820919315 +0200 -@@ -38,9 +38,9 @@ - =cut do_autoconf () { - ntpq -c help >/dev/null 2>&1 || { echo 'no (no ntpq program)'; exit 0; } @@ -576,29 +428,41 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_offset.in munin-2.0.17-plugins/plugins 0) echo 'no (unable to list peers)' exit 0 -@@ -57,7 +57,7 @@ +@@ -62,7 +62,7 @@ } 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 @@ +@@ -95,7 +95,7 @@ do_ () { # Fetch operation - syspeer="$(ntpq -n -p | grep '^[*o]')" + syspeer="$(/usr/sbin/ntpq -n -p | grep '^[*o]')" + # shellcheck disable=SC2086 set - $syspeer - -diff -urN munin-2.0.17/plugins/node.d/ntp_states.in munin-2.0.17-plugins/plugins/node.d/ntp_states.in ---- munin-2.0.17/plugins/node.d/ntp_states.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/ntp_states.in 2013-08-17 13:18:51.820919315 +0200 -@@ -72,10 +72,10 @@ - # 1 63933 931a yes yes none outlyer sys_peer 1 +diff -ur munin-2.0.69.orig/plugins/node.d/ntp_states.in munin-2.0.69/plugins/node.d/ntp_states.in +--- munin-2.0.69.orig/plugins/node.d/ntp_states.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_states.in 2022-08-27 15:12:36.160833025 +0200 +@@ -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 - foreach my $line (`ntpq -c associations`) { @@ -610,31 +474,9 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_states.in munin-2.0.17-plugins/plugins $peerinfo =~ s/\s//g; my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/); -@@ -125,17 +125,17 @@ - } - - 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 -urN munin-2.0.17/plugins/node.d/nut_misc.in munin-2.0.17-plugins/plugins/node.d/nut_misc.in ---- munin-2.0.17/plugins/node.d/nut_misc.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/nut_misc.in 2013-08-17 13:18:51.820919315 +0200 +diff -ur munin-2.0.69.orig/plugins/node.d/nut_misc.in munin-2.0.69/plugins/node.d/nut_misc.in +--- munin-2.0.69.orig/plugins/node.d/nut_misc.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/nut_misc.in 2022-08-27 15:12:36.160833025 +0200 @@ -38,7 +38,8 @@ my %status; @@ -680,9 +522,9 @@ diff -urN munin-2.0.17/plugins/node.d/nut_misc.in munin-2.0.17-plugins/plugins/n while ($data =~ /([a-z.]+): (.+)\b/g) { my $label = $1; my $value = $2; -diff -urN munin-2.0.17/plugins/node.d/nut_volts.in munin-2.0.17-plugins/plugins/node.d/nut_volts.in ---- munin-2.0.17/plugins/node.d/nut_volts.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/nut_volts.in 2013-08-17 13:18:51.820919315 +0200 +diff -ur munin-2.0.69.orig/plugins/node.d/nut_volts.in munin-2.0.69/plugins/node.d/nut_volts.in +--- munin-2.0.69.orig/plugins/node.d/nut_volts.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/nut_volts.in 2022-08-27 15:12:36.160833025 +0200 @@ -14,7 +14,8 @@ my %status; @@ -733,10 +575,10 @@ diff -urN munin-2.0.17/plugins/node.d/nut_volts.in munin-2.0.17-plugins/plugins/ while ($data =~ /([a-z.]+): (.+)\b/g) { my $label = $1; my $value = $2; -diff -urN munin-2.0.17/plugins/node.d/perdition.in munin-2.0.17-plugins/plugins/node.d/perdition.in ---- munin-2.0.17/plugins/node.d/perdition.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/perdition.in 2013-08-17 13:18:51.820919315 +0200 -@@ -56,7 +56,7 @@ +diff -ur munin-2.0.69.orig/plugins/node.d/perdition.in munin-2.0.69/plugins/node.d/perdition.in +--- munin-2.0.69.orig/plugins/node.d/perdition.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/perdition.in 2022-08-27 15:12:36.161833027 +0200 +@@ -53,7 +53,7 @@ # Set the location of the perdition logs PERDITION_LOG=${logfile:-/var/log/perdition.log} OFFSET_FILE=${MUNIN_PLUGSTATE}/perdition.offset @@ -745,9 +587,9 @@ diff -urN munin-2.0.17/plugins/node.d/perdition.in munin-2.0.17-plugins/plugins/ case $1 in autoconf|detect) -diff -urN munin-2.0.17/plugins/node.d/pop_stats.in munin-2.0.17-plugins/plugins/node.d/pop_stats.in ---- munin-2.0.17/plugins/node.d/pop_stats.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/pop_stats.in 2013-08-17 13:18:51.820919315 +0200 +diff -ur munin-2.0.69.orig/plugins/node.d/pop_stats.in munin-2.0.69/plugins/node.d/pop_stats.in +--- munin-2.0.69.orig/plugins/node.d/pop_stats.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/pop_stats.in 2022-08-27 15:12:36.161833027 +0200 @@ -68,7 +68,9 @@ if ($startsize < $pos) { @@ -759,9 +601,9 @@ diff -urN munin-2.0.17/plugins/node.d/pop_stats.in munin-2.0.17-plugins/plugins/ $pos = 0; } -diff -urN munin-2.0.17/plugins/node.d/postgres_scans_.in munin-2.0.17-plugins/plugins/node.d/postgres_scans_.in ---- munin-2.0.17/plugins/node.d/postgres_scans_.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/postgres_scans_.in 2013-08-17 13:18:51.820919315 +0200 +diff -ur munin-2.0.69.orig/plugins/node.d/postgres_scans_.in munin-2.0.69/plugins/node.d/postgres_scans_.in +--- munin-2.0.69.orig/plugins/node.d/postgres_scans_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/postgres_scans_.in 2022-08-27 15:12:36.161833027 +0200 @@ -65,7 +65,6 @@ vlabel => 'Scans / sec', basequery => @@ -770,9 +612,9 @@ diff -urN munin-2.0.17/plugins/node.d/postgres_scans_.in munin-2.0.17-plugins/pl pivotquery => 1, configquery => "VALUES ('sequential','Sequential scans'), ('index','Index scans')", -diff -urN munin-2.0.17/plugins/node.d/postgres_tuples_.in munin-2.0.17-plugins/plugins/node.d/postgres_tuples_.in ---- munin-2.0.17/plugins/node.d/postgres_tuples_.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/postgres_tuples_.in 2013-08-17 13:18:51.820919315 +0200 +diff -ur munin-2.0.69.orig/plugins/node.d/postgres_tuples_.in munin-2.0.69/plugins/node.d/postgres_tuples_.in +--- munin-2.0.69.orig/plugins/node.d/postgres_tuples_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/postgres_tuples_.in 2022-08-27 15:12:36.161833027 +0200 @@ -74,7 +74,6 @@ . " COALESCE(sum(n_tup_del),0) AS deleted FROM pg_stat_user_tables", ], @@ -781,9 +623,9 @@ diff -urN munin-2.0.17/plugins/node.d/postgres_tuples_.in munin-2.0.17-plugins/p pivotquery => 1, configquery => [ "VALUES ('seqread','Tuples sequentally read'), ('idxfetch','Tuples index fetched'), ('inserted','Tuples inserted')," -diff -urN munin-2.0.17/plugins/node.d/slapd_.in munin-2.0.17-plugins/plugins/node.d/slapd_.in ---- munin-2.0.17/plugins/node.d/slapd_.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d/slapd_.in 2013-08-17 13:18:51.820919315 +0200 +diff -ur munin-2.0.69.orig/plugins/node.d/slapd_.in munin-2.0.69/plugins/node.d/slapd_.in +--- munin-2.0.69.orig/plugins/node.d/slapd_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/slapd_.in 2022-08-27 15:12:36.161833027 +0200 @@ -37,7 +37,7 @@ # Change these to reflect your LDAP ACL. The given DN must have @@ -793,80 +635,64 @@ diff -urN munin-2.0.17/plugins/node.d/slapd_.in munin-2.0.17-plugins/plugins/nod my $server = ($ENV{'server'} || 'localhost'); my $userdn = ($ENV{'binddn'} || ''); my $userpw = ($ENV{'bindpw'} || ''); -diff -urN munin-2.0.17/plugins/node.d.linux/files_.in munin-2.0.17-plugins/plugins/node.d.linux/files_.in ---- munin-2.0.17/plugins/node.d.linux/files_.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d.linux/files_.in 2013-08-17 13:18:51.820919315 +0200 -@@ -14,7 +14,7 @@ - #%# capabilities=autoconf - - PROC=${0##*/files_} --TMPFILE="$MUNIN_PLUGSTATE/munin-files_${PROC}.state" -+TMPFILE="@@PLUGSTATE@@/munin-files_${PROC}.state" - - if [ "$1" = "autoconf" ]; then - if [ -x /usr/sbin/lsof ]; then -diff -urN munin-2.0.17/plugins/node.d.linux/iostat.in munin-2.0.17-plugins/plugins/node.d.linux/iostat.in ---- munin-2.0.17/plugins/node.d.linux/iostat.in 2013-08-17 13:19:03.504395523 +0200 -+++ munin-2.0.17-plugins/plugins/node.d.linux/iostat.in 2013-08-17 13:18:51.994254767 +0200 -@@ -173,7 +173,7 @@ +diff -ur munin-2.0.69.orig/plugins/node.d.linux/iostat.in munin-2.0.69/plugins/node.d.linux/iostat.in +--- munin-2.0.69.orig/plugins/node.d.linux/iostat.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/iostat.in 2022-08-27 15:16:13.861246722 +0200 +@@ -169,7 +169,7 @@ if ($tmpnam =~ /\d+$/ and !$include_numbered) { - # Special case for devices like cXdXpX, - # like the cciss driver -- next unless $tmpnam =~ /\/c\d+d\d+$/ -+ next unless $tmpnam =~ /\/.*d\d+$/ + # Special case for devices like cXdXpX, like the cciss driver, + # or nvmeXnXpX for nvme. +- next unless ($tmpnam =~ /\/c\d+d\d+$/ || $tmpnam =~ /nvme\d+n\d+$/) ++ next unless ($tmpnam =~ /\/.*d\d+$/ || $tmpnam =~ /nvme\d+n\d+$/) } next unless grep { $_ } @fields; -diff -urN munin-2.0.17/plugins/node.d.linux/ip_.in munin-2.0.17-plugins/plugins/node.d.linux/ip_.in ---- munin-2.0.17/plugins/node.d.linux/ip_.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d.linux/ip_.in 2013-08-17 13:18:51.820919315 +0200 -@@ -127,14 +127,18 @@ +diff -ur munin-2.0.69.orig/plugins/node.d.linux/ip_.in munin-2.0.69/plugins/node.d.linux/ip_.in +--- munin-2.0.69.orig/plugins/node.d.linux/ip_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/ip_.in 2022-08-27 15:12:36.162833029 +0200 +@@ -128,14 +128,14 @@ # 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 @@ +@@ -148,10 +148,10 @@ 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 @@ +@@ -185,5 +185,5 @@ # 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 -urN munin-2.0.17/plugins/node.d.linux/load.in munin-2.0.17-plugins/plugins/node.d.linux/load.in ---- munin-2.0.17/plugins/node.d.linux/load.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d.linux/load.in 2013-08-17 13:18:51.820919315 +0200 + 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 -ur munin-2.0.69.orig/plugins/node.d.linux/load.in munin-2.0.69/plugins/node.d.linux/load.in +--- munin-2.0.69.orig/plugins/node.d.linux/load.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/load.in 2022-08-27 15:12:36.162833029 +0200 @@ -59,20 +59,20 @@ # one machine answer for several) @@ -905,19 +731,19 @@ diff -urN munin-2.0.17/plugins/node.d.linux/load.in munin-2.0.17-plugins/plugins # Last, if run with the "config"-parameter, quit here (don't # display any data) -diff -urN munin-2.0.17/plugins/node.d.linux/nfs_client.in munin-2.0.17-plugins/plugins/node.d.linux/nfs_client.in ---- munin-2.0.17/plugins/node.d.linux/nfs_client.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d.linux/nfs_client.in 2013-08-17 13:18:51.820919315 +0200 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/nfs_client.in munin-2.0.69/plugins/node.d.linux/nfs_client.in +--- munin-2.0.69.orig/plugins/node.d.linux/nfs_client.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/nfs_client.in 2022-08-27 15:12:36.162833029 +0200 @@ -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 - if [ -f "$NFS" ]; then + if [ -r "$NFS" ]; then - echo yes - exit 0 - else -@@ -51,11 +51,66 @@ + if grep -q proc3 "$NFS"; then + echo yes + else +@@ -56,11 +56,66 @@ exit 0 fi @@ -991,19 +817,19 @@ diff -urN munin-2.0.17/plugins/node.d.linux/nfs_client.in munin-2.0.17-plugins/p + print "commit.value " nfs_commit }' $NFS - -diff -urN munin-2.0.17/plugins/node.d.linux/nfsd.in munin-2.0.17-plugins/plugins/node.d.linux/nfsd.in ---- munin-2.0.17/plugins/node.d.linux/nfsd.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d.linux/nfsd.in 2013-08-17 13:18:51.820919315 +0200 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/nfsd.in munin-2.0.69/plugins/node.d.linux/nfsd.in +--- munin-2.0.69.orig/plugins/node.d.linux/nfsd.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/nfsd.in 2022-08-27 15:12:36.162833029 +0200 @@ -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 - if [ -f "$NFSD" ]; then + if [ -r "$NFSD" ]; then - echo yes - exit 0 - else -@@ -51,9 +51,66 @@ + grep -q proc3 "$NFSD" + if grep -q proc3 "$NFSD"; then + echo yes +@@ -57,9 +57,66 @@ exit 0 fi @@ -1076,34 +902,27 @@ diff -urN munin-2.0.17/plugins/node.d.linux/nfsd.in munin-2.0.17-plugins/plugins + print "pathconf.value " nfs_pathconf + print "commit.value " nfs_commit +}' $NFSD -diff -urN munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.17-plugins/plugins/node.d.linux/vlan_inetuse_.in ---- munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d.linux/vlan_inetuse_.in 2013-08-17 13:18:51.820919315 +0200 -@@ -37,8 +37,8 @@ +diff -ur munin-2.0.69.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.69/plugins/node.d.linux/vlan_inetuse_.in +--- munin-2.0.69.orig/plugins/node.d.linux/vlan_inetuse_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/vlan_inetuse_.in 2022-08-27 15:12:36.163833031 +0200 +@@ -37,7 +37,7 @@ 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 () { - if (/^\s*\d+\s+(\d+) +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/) -@@ -49,10 +49,10 @@ - } - } +@@ -51,7 +51,7 @@ 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 () { - if (/^\s*\d+\s+(\d+) +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/) @@ -67,7 +67,7 @@ } } @@ -1113,34 +932,27 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.17-plugin if ($ARGV[0] and $ARGV[0] eq "config") { -diff -urN munin-2.0.17/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.17-plugins/plugins/node.d.linux/vlan_linkuse_.in ---- munin-2.0.17/plugins/node.d.linux/vlan_linkuse_.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d.linux/vlan_linkuse_.in 2013-08-17 13:18:51.820919315 +0200 -@@ -29,8 +29,8 @@ +diff -ur munin-2.0.69.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.69/plugins/node.d.linux/vlan_linkuse_.in +--- munin-2.0.69.orig/plugins/node.d.linux/vlan_linkuse_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/vlan_linkuse_.in 2022-08-27 15:12:36.163833031 +0200 +@@ -29,7 +29,7 @@ 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 () { - if (/^\s*\d+\s+(\d+) +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/) -@@ -58,10 +58,10 @@ - } - } +@@ -60,7 +60,7 @@ 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 () { - if (/^\s*\d+\s+(\d+) +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/) @@ -84,5 +84,5 @@ } } @@ -1148,10 +960,10 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.17-plugin -die "Error running iptables. Dying\n" if $?; +die "Error running /usr/sbin/iptables. Dying\n" if $?; # vim:syntax=perl -diff -urN munin-2.0.17/plugins/node.d.linux/vserver_resources.in munin-2.0.17-plugins/plugins/node.d.linux/vserver_resources.in ---- munin-2.0.17/plugins/node.d.linux/vserver_resources.in 2013-07-19 18:30:03.000000000 +0200 -+++ munin-2.0.17-plugins/plugins/node.d.linux/vserver_resources.in 2013-08-17 13:18:51.820919315 +0200 -@@ -245,6 +245,12 @@ +diff -ur munin-2.0.69.orig/plugins/node.d.linux/vserver_resources.in munin-2.0.69/plugins/node.d.linux/vserver_resources.in +--- munin-2.0.69.orig/plugins/node.d.linux/vserver_resources.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/vserver_resources.in 2022-08-27 15:12:36.163833031 +0200 +@@ -247,6 +247,12 @@ echo 'graph_vlabel ANON pages' echo 'graph_info Shows anonymous memory (human readable) used by each vserver.' ;; @@ -1164,7 +976,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vserver_resources.in munin-2.0.17-pl FILES) echo 'graph_title Files used by vserver' echo 'graph_args --base 1024k -l 0' -@@ -281,6 +287,30 @@ +@@ -283,6 +289,30 @@ echo 'graph_vlabel SHM pages' echo 'graph_info Shows shared memory (human readable) used by each vserver.' ;; @@ -1195,7 +1007,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vserver_resources.in munin-2.0.17-pl *) echo "$RESOURCE not defined." exit 1 -@@ -299,53 +329,108 @@ +@@ -301,53 +331,108 @@ case "$RESOURCE" in PROC) @@ -1331,32 +1143,33 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vserver_resources.in munin-2.0.17-pl ;; *) echo "$RESOURCE not defined." -@@ -356,7 +441,7 @@ - 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 [ -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" + echo "${NAME}_${RESOURCE}.critical $LIMIT" fi fi done -@@ -367,8 +452,15 @@ +@@ -369,8 +454,18 @@ 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 -- +