X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmunin.git;a=blobdiff_plain;f=munin-plugins.patch;fp=munin-plugins.patch;h=8ee3d4de74aa85bf555b91b908976e3465708c2c;hp=3dc24ed63fb771dbf349998a45293d78b4635b7f;hb=07fe06d737e4de10ee16544aecfa6e79622123d9;hpb=1342d283cc5c3ac190405acb3b922cdd17141ec3 diff --git a/munin-plugins.patch b/munin-plugins.patch index 3dc24ed..8ee3d4d 100644 --- a/munin-plugins.patch +++ b/munin-plugins.patch @@ -1,6 +1,7 @@ -diff -ur munin-2.0.65.orig/plugins/node.d/amavis.in munin-2.0.65/plugins/node.d/amavis.in ---- munin-2.0.65.orig/plugins/node.d/amavis.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/amavis.in 2021-01-04 17:53:09.637969144 +0100 +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} @@ -28,9 +29,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/amavis.in munin-2.0.65/plugins/node.d/ if [ -n "$TEMP_FILE" ] && [ -f "$TEMP_FILE" ]; then if [ "$ARGS" != 0 ]; then -diff -ur munin-2.0.65.orig/plugins/node.d/apache_accesses.in munin-2.0.65/plugins/node.d/apache_accesses.in ---- munin-2.0.65.orig/plugins/node.d/apache_accesses.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/apache_accesses.in 2021-01-04 17:53:09.638969144 +0100 +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"; @@ -52,9 +53,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/apache_accesses.in munin-2.0.65/plugin print "graph_args --base 1000\n"; print "graph_vlabel accesses / \${graph_period}\n"; print "graph_category apache\n"; -diff -ur munin-2.0.65.orig/plugins/node.d/apache_processes.in munin-2.0.65/plugins/node.d/apache_processes.in ---- munin-2.0.65.orig/plugins/node.d/apache_processes.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/apache_processes.in 2021-01-04 17:53:09.638969144 +0100 +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"; @@ -76,9 +77,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/apache_processes.in munin-2.0.65/plugi print "graph_args --base 1000 -l 0\n"; print "graph_category apache\n"; print "graph_order "; -diff -ur munin-2.0.65.orig/plugins/node.d/apache_volume.in munin-2.0.65/plugins/node.d/apache_volume.in ---- munin-2.0.65.orig/plugins/node.d/apache_volume.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/apache_volume.in 2021-01-04 17:53:09.639969144 +0100 +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"; @@ -100,9 +101,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/apache_volume.in munin-2.0.65/plugins/ print "graph_args --base 1000\n"; print "graph_vlabel bytes per \${graph_period}\n"; print "graph_category apache\n"; -diff -ur munin-2.0.65.orig/plugins/node.d/bind9.in munin-2.0.65/plugins/node.d/bind9.in ---- munin-2.0.65.orig/plugins/node.d/bind9.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/bind9.in 2021-01-04 17:53:09.639969144 +0100 +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; @@ -121,9 +122,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/bind9.in munin-2.0.65/plugins/node.d/b while () { chomp; my ($q,$n) = split(/\s+/,$_,2); -diff -ur munin-2.0.65.orig/plugins/node.d/courier_.in munin-2.0.65/plugins/node.d/courier_.in ---- munin-2.0.65.orig/plugins/node.d/courier_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/courier_.in 2021-01-04 17:53:09.639969144 +0100 +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')} @@ -133,9 +134,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/courier_.in munin-2.0.65/plugins/node. case $1 in -diff -ur munin-2.0.65.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.65/plugins/node.d/courier_mta_mailstats.in ---- munin-2.0.65.orig/plugins/node.d/courier_mta_mailstats.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/courier_mta_mailstats.in 2021-01-04 17:53:09.639969144 +0100 +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) { @@ -147,9 +148,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.65/ $pos = 0; } -diff -ur munin-2.0.65.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.65/plugins/node.d/courier_mta_mailvolume.in ---- munin-2.0.65.orig/plugins/node.d/courier_mta_mailvolume.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/courier_mta_mailvolume.in 2021-01-04 17:53:09.639969144 +0100 +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) { @@ -161,9 +162,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.65 $pos = 0; } -diff -ur munin-2.0.65.orig/plugins/node.d/cupsys_pages.in munin-2.0.65/plugins/node.d/cupsys_pages.in ---- munin-2.0.65.orig/plugins/node.d/cupsys_pages.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/cupsys_pages.in 2021-01-04 17:53:09.640969144 +0100 +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) { @@ -184,9 +185,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/cupsys_pages.in munin-2.0.65/plugins/n if(!defined($printers{$1}) && keys(%printers) < $MAXLABEL) { $printers{$1} += int($2)*int($3); } elsif(defined($printers{$1})) { -diff -ur munin-2.0.65.orig/plugins/node.d/foldingathome_rank.in munin-2.0.65/plugins/node.d/foldingathome_rank.in ---- munin-2.0.65.orig/plugins/node.d/foldingathome_rank.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/foldingathome_rank.in 2021-01-04 17:53:09.640969144 +0100 +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 @@ -196,9 +197,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/foldingathome_rank.in munin-2.0.65/plu if [ "$1" = "config" ]; then echo 'graph_title Folding@Home Rank' -diff -ur munin-2.0.65.orig/plugins/node.d/mailman.in munin-2.0.65/plugins/node.d/mailman.in ---- munin-2.0.65.orig/plugins/node.d/mailman.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/mailman.in 2021-01-04 17:53:09.640969144 +0100 +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"; @@ -214,9 +215,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/mailman.in munin-2.0.65/plugins/node.d if (-f "$logfile.0") { -diff -ur munin-2.0.65.orig/plugins/node.d/mysql_.in munin-2.0.65/plugins/node.d/mysql_.in ---- munin-2.0.65.orig/plugins/node.d/mysql_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/mysql_.in 2021-01-04 17:53:09.641969144 +0100 +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 @@ -246,18 +247,18 @@ diff -ur munin-2.0.65.orig/plugins/node.d/mysql_.in munin-2.0.65/plugins/node.d/ $shared_memory_cache->set('data', $data); $shared_memory_cache->set('graphs', nfreeze(\%graphs)); -diff -ur munin-2.0.65.orig/plugins/node.d/mysql_innodb.in munin-2.0.65/plugins/node.d/mysql_innodb.in ---- munin-2.0.65.orig/plugins/node.d/mysql_innodb.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/mysql_innodb.in 2021-01-04 17:53:09.641969144 +0100 +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 -ur munin-2.0.65.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.65/plugins/node.d/mysql_slowqueries.in ---- munin-2.0.65.orig/plugins/node.d/mysql_slowqueries.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/mysql_slowqueries.in 2021-01-04 17:53:09.641969144 +0100 +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 @@ -266,9 +267,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.65/plug +/bin/printf "queries.value " # shellcheck disable=SC2086 ("$MYSQLADMIN" $MYSQLOPTS status 2>/dev/null || echo a a a a a a a a U) | awk '{print $9}' -diff -ur munin-2.0.65.orig/plugins/node.d/mysql_threads.in munin-2.0.65/plugins/node.d/mysql_threads.in ---- munin-2.0.65.orig/plugins/node.d/mysql_threads.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/mysql_threads.in 2021-01-04 17:53:09.641969144 +0100 +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 @@ -277,10 +278,10 @@ diff -ur munin-2.0.65.orig/plugins/node.d/mysql_threads.in munin-2.0.65/plugins/ +/bin/printf "threads.value " # shellcheck disable=SC2086 ("$MYSQLADMIN" $MYSQLOPTS status 2>/dev/null || echo 'a a a U') | awk '{print $4}' -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_.in munin-2.0.65/plugins/node.d/ntp_.in ---- munin-2.0.65.orig/plugins/node.d/ntp_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_.in 2021-01-04 17:57:57.057969144 +0100 -@@ -68,9 +68,9 @@ +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 { @@ -292,7 +293,7 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_.in munin-2.0.65/plugins/node.d/nt print "yes\n"; } else { print "no (ntpq -p returned no peers)\n"; -@@ -83,10 +83,10 @@ +@@ -85,10 +85,10 @@ } if ($ARGV[0] and $ARGV[0] eq "suggest") { @@ -305,7 +306,7 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_.in munin-2.0.65/plugins/node.d/nt $peerinfo =~ s/\R/ /g; my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/); print $peer_addr, "\n" unless $peer_addr eq "0.0.0.0"; -@@ -118,12 +118,12 @@ +@@ -120,12 +120,12 @@ my $delay = "U"; my $offset = "U"; my $jitter = "U"; @@ -320,7 +321,7 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_.in munin-2.0.65/plugins/node.d/nt $peerinfo =~ s/\R/ /g; ($srcadr) = ($peerinfo =~ m/srcadr=([^, ]+)/); ($delay) = ($peerinfo =~ m/delay=([^, ]+)/); -@@ -163,7 +163,7 @@ +@@ -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); @@ -329,9 +330,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_.in munin-2.0.65/plugins/node.d/nt $peerinfo =~ s/\R/ /g; ($srcadr) = ($peerinfo =~ m/srcadr=([^, ]+)/); ($delay) = ($peerinfo =~ m/delay=([^, ]+)/); -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.65/plugins/node.d/ntp_kernel_err.in ---- munin-2.0.65.orig/plugins/node.d/ntp_kernel_err.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_kernel_err.in 2021-01-04 17:56:35.893969144 +0100 +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 @@ -356,9 +357,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.65/plugins - ntpq -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3 / 1000) }' + /usr/sbin/ntpq -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3 / 1000) }' fi -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.65/plugins/node.d/ntp_kernel_pll_freq.in ---- munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_kernel_pll_freq.in 2021-01-04 17:55:34.045969144 +0100 +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 @@ -385,9 +386,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.65/pl fi "$cmd" -c kerninfo | awk -v "fcomp=$fcomp" '/^pll frequency:/ { printf("%.9f\n", $3 + fcomp) }' -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.65/plugins/node.d/ntp_kernel_pll_off.in ---- munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_off.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_kernel_pll_off.in 2021-01-04 17:54:55.598969144 +0100 +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 @@ -412,10 +413,10 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.65/plu - 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.65.orig/plugins/node.d/ntp_offset.in munin-2.0.65/plugins/node.d/ntp_offset.in ---- munin-2.0.65.orig/plugins/node.d/ntp_offset.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_offset.in 2021-01-04 17:53:09.693969144 +0100 -@@ -42,9 +42,9 @@ +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 @@ do_autoconf () { @@ -427,7 +428,7 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_offset.in munin-2.0.65/plugins/nod 0) echo 'no (unable to list peers)' exit 0 -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ } do_config () { @@ -436,7 +437,7 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_offset.in munin-2.0.65/plugins/nod # shellcheck disable=SC2086 set - $syspeer -@@ -91,7 +91,7 @@ +@@ -95,7 +95,7 @@ do_ () { # Fetch operation @@ -445,9 +446,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_offset.in munin-2.0.65/plugins/nod # shellcheck disable=SC2086 set - $syspeer -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_states.in munin-2.0.65/plugins/node.d/ntp_states.in ---- munin-2.0.65.orig/plugins/node.d/ntp_states.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_states.in 2021-01-04 17:55:58.249969144 +0100 +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"; @@ -473,9 +474,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_states.in munin-2.0.65/plugins/nod $peerinfo =~ s/\s//g; my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/); -diff -ur munin-2.0.65.orig/plugins/node.d/nut_misc.in munin-2.0.65/plugins/node.d/nut_misc.in ---- munin-2.0.65.orig/plugins/node.d/nut_misc.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/nut_misc.in 2021-01-04 17:53:09.694969144 +0100 +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; @@ -521,9 +522,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/nut_misc.in munin-2.0.65/plugins/node. while ($data =~ /([a-z.]+): (.+)\b/g) { my $label = $1; my $value = $2; -diff -ur munin-2.0.65.orig/plugins/node.d/nut_volts.in munin-2.0.65/plugins/node.d/nut_volts.in ---- munin-2.0.65.orig/plugins/node.d/nut_volts.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/nut_volts.in 2021-01-04 17:53:09.694969144 +0100 +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; @@ -574,9 +575,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/nut_volts.in munin-2.0.65/plugins/node while ($data =~ /([a-z.]+): (.+)\b/g) { my $label = $1; my $value = $2; -diff -ur munin-2.0.65.orig/plugins/node.d/perdition.in munin-2.0.65/plugins/node.d/perdition.in ---- munin-2.0.65.orig/plugins/node.d/perdition.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/perdition.in 2021-01-04 17:53:09.695969144 +0100 +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} @@ -586,9 +587,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/perdition.in munin-2.0.65/plugins/node case $1 in autoconf|detect) -diff -ur munin-2.0.65.orig/plugins/node.d/pop_stats.in munin-2.0.65/plugins/node.d/pop_stats.in ---- munin-2.0.65.orig/plugins/node.d/pop_stats.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/pop_stats.in 2021-01-04 17:53:09.695969144 +0100 +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) { @@ -600,9 +601,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/pop_stats.in munin-2.0.65/plugins/node $pos = 0; } -diff -ur munin-2.0.65.orig/plugins/node.d/postgres_scans_.in munin-2.0.65/plugins/node.d/postgres_scans_.in ---- munin-2.0.65.orig/plugins/node.d/postgres_scans_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/postgres_scans_.in 2021-01-04 17:53:09.695969144 +0100 +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 => @@ -611,9 +612,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/postgres_scans_.in munin-2.0.65/plugin pivotquery => 1, configquery => "VALUES ('sequential','Sequential scans'), ('index','Index scans')", -diff -ur munin-2.0.65.orig/plugins/node.d/postgres_tuples_.in munin-2.0.65/plugins/node.d/postgres_tuples_.in ---- munin-2.0.65.orig/plugins/node.d/postgres_tuples_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/postgres_tuples_.in 2021-01-04 17:53:09.695969144 +0100 +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", ], @@ -622,9 +623,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/postgres_tuples_.in munin-2.0.65/plugi pivotquery => 1, configquery => [ "VALUES ('seqread','Tuples sequentally read'), ('idxfetch','Tuples index fetched'), ('inserted','Tuples inserted')," -diff -ur munin-2.0.65.orig/plugins/node.d/slapd_.in munin-2.0.65/plugins/node.d/slapd_.in ---- munin-2.0.65.orig/plugins/node.d/slapd_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/slapd_.in 2021-01-04 17:53:09.696969144 +0100 +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 @@ -634,21 +635,21 @@ diff -ur munin-2.0.65.orig/plugins/node.d/slapd_.in munin-2.0.65/plugins/node.d/ my $server = ($ENV{'server'} || 'localhost'); my $userdn = ($ENV{'binddn'} || ''); my $userpw = ($ENV{'bindpw'} || ''); -diff -ur munin-2.0.65.orig/plugins/node.d.linux/iostat.in munin-2.0.65/plugins/node.d.linux/iostat.in ---- munin-2.0.65.orig/plugins/node.d.linux/iostat.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/iostat.in 2021-01-04 17:53:09.715969144 +0100 +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 -ur munin-2.0.65.orig/plugins/node.d.linux/ip_.in munin-2.0.65/plugins/node.d.linux/ip_.in ---- munin-2.0.65.orig/plugins/node.d.linux/ip_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/ip_.in 2021-01-04 17:53:09.715969144 +0100 +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". @@ -689,9 +690,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/ip_.in munin-2.0.65/plugins/node -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.65.orig/plugins/node.d.linux/load.in munin-2.0.65/plugins/node.d.linux/load.in ---- munin-2.0.65.orig/plugins/node.d.linux/load.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/load.in 2021-01-04 17:53:09.715969144 +0100 +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) @@ -730,9 +731,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/load.in munin-2.0.65/plugins/nod # Last, if run with the "config"-parameter, quit here (don't # display any data) -diff -ur munin-2.0.65.orig/plugins/node.d.linux/nfs_client.in munin-2.0.65/plugins/node.d.linux/nfs_client.in ---- munin-2.0.65.orig/plugins/node.d.linux/nfs_client.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/nfs_client.in 2021-01-04 17:53:09.715969144 +0100 +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" @@ -816,9 +817,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/nfs_client.in munin-2.0.65/plugi + print "commit.value " nfs_commit }' $NFS - -diff -ur munin-2.0.65.orig/plugins/node.d.linux/nfsd.in munin-2.0.65/plugins/node.d.linux/nfsd.in ---- munin-2.0.65.orig/plugins/node.d.linux/nfsd.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/nfsd.in 2021-01-04 17:53:09.716969144 +0100 +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" @@ -901,9 +902,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/nfsd.in munin-2.0.65/plugins/nod + print "pathconf.value " nfs_pathconf + print "commit.value " nfs_commit +}' $NFSD -diff -ur munin-2.0.65.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.65/plugins/node.d.linux/vlan_inetuse_.in ---- munin-2.0.65.orig/plugins/node.d.linux/vlan_inetuse_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/vlan_inetuse_.in 2021-01-04 17:53:09.716969144 +0100 +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 = (); @@ -931,9 +932,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.65/pl if ($ARGV[0] and $ARGV[0] eq "config") { -diff -ur munin-2.0.65.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.65/plugins/node.d.linux/vlan_linkuse_.in ---- munin-2.0.65.orig/plugins/node.d.linux/vlan_linkuse_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/vlan_linkuse_.in 2021-01-04 17:53:09.716969144 +0100 +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 = (); @@ -959,9 +960,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.65/pl -die "Error running iptables. Dying\n" if $?; +die "Error running /usr/sbin/iptables. Dying\n" if $?; # vim:syntax=perl -diff -ur munin-2.0.65.orig/plugins/node.d.linux/vserver_resources.in munin-2.0.65/plugins/node.d.linux/vserver_resources.in ---- munin-2.0.65.orig/plugins/node.d.linux/vserver_resources.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/vserver_resources.in 2021-01-04 17:53:09.716969144 +0100 +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.'