From d5910e0aa4a37928e95746cb73d3090e1dcce56e Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 11 Oct 2018 17:16:40 +0000 Subject: [PATCH] - updated to 2.0.42 --- munin-Makefile.patch | 28 +- munin-plugins.patch | 508 +++++++++++++++++------------------ munin-separate-configs.patch | 464 +++++++++++++++++--------------- munin-templatedir.patch | 100 +++---- munin-timeout.patch | 6 +- munin.spec | 8 +- 6 files changed, 564 insertions(+), 550 deletions(-) diff --git a/munin-Makefile.patch b/munin-Makefile.patch index 5fd9967..9c09ede 100644 --- a/munin-Makefile.patch +++ b/munin-Makefile.patch @@ -1,7 +1,7 @@ -diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile ---- munin-2.0.25.orig/Makefile 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/Makefile 2015-09-08 10:02:24.392593251 +0000 -@@ -81,6 +81,7 @@ install-master-prime: $(INFILES_MASTER) +diff -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile +--- munin-2.0.42.orig/Makefile 2018-09-21 02:11:11.000000000 +0000 ++++ munin-2.0.42/Makefile 2018-10-11 14:59:08.887033000 +0000 +@@ -106,6 +106,7 @@ install-master-prime: $(INFILES_MASTER) mkdir -p $(CONFDIR)/munin-conf.d mkdir -p $(LIBDIR) mkdir -p $(BINDIR) @@ -9,7 +9,7 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile mkdir -p $(PERLLIB) mkdir -p $(PERLLIB)/Munin/Master mkdir -p $(HTMLDIR) -@@ -112,8 +113,8 @@ install-master-prime: $(INFILES_MASTER) +@@ -137,8 +138,8 @@ install-master-prime: $(INFILES_MASTER) test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/ @@ -20,9 +20,9 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/ $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/ $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/ -diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config ---- munin-2.0.25.orig/Makefile.config 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/Makefile.config 2015-09-08 10:02:24.393593251 +0000 +diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config +--- munin-2.0.42.orig/Makefile.config 2018-09-21 02:11:11.000000000 +0000 ++++ munin-2.0.42/Makefile.config 2018-10-11 14:59:55.327033000 +0000 @@ -17,10 +17,10 @@ # # the base of the Munin installation. @@ -81,12 +81,12 @@ diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config BASH := /bin/bash # Server only - Where to install the perl libraries --PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2) -+PERLSITELIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2) - PERLLIB = $(DESTDIR)$(PERLSITELIB) +-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2) ++PERLLIB = $(DESTDIR)$(shell $(PERL) -V:vendorlib | cut -d"'" -f2) # Client only - Install plugins for this architecture -@@ -106,7 +106,7 @@ OSTYPE := $(shell uname | LANG=C tr + # the LANG=C makes tr work as expected, not regarding any locale it +@@ -105,7 +105,7 @@ OSTYPE := $(shell uname | LANG=C tr # How to figure out the hostname. (Only used in default configuration # files) @@ -95,7 +95,7 @@ diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config # What is the safest way to create a tempfile. # Default is to figure it out by testing various methods. -@@ -129,9 +129,9 @@ CGIUSER := nobody +@@ -128,9 +128,9 @@ CGIUSER := nobody # Which command to use to check if the USER and GROUP to run Munin as, exists. # These will work on most modern OSes: # @@ -108,7 +108,7 @@ diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config # For OSX, comment out the previous two lines and comment in these # -@@ -153,9 +153,9 @@ CHECKGROUP := $(shell $(GETENT) group $( +@@ -152,9 +152,9 @@ CHECKGROUP := $(shell $(GETENT) group $( #CHECKUSER := $(shell id $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) #CHECKGROUP := $(shell grep ^$(GROUP): /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) 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 () { 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 () { - if (/^\s*\d+\s+(\d+) +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/) -@@ -49,10 +49,10 @@ while () - } - } +@@ -51,7 +51,7 @@ while () 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 @@ while () } } @@ -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 () { - if (/^\s*\d+\s+(\d+) +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/) -@@ -58,10 +58,10 @@ while () - } - } +@@ -60,7 +60,7 @@ while () 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 @@ while () } } @@ -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 -- + diff --git a/munin-separate-configs.patch b/munin-separate-configs.patch index b247733..8e17281 100644 --- a/munin-separate-configs.patch +++ b/munin-separate-configs.patch @@ -1,6 +1,6 @@ -diff -urNp munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.25/common/lib/Munin/Common/Defaults.pm ---- munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm 2015-09-08 10:12:45.000000000 +0000 -+++ munin-2.0.25/common/lib/Munin/Common/Defaults.pm 2015-09-08 10:13:31.731593251 +0000 +diff -urNpa munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.42/common/lib/Munin/Common/Defaults.pm +--- munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:24:44.276033000 +0000 ++++ munin-2.0.42/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:25:02.395033000 +0000 @@ -18,7 +18,8 @@ my $COMPONENT_ROOT = dirname(__FILE__) . our $DROPDOWNLIMIT = 1; @@ -11,9 +11,9 @@ diff -urNp munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.25/co our $MUNIN_BINDIR = ''; our $MUNIN_SBINDIR = ''; our $MUNIN_DOCDIR = ''; -diff -urNp munin-2.0.25.orig/doc/installation/configuration.rst munin-2.0.25/doc/installation/configuration.rst ---- munin-2.0.25.orig/doc/installation/configuration.rst 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/doc/installation/configuration.rst 2015-09-08 10:13:31.732593251 +0000 +diff -urNpa munin-2.0.42.orig/doc/installation/configuration.rst munin-2.0.42/doc/installation/configuration.rst +--- munin-2.0.42.orig/doc/installation/configuration.rst 2018-10-11 15:24:44.284033000 +0000 ++++ munin-2.0.42/doc/installation/configuration.rst 2018-10-11 15:25:02.395033000 +0000 @@ -9,7 +9,7 @@ Plugins ------- @@ -32,10 +32,10 @@ diff -urNp munin-2.0.25.orig/doc/installation/configuration.rst munin-2.0.25/doc [node.example.com] address 192.0.2.4 -diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile ---- munin-2.0.25.orig/Makefile 2015-09-08 10:12:45.000000000 +0000 -+++ munin-2.0.25/Makefile 2015-09-08 10:13:31.733593251 +0000 -@@ -56,7 +56,7 @@ uninstall: +diff -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile +--- munin-2.0.42.orig/Makefile 2018-10-11 15:24:44.275033000 +0000 ++++ munin-2.0.42/Makefile 2018-10-11 16:29:37.518033000 +0000 +@@ -81,7 +81,7 @@ uninstall: # a new config. Target _only_ suitable for maintainers. unconfig: rm -f $(HTMLDIR)/.htaccess @@ -44,7 +44,7 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile tags: -rm -f TAGS -@@ -71,14 +71,15 @@ install-pre: Makefile Makefile.config +@@ -96,14 +96,15 @@ install-pre: Makefile Makefile.config mkdir -p $(LOGDIR) mkdir -p $(STATEDIR) mkdir -p $(SPOOLDIR) @@ -62,7 +62,7 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile mkdir -p $(LIBDIR) mkdir -p $(BINDIR) mkdir -p $(SBINDIR) -@@ -111,7 +112,7 @@ install-master-prime: $(INFILES_MASTER) +@@ -136,7 +137,7 @@ install-master-prime: $(INFILES_MASTER) $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/ test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess @@ -71,7 +71,7 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile $(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/ $(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/ -@@ -140,14 +141,14 @@ endif +@@ -157,14 +158,14 @@ install-node-plugins: install-plugins-pr install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config @$(CHECKGROUP) @@ -87,9 +87,9 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile - $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d + $(CHMOD) 0755 $(NCONFDIR)/plugin-conf.d - for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ - if test -f "$$p" ; then \ -@@ -184,7 +185,7 @@ install-async: + @# Process the OS specific plugins at the end. Otherwise they would be overridden by the + @# generic ones. +@@ -204,7 +205,7 @@ install-async: install-node-prime: install-node-pre install-node install-node-pre: build/node/munin-node.conf install-pre @@ -98,27 +98,37 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile install-common-prime: build-common install-common -@@ -220,7 +221,8 @@ build/%: %.in +@@ -240,7 +241,8 @@ build/%: %.in @echo "$< -> $@" @mkdir -p build/`dirname $<` - @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \ -- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \ -+ -e 's|@@MCONFDIR@@|$(MCONFDIR)|g' \ -+ -e 's|@@NCONFDIR@@|$(NCONFDIR)|g' \ - -e 's|@@BINDIR@@|$(BINDIR)|g' \ - -e 's|@@SBINDIR@@|$(SBINDIR)|g' \ - -e 's|@@DOCDIR@@|$(DOCDIR)|g' \ -@@ -301,7 +303,8 @@ build-common-pre: common/Build - common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm build-common-pre + @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \ +- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \ ++ -e 's|@@MCONFDIR@@|$(MCONFDIR)|g' \ ++ -e 's|@@NCONFDIR@@|$(NCONFDIR)|g' \ + -e 's|@@BINDIR@@|$(BINDIR)|g' \ + -e 's|@@SBINDIR@@|$(SBINDIR)|g' \ + -e 's|@@DOCDIR@@|$(DOCDIR)|g' \ +@@ -283,7 +285,8 @@ $(CONFVAR_SUBSTITUTION_DEP_FILES): build + + substitute-confvar-inline: + perl -p -i -e 's|\@\@PREFIX\@\@|$(PREFIX)|g;' \ +- -e 's|\@\@CONFDIR\@\@|$(CONFDIR)|g;' \ ++ -e 's|\@\@MCONFDIR\@\@|$(MCONFDIR)|g;' \ ++ -e 's|\@\@NCONFDIR\@\@|$(NCONFDIR)|g;' \ + -e 's|\@\@BINDIR\@\@|$(BINDIR)|g;' \ + -e 's|\@\@SBINDIR\@\@|$(SBINDIR)|g;' \ + -e 's|\@\@DOCDIR\@\@|$(DOCDIR)|g;' \ +@@ -339,7 +342,8 @@ common/blib/lib/Munin/Common/Defaults.pm + substitute-build-defaults-inline: rm -f common/blib/lib/Munin/Common/Defaults.pm - $(PERL) -pe 's{(PREFIX \s+=\s).*}{\1q{$(PREFIX)};}x; \ -- s{(CONFDIR \s+=\s).*}{\1q{$(CONFDIR)};}x; \ -+ s{(MCONFDIR \s+=\s).*}{\1q{$(MCONFDIR)};}x; \ -+ s{(NCONFDIR \s+=\s).*}{\1q{$(NCONFDIR)};}x; \ - s{(BINDIR \s+=\s).*}{\1q{$(BINDIR)};}x; \ - s{(SBINDIR \s+=\s).*}{\1q{$(SBINDIR)};}x; \ - s{(DOCDIR \s+=\s).*}{\1q{$(DOCDIR)};}x; \ -@@ -428,7 +431,7 @@ old-test: t/*.t + $(PERL) -pe 's{(PREFIX\s+=\s).*}{\1q{$(PREFIX)};}x; \ +- s{(CONFDIR\s+=\s).*}{\1q{$(CONFDIR)};}x; \ ++ s{(MCONFDIR\s+=\s).*}{\1q{$(MCONFDIR)};}x; \ ++ s{(NCONFDIR\s+=\s).*}{\1q{$(NCONFDIR)};}x; \ + s{(BINDIR\s+=\s).*}{\1q{$(BINDIR)};}x; \ + s{(SBINDIR\s+=\s).*}{\1q{$(SBINDIR)};}x; \ + s{(DOCDIR\s+=\s).*}{\1q{$(DOCDIR)};}x; \ +@@ -493,7 +497,7 @@ old-test: t/*.t $(MAKE) $@ CONFIG=t/Makefile.config else test_plugins = id_default id_root env @@ -127,7 +137,7 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile @for test in t/*.t; do \ echo -n "$$test: "; \ PERL5LIB=$(PERLLIB) $(PERL) $$test;\ -@@ -436,10 +439,10 @@ old-test: t/*.t t/install $(addprefix $( +@@ -501,10 +505,10 @@ old-test: t/*.t t/install $(addprefix $( endif node-monkeywrench: install-node @@ -140,9 +150,9 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/ $(SBINDIR)/munin-node-configure --suggest echo 'Done?' -diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config ---- munin-2.0.25.orig/Makefile.config 2015-09-08 10:12:45.000000000 +0000 -+++ munin-2.0.25/Makefile.config 2015-09-08 10:13:31.733593251 +0000 +diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config +--- munin-2.0.42.orig/Makefile.config 2018-10-11 15:24:44.282033000 +0000 ++++ munin-2.0.42/Makefile.config 2018-10-11 15:25:02.396033000 +0000 @@ -20,7 +20,8 @@ PREFIX = $(DESTDIR)/usr @@ -153,9 +163,33 @@ diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config # Server only - where to put munin-cron BINDIR = $(PREFIX)/bin -diff -urNp munin-2.0.25.orig/master/_bin/munin-cgi-graph.in munin-2.0.25/master/_bin/munin-cgi-graph.in ---- munin-2.0.25.orig/master/_bin/munin-cgi-graph.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/_bin/munin-cgi-graph.in 2015-09-08 10:13:31.734593251 +0000 +diff -urNpa munin-2.0.42.orig/Makefile.rej munin-2.0.42/Makefile.rej +--- munin-2.0.42.orig/Makefile.rej 2018-10-11 15:24:44.282033000 +0000 ++++ munin-2.0.42/Makefile.rej 1970-01-01 00:00:00.000000000 +0000 +@@ -1,20 +0,0 @@ +---- Makefile 2015-09-08 10:02:24.000000000 +0000 +-+++ Makefile 2015-09-08 10:12:45.899593251 +0000 +-@@ -249,6 +249,7 @@ build/%: %.in +- -e 's|@@GOODSH@@|$(GOODSH)|g' \ +- -e 's|@@BASH@@|$(BASH)|g' \ +- -e 's|@@HASSETR@@|$(HASSETR)|g' \ +-+ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \ +- $< > $@; +- +- +-@@ -326,7 +327,8 @@ common/blib/lib/Munin/Common/Defaults.pm +- s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \ +- s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \ +- s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \ +-- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \ +-+ s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \ +-+ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\ +- $< > $@ +- +- build-doc: build-doc-stamp Makefile Makefile.config +diff -urNpa munin-2.0.42.orig/master/_bin/munin-cgi-graph.in munin-2.0.42/master/_bin/munin-cgi-graph.in +--- munin-2.0.42.orig/master/_bin/munin-cgi-graph.in 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/_bin/munin-cgi-graph.in 2018-10-11 15:25:02.396033000 +0000 @@ -44,7 +44,7 @@ use Munin::Master::Logger; use Log::Log4perl qw( :easy ); @@ -165,9 +199,9 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-cgi-graph.in munin-2.0.25/master/ my %period = ( "day" => 300, "week" => 1800, -diff -urNp munin-2.0.25.orig/master/_bin/munin-check.in munin-2.0.25/master/_bin/munin-check.in ---- munin-2.0.25.orig/master/_bin/munin-check.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/_bin/munin-check.in 2015-09-08 10:13:31.734593251 +0000 +diff -urNpa munin-2.0.42.orig/master/_bin/munin-check.in munin-2.0.42/master/_bin/munin-check.in +--- munin-2.0.42.orig/master/_bin/munin-check.in 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/_bin/munin-check.in 2018-10-11 15:25:02.396033000 +0000 @@ -163,7 +163,7 @@ done norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@ norec=yes perm_ok @@PLUGSTATE@@ 775 @@ -177,9 +211,9 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-check.in munin-2.0.25/master/_bin echo "Check done. Please note that this script only checks most things," echo "not all things." -diff -urNp munin-2.0.25.orig/master/_bin/munin-graph.in munin-2.0.25/master/_bin/munin-graph.in ---- munin-2.0.25.orig/master/_bin/munin-graph.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/_bin/munin-graph.in 2015-09-08 10:13:31.735593251 +0000 +diff -urNpa munin-2.0.42.orig/master/_bin/munin-graph.in munin-2.0.42/master/_bin/munin-graph.in +--- munin-2.0.42.orig/master/_bin/munin-graph.in 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/_bin/munin-graph.in 2018-10-11 15:25:02.396033000 +0000 @@ -51,7 +51,7 @@ use Munin::Master::Logger; use Log::Log4perl qw( :easy ); @@ -189,9 +223,9 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-graph.in munin-2.0.25/master/_bin my %period = ( "day" => 300, "week" => 1800, -diff -urNp munin-2.0.25.orig/master/_bin/munin-limits.in munin-2.0.25/master/_bin/munin-limits.in ---- munin-2.0.25.orig/master/_bin/munin-limits.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/_bin/munin-limits.in 2015-09-08 10:13:31.735593251 +0000 +diff -urNpa munin-2.0.42.orig/master/_bin/munin-limits.in munin-2.0.42/master/_bin/munin-limits.in +--- munin-2.0.42.orig/master/_bin/munin-limits.in 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/_bin/munin-limits.in 2018-10-11 15:25:02.396033000 +0000 @@ -66,7 +66,7 @@ Limit contacts to those of Econtact< =item B<< --config >> @@ -210,9 +244,9 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-limits.in munin-2.0.25/master/_bi @@DBDIR@@/* @@STATEDIR@@/* -diff -urNp munin-2.0.25.orig/master/_bin/munin-update.in munin-2.0.25/master/_bin/munin-update.in ---- munin-2.0.25.orig/master/_bin/munin-update.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/_bin/munin-update.in 2015-09-08 10:13:31.735593251 +0000 +diff -urNpa munin-2.0.42.orig/master/_bin/munin-update.in munin-2.0.42/master/_bin/munin-update.in +--- munin-2.0.42.orig/master/_bin/munin-update.in 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/_bin/munin-update.in 2018-10-11 15:25:02.396033000 +0000 @@ -139,7 +139,7 @@ munin-update [options] =item B<< --config_file= >> @@ -231,9 +265,9 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-update.in munin-2.0.25/master/_bi @@DBDIR@@/* @@LOGDIR@@/munin-update @@STATEDIR@@/* -diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/doc/munin.conf.pod.in ---- munin-2.0.25.orig/master/doc/munin.conf.pod.in 2015-09-08 10:12:45.000000000 +0000 -+++ munin-2.0.25/master/doc/munin.conf.pod.in 2015-09-08 10:13:31.736593251 +0000 +diff -urNpa munin-2.0.42.orig/master/doc/munin.conf.pod.in munin-2.0.42/master/doc/munin.conf.pod.in +--- munin-2.0.42.orig/master/doc/munin.conf.pod.in 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/doc/munin.conf.pod.in 2018-10-11 15:25:02.396033000 +0000 @@ -27,7 +27,7 @@ something like: [machine1.your.dom] address localhost @@ -243,7 +277,7 @@ diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/do If your placement deviates from this norm, use the "--config EfileE"-option when running the munin-* programs. -@@ -149,20 +149,20 @@ is C. Affects: munin-update. +@@ -162,20 +162,20 @@ is C. Affects: munin-update. =item B This directive sets the location of the private key to be used for @@ -267,9 +301,9 @@ diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/do =item B -diff -urNp munin-2.0.25.orig/master/doc/munin-cron.pod.in munin-2.0.25/master/doc/munin-cron.pod.in ---- munin-2.0.25.orig/master/doc/munin-cron.pod.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/doc/munin-cron.pod.in 2015-09-08 10:13:31.736593251 +0000 +diff -urNpa munin-2.0.42.orig/master/doc/munin-cron.pod.in munin-2.0.42/master/doc/munin-cron.pod.in +--- munin-2.0.42.orig/master/doc/munin-cron.pod.in 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/doc/munin-cron.pod.in 2018-10-11 15:25:02.396033000 +0000 @@ -22,7 +22,7 @@ Limit hosts to EhostE. Multiple =item B<< --config >> @@ -279,9 +313,9 @@ diff -urNp munin-2.0.25.orig/master/doc/munin-cron.pod.in munin-2.0.25/master/do =back -diff -urNp munin-2.0.25.orig/master/extras/munin-update_old.in munin-2.0.25/master/extras/munin-update_old.in ---- munin-2.0.25.orig/master/extras/munin-update_old.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/extras/munin-update_old.in 2015-09-08 10:13:31.736593251 +0000 +diff -urNpa munin-2.0.42.orig/master/extras/munin-update_old.in munin-2.0.42/master/extras/munin-update_old.in +--- munin-2.0.42.orig/master/extras/munin-update_old.in 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/extras/munin-update_old.in 2018-10-11 15:25:02.396033000 +0000 @@ -43,7 +43,7 @@ my $DEBUG=0; my $STATS; my $cli_do_fork; @@ -333,9 +367,9 @@ diff -urNp munin-2.0.25.orig/master/extras/munin-update_old.in munin-2.0.25/mast @@DBDIR@@/* @@LOGDIR@@/munin-update @@STATEDIR@@/* -diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Config.pm munin-2.0.25/master/lib/Munin/Master/Config.pm ---- munin-2.0.25.orig/master/lib/Munin/Master/Config.pm 2015-09-08 10:12:45.000000000 +0000 -+++ munin-2.0.25/master/lib/Munin/Master/Config.pm 2015-09-08 10:13:31.737593251 +0000 +diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Config.pm munin-2.0.42/master/lib/Munin/Master/Config.pm +--- munin-2.0.42.orig/master/lib/Munin/Master/Config.pm 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/lib/Munin/Master/Config.pm 2018-10-11 15:25:02.397033000 +0000 @@ -140,7 +140,7 @@ my %booleans = map {$_ => 1} qw( root_instance => 1, @@ -358,10 +392,10 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Config.pm munin-2.0.25/mast tls_verify_certificate => 0, tls_verify_depth => 5, tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR", -diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.25/master/lib/Munin/Master/GraphOld.pm ---- munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/lib/Munin/Master/GraphOld.pm 2015-09-08 10:13:31.738593251 +0000 -@@ -92,7 +92,7 @@ my $skip_locking = 0; +diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.42/master/lib/Munin/Master/GraphOld.pm +--- munin-2.0.42.orig/master/lib/Munin/Master/GraphOld.pm 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/lib/Munin/Master/GraphOld.pm 2018-10-11 15:25:02.397033000 +0000 +@@ -97,7 +97,7 @@ my $skip_locking = 0; my $skip_stats = 0; my $stdout = 0; my $force_run_as_root = 0; @@ -370,9 +404,9 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.25/ma my $libdir = $Munin::Common::Defaults::MUNIN_LIBDIR; # Note: Nothing by default is more convenient and elliminates code while # for cgi graphing - but it breaks how munin-graph expected stuff to work. -diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.25/master/lib/Munin/Master/HTMLOld.pm ---- munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/lib/Munin/Master/HTMLOld.pm 2015-09-08 10:13:31.738593251 +0000 +diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.42/master/lib/Munin/Master/HTMLOld.pm +--- munin-2.0.42.orig/master/lib/Munin/Master/HTMLOld.pm 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/lib/Munin/Master/HTMLOld.pm 2018-10-11 15:25:02.397033000 +0000 @@ -83,7 +83,7 @@ use Log::Log4perl qw( :easy ); my @times = ("day", "week", "month", "year"); @@ -409,9 +443,9 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.25/mas @@DBDIR@@/datafile @@LOGDIR@@/munin-html @@HTMLDIR@@/* -diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm ---- munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm 2015-09-08 10:13:31.739593251 +0000 +diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.42/master/lib/Munin/Master/LimitsOld.pm +--- munin-2.0.42.orig/master/lib/Munin/Master/LimitsOld.pm 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/lib/Munin/Master/LimitsOld.pm 2018-10-11 15:25:02.397033000 +0000 @@ -52,7 +52,7 @@ use Munin::Master::Utils; use Munin::Common::Defaults; @@ -421,7 +455,7 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.25/m my $do_usage = 0; my $do_version = 0; my @limit_hosts = (); -@@ -230,7 +230,7 @@ Options: +@@ -242,7 +242,7 @@ Options: --contact Limit notified contacts to . Multiple --contact options may be supplied. --config Use as configuration file. @@ -430,10 +464,10 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.25/m "; exit 0; -diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm munin-2.0.25/master/lib/Munin/Master/Utils.pm ---- munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm 2015-09-08 10:12:45.000000000 +0000 -+++ munin-2.0.25/master/lib/Munin/Master/Utils.pm 2015-09-08 10:13:31.740593251 +0000 -@@ -115,7 +115,7 @@ my $config_parts = { +diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm munin-2.0.42/master/lib/Munin/Master/Utils.pm +--- munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/lib/Munin/Master/Utils.pm 2018-10-11 15:25:02.397033000 +0000 +@@ -114,7 +114,7 @@ my $config_parts = { }, }; @@ -442,9 +476,9 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm munin-2.0.25/maste # Fields to copy when "aliasing" a field my @COPY_FIELDS = ("label", "draw", "type", "rrdfile", "fieldname", "info"); -diff -urNp munin-2.0.25.orig/master/munin.conf.in munin-2.0.25/master/munin.conf.in ---- munin-2.0.25.orig/master/munin.conf.in 2015-09-08 10:12:45.000000000 +0000 -+++ munin-2.0.25/master/munin.conf.in 2015-09-08 10:13:31.740593251 +0000 +diff -urNpa munin-2.0.42.orig/master/munin.conf.in munin-2.0.42/master/munin.conf.in +--- munin-2.0.42.orig/master/munin.conf.in 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/master/munin.conf.in 2018-10-11 15:25:02.397033000 +0000 @@ -24,7 +24,7 @@ # cgitmpdir @@DBDIR@@/cgi-tmp @@ -454,9 +488,9 @@ diff -urNp munin-2.0.25.orig/master/munin.conf.in munin-2.0.25/master/munin.conf # You can choose the time reference for "DERIVE" like graphs, and show # "per minute", "per hour" values instead of the default "per second" -diff -urNp munin-2.0.25.orig/master/t/munin_master_config.t munin-2.0.25/master/t/munin_master_config.t ---- munin-2.0.25.orig/master/t/munin_master_config.t 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/t/munin_master_config.t 2015-09-08 10:13:31.741593251 +0000 +diff -urNpa munin-2.0.42.orig/master/t/munin_master_config.t munin-2.0.42/master/t/munin_master_config.t +--- munin-2.0.42.orig/master/t/munin_master_config.t 2018-10-11 15:24:44.285033000 +0000 ++++ munin-2.0.42/master/t/munin_master_config.t 2018-10-11 15:25:02.398033000 +0000 @@ -24,7 +24,7 @@ my $fasit = { }, @@ -466,9 +500,9 @@ diff -urNp munin-2.0.25.orig/master/t/munin_master_config.t munin-2.0.25/master/ dbdir => '/opt/munin/sandbox/var/opt/munin', debug => 0, fork => 1, -diff -urNp munin-2.0.25.orig/master/www/munin-htaccess.in munin-2.0.25/master/www/munin-htaccess.in ---- munin-2.0.25.orig/master/www/munin-htaccess.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/www/munin-htaccess.in 2015-09-08 10:13:31.741593251 +0000 +diff -urNpa munin-2.0.42.orig/master/www/munin-htaccess.in munin-2.0.42/master/www/munin-htaccess.in +--- munin-2.0.42.orig/master/www/munin-htaccess.in 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/master/www/munin-htaccess.in 2018-10-11 15:25:02.398033000 +0000 @@ -9,7 +9,7 @@ # # @@ -478,9 +512,9 @@ diff -urNp munin-2.0.25.orig/master/www/munin-htaccess.in munin-2.0.25/master/ww AuthName "Munin" AuthType Basic require valid-user -diff -urNp munin-2.0.25.orig/node/bin/munindoc munin-2.0.25/node/bin/munindoc ---- munin-2.0.25.orig/node/bin/munindoc 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/node/bin/munindoc 2015-09-08 10:13:31.742593251 +0000 +diff -urNpa munin-2.0.42.orig/node/bin/munindoc munin-2.0.42/node/bin/munindoc +--- munin-2.0.42.orig/node/bin/munindoc 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/node/bin/munindoc 2018-10-11 15:25:02.398033000 +0000 @@ -48,7 +48,7 @@ my $plugin_re = quotemeta($plugin); # Dirs in which to look for $plugin.pod and $plugin files. @@ -490,9 +524,9 @@ diff -urNp munin-2.0.25.orig/node/bin/munindoc munin-2.0.25/node/bin/munindoc "$Munin::Common::Defaults::MUNIN_PERLLIB"); File::Find::find({wanted => \&wanted_pod}, @DIRS); -diff -urNp munin-2.0.25.orig/node/doc/munin-node.conf.pod munin-2.0.25/node/doc/munin-node.conf.pod ---- munin-2.0.25.orig/node/doc/munin-node.conf.pod 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/node/doc/munin-node.conf.pod 2015-09-08 10:13:31.742593251 +0000 +diff -urNpa munin-2.0.42.orig/node/doc/munin-node.conf.pod munin-2.0.42/node/doc/munin-node.conf.pod +--- munin-2.0.42.orig/node/doc/munin-node.conf.pod 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/node/doc/munin-node.conf.pod 2018-10-11 15:25:02.398033000 +0000 @@ -91,20 +91,20 @@ is C. =item B @@ -517,9 +551,9 @@ diff -urNp munin-2.0.25.orig/node/doc/munin-node.conf.pod munin-2.0.25/node/doc/ =item B -diff -urNp munin-2.0.25.orig/node/extras/munin-node-simple.in munin-2.0.25/node/extras/munin-node-simple.in ---- munin-2.0.25.orig/node/extras/munin-node-simple.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/node/extras/munin-node-simple.in 2015-09-08 10:13:31.742593251 +0000 +diff -urNpa munin-2.0.42.orig/node/extras/munin-node-simple.in munin-2.0.42/node/extras/munin-node-simple.in +--- munin-2.0.42.orig/node/extras/munin-node-simple.in 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/node/extras/munin-node-simple.in 2018-10-11 15:25:02.398033000 +0000 @@ -28,8 +28,8 @@ use strict; $| = 1; @@ -531,9 +565,9 @@ diff -urNp munin-2.0.25.orig/node/extras/munin-node-simple.in munin-2.0.25/node/ my $version = "@@VERSION@@"; # Empty environment -diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Config.pm munin-2.0.25/node/lib/Munin/Node/Config.pm ---- munin-2.0.25.orig/node/lib/Munin/Node/Config.pm 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/node/lib/Munin/Node/Config.pm 2015-09-08 10:13:31.743593251 +0000 +diff -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Config.pm munin-2.0.42/node/lib/Munin/Node/Config.pm +--- munin-2.0.42.orig/node/lib/Munin/Node/Config.pm 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/node/lib/Munin/Node/Config.pm 2018-10-11 15:25:02.398033000 +0000 @@ -25,7 +25,7 @@ my %booleans = map {$_ => 1} qw( my ($class) = @_; @@ -543,10 +577,10 @@ diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Config.pm munin-2.0.25/node/lib }, $class; return $instance; -diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Server.pm munin-2.0.25/node/lib/Munin/Node/Server.pm ---- munin-2.0.25.orig/node/lib/Munin/Node/Server.pm 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/node/lib/Munin/Node/Server.pm 2015-09-08 10:13:31.744593251 +0000 -@@ -263,11 +263,11 @@ sub _process_starttls_command { +diff -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Server.pm munin-2.0.42/node/lib/Munin/Node/Server.pm +--- munin-2.0.42.orig/node/lib/Munin/Node/Server.pm 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/node/lib/Munin/Node/Server.pm 2018-10-11 15:25:02.398033000 +0000 +@@ -272,11 +272,11 @@ sub _process_starttls_command { my $mode = $session->{tls_mode}; my $key = $config->{tls_private_key} @@ -561,9 +595,9 @@ diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Server.pm munin-2.0.25/node/lib my $tls_verify = $config->{tls_verify_certificate} || 0; my $tls_match = $config->{tls_match}; -diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Service.pm munin-2.0.25/node/lib/Munin/Node/Service.pm ---- munin-2.0.25.orig/node/lib/Munin/Node/Service.pm 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/node/lib/Munin/Node/Service.pm 2015-09-08 10:13:31.744593251 +0000 +diff -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Service.pm munin-2.0.42/node/lib/Munin/Node/Service.pm +--- munin-2.0.42.orig/node/lib/Munin/Node/Service.pm 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/node/lib/Munin/Node/Service.pm 2018-10-11 15:25:02.398033000 +0000 @@ -22,7 +22,7 @@ sub new my ($class, %args) = @_; @@ -573,9 +607,9 @@ diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Service.pm munin-2.0.25/node/li $args{defuser} ||= getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER; $args{defgroup} ||= getgrnam $Munin::Common::Defaults::MUNIN_GROUP; -diff -urNp munin-2.0.25.orig/node/sbin/munin-node munin-2.0.25/node/sbin/munin-node ---- munin-2.0.25.orig/node/sbin/munin-node 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/node/sbin/munin-node 2015-09-08 10:13:31.745593251 +0000 +diff -urNpa munin-2.0.42.orig/node/sbin/munin-node munin-2.0.42/node/sbin/munin-node +--- munin-2.0.42.orig/node/sbin/munin-node 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/node/sbin/munin-node 2018-10-11 15:25:02.398033000 +0000 @@ -36,8 +36,8 @@ use Munin::Node::Service; use Munin::Node::Server; @@ -609,9 +643,9 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-node munin-2.0.25/node/sbin/munin-n @@STATEDIR@@/munin-node.pid @@LOGDIR@@/munin-node.log -diff -urNp munin-2.0.25.orig/node/sbin/munin-node-configure munin-2.0.25/node/sbin/munin-node-configure ---- munin-2.0.25.orig/node/sbin/munin-node-configure 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/node/sbin/munin-node-configure 2015-09-08 10:13:31.745593251 +0000 +diff -urNpa munin-2.0.42.orig/node/sbin/munin-node-configure munin-2.0.42/node/sbin/munin-node-configure +--- munin-2.0.42.orig/node/sbin/munin-node-configure 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/node/sbin/munin-node-configure 2018-10-11 15:25:02.399033000 +0000 @@ -76,9 +76,9 @@ sub main sub parse_args @@ -625,7 +659,7 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-node-configure munin-2.0.25/node/sb my $libdir = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins"; my $debug = 0; -@@ -492,15 +492,15 @@ may enable debugging. +@@ -487,15 +487,15 @@ may enable debugging. =item B<< --config >> @@ -644,7 +678,7 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-node-configure munin-2.0.25/node/sb =item B<< --libdir >> -@@ -648,9 +648,9 @@ not this works with any particular devic +@@ -649,9 +649,9 @@ not this works with any particular devic =head1 FILES @@ -657,9 +691,9 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-node-configure munin-2.0.25/node/sb @@LIBDIR@@/plugins/plugins.history @@LIBDIR@@/plugins/* -diff -urNp munin-2.0.25.orig/node/sbin/munin-run munin-2.0.25/node/sbin/munin-run ---- munin-2.0.25.orig/node/sbin/munin-run 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/node/sbin/munin-run 2015-09-08 10:13:31.746593251 +0000 +diff -urNpa munin-2.0.42.orig/node/sbin/munin-run munin-2.0.42/node/sbin/munin-run +--- munin-2.0.42.orig/node/sbin/munin-run 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/node/sbin/munin-run 2018-10-11 15:25:02.399033000 +0000 @@ -35,7 +35,7 @@ use Munin::Node::Service; my $services; @@ -710,9 +744,9 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-run munin-2.0.25/node/sbin/munin-ru @@STATEDIR@@/munin-node.pid @@LOGDIR@@/munin-node.log -diff -urNp munin-2.0.25.orig/node/sbin/munin-sched munin-2.0.25/node/sbin/munin-sched ---- munin-2.0.25.orig/node/sbin/munin-sched 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/node/sbin/munin-sched 2015-09-08 10:13:31.747593251 +0000 +diff -urNpa munin-2.0.42.orig/node/sbin/munin-sched munin-2.0.42/node/sbin/munin-sched +--- munin-2.0.42.orig/node/sbin/munin-sched 2018-10-11 15:24:44.286033000 +0000 ++++ munin-2.0.42/node/sbin/munin-sched 2018-10-11 15:25:02.399033000 +0000 @@ -34,8 +34,8 @@ use Munin::Node::Config; use Munin::Node::ProxySpooler; @@ -746,10 +780,10 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-sched munin-2.0.25/node/sbin/munin- @@STATEDIR@@/munin-sched.pid @@LOGDIR@@/munin-sched.log -diff -urNp munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in munin-2.0.25/plugins/node.d/exim_mailqueue.in ---- munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d/exim_mailqueue.in 2015-09-08 10:13:31.747593251 +0000 -@@ -15,7 +15,7 @@ examine the queue directories. This is +diff -urNpa munin-2.0.42.orig/plugins/node.d/exim_mailqueue.in munin-2.0.42/plugins/node.d/exim_mailqueue.in +--- munin-2.0.42.orig/plugins/node.d/exim_mailqueue.in 2018-10-11 15:24:44.280033000 +0000 ++++ munin-2.0.42/plugins/node.d/exim_mailqueue.in 2018-10-11 15:25:02.399033000 +0000 +@@ -17,7 +17,7 @@ examine the queue directories. This is [exim_*] user exim @@ -758,9 +792,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in munin-2.0.25/plugi if you need to override the defaults below: [exim_mailqueue] -diff -urNp munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.25/plugins/node.d/ipmi_sensor_.in ---- munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d/ipmi_sensor_.in 2015-09-08 10:13:31.747593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.42/plugins/node.d/ipmi_sensor_.in +--- munin-2.0.42.orig/plugins/node.d/ipmi_sensor_.in 2018-10-11 15:24:44.280033000 +0000 ++++ munin-2.0.42/plugins/node.d/ipmi_sensor_.in 2018-10-11 15:25:02.399033000 +0000 @@ -17,7 +17,7 @@ Inspired by code written by Peter Palfra ipmitool probably needs to be run as root, and it may take more than 10 seconds on some hosts. @@ -787,10 +821,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.25/plugins +CONFIG = '@@NCONFDIR@@/ipmi' - -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 2015-09-08 10:05:48.000000000 +0000 -+++ munin-2.0.25/plugins/node.d/mysql_innodb.in 2015-09-08 10:13:31.748593251 +0000 + def normalize_sensor(name): +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:24:44.282033000 +0000 ++++ munin-2.0.42/plugins/node.d/mysql_innodb.in 2018-10-11 15:25:02.399033000 +0000 @@ -34,7 +34,7 @@ the default INNODB tablespace, do the fo =head1 CONFIGURATION @@ -800,9 +834,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_innodb.in munin-2.0.25/plugins if you need to override the defaults below: [mysql_innodb] -diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.25/plugins/node.d/mysql_isam_space_.in ---- munin-2.0.25.orig/plugins/node.d/mysql_isam_space_.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d/mysql_isam_space_.in 2015-09-08 10:13:31.748593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.42/plugins/node.d/mysql_isam_space_.in +--- munin-2.0.42.orig/plugins/node.d/mysql_isam_space_.in 2018-10-11 15:24:44.280033000 +0000 ++++ munin-2.0.42/plugins/node.d/mysql_isam_space_.in 2018-10-11 15:25:02.399033000 +0000 @@ -8,7 +8,7 @@ on isam and myisam tables on a mysql ser =head1 CONFIGURATION @@ -812,9 +846,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.25/pl if you need to override the defaults below: [mysql_isam_space_*] -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 2015-09-08 10:05:48.000000000 +0000 -+++ munin-2.0.25/plugins/node.d/mysql_threads.in 2015-09-08 10:13:31.748593251 +0000 +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:24:44.280033000 +0000 ++++ munin-2.0.42/plugins/node.d/mysql_threads.in 2018-10-11 15:25:02.399033000 +0000 @@ -9,7 +9,7 @@ mysql_threads - Plugin to monitor the nu =head1 CONFIGURATION @@ -824,9 +858,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_threads.in munin-2.0.25/plugin need to override the defaults below: [mysql_threads] -diff -urNp munin-2.0.25.orig/plugins/node.d/named.in munin-2.0.25/plugins/node.d/named.in ---- munin-2.0.25.orig/plugins/node.d/named.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d/named.in 2015-09-08 10:13:31.749593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d/named.in munin-2.0.42/plugins/node.d/named.in +--- munin-2.0.42.orig/plugins/node.d/named.in 2018-10-11 15:24:44.280033000 +0000 ++++ munin-2.0.42/plugins/node.d/named.in 2018-10-11 15:25:02.399033000 +0000 @@ -34,7 +34,7 @@ restrictions on the log file. =head1 CONFIGURATION @@ -836,9 +870,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/named.in munin-2.0.25/plugins/node.d if you need to override the defaults below: [named] -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 2015-09-08 10:05:48.000000000 +0000 -+++ munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in 2015-09-08 10:13:31.749593251 +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:24:44.282033000 +0000 ++++ munin-2.0.42/plugins/node.d/ntp_kernel_pll_freq.in 2018-10-11 16:30:23.898033000 +0000 @@ -12,7 +12,7 @@ the NTP status No configuration @@ -852,16 +886,16 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.25/ exit 0 fi --if [ -f @@CONFDIR@@/ntp-freq-comp ]; then -- fcomp=`cat @@CONFDIR@@/ntp-freq-comp` -+if [ -f @@NCONFDIR@@/ntp-freq-comp ]; then -+ fcomp=`cat @@NCONFDIR@@/ntp-freq-comp` +-if [ -f "@@CONFDIR@@/ntp-freq-comp" ]; then +- fcomp=$(cat "@@CONFDIR@@/ntp-freq-comp") ++if [ -f "@@NCONFDIR@@/ntp-freq-comp" ]; then ++ fcomp=$(cat "@@NCONFDIR@@/ntp-freq-comp") else fcomp=0 fi -diff -urNp munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in munin-2.0.25/plugins/node.d/postfix_mailstats.in ---- munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d/postfix_mailstats.in 2015-09-08 10:13:31.749593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d/postfix_mailstats.in munin-2.0.42/plugins/node.d/postfix_mailstats.in +--- munin-2.0.42.orig/plugins/node.d/postfix_mailstats.in 2018-10-11 15:24:44.281033000 +0000 ++++ munin-2.0.42/plugins/node.d/postfix_mailstats.in 2018-10-11 15:25:02.400033000 +0000 @@ -8,7 +8,7 @@ rejected by postfix =head1 CONFIGURATION @@ -871,9 +905,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in munin-2.0.25/pl if you need to override the defaults below: [postfix_mailstats] -diff -urNp munin-2.0.25.orig/plugins/node.d/psu_.in munin-2.0.25/plugins/node.d/psu_.in ---- munin-2.0.25.orig/plugins/node.d/psu_.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d/psu_.in 2015-09-08 10:13:31.750593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d/psu_.in munin-2.0.42/plugins/node.d/psu_.in +--- munin-2.0.42.orig/plugins/node.d/psu_.in 2018-10-11 15:24:44.281033000 +0000 ++++ munin-2.0.42/plugins/node.d/psu_.in 2018-10-11 15:25:02.400033000 +0000 @@ -15,7 +15,7 @@ we wish to graph. Example: @@ -883,9 +917,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/psu_.in munin-2.0.25/plugins/node.d/ ...will monitor the user "foo" -diff -urNp munin-2.0.25.orig/plugins/node.d/squeezebox_.in munin-2.0.25/plugins/node.d/squeezebox_.in ---- munin-2.0.25.orig/plugins/node.d/squeezebox_.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d/squeezebox_.in 2015-09-08 10:13:31.750593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d/squeezebox_.in munin-2.0.42/plugins/node.d/squeezebox_.in +--- munin-2.0.42.orig/plugins/node.d/squeezebox_.in 2018-10-11 15:24:44.282033000 +0000 ++++ munin-2.0.42/plugins/node.d/squeezebox_.in 2018-10-11 15:25:02.400033000 +0000 @@ -20,7 +20,7 @@ SqueezeCenter. If the plugin is run from non-default configuration, please use the environment variables 'squeezebox_host' and 'squeezebox_port' to connect. Also, if your @@ -895,9 +929,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/squeezebox_.in munin-2.0.25/plugins/ Sample follows: -diff -urNp munin-2.0.25.orig/plugins/node.d/varnish_.in munin-2.0.25/plugins/node.d/varnish_.in ---- munin-2.0.25.orig/plugins/node.d/varnish_.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d/varnish_.in 2015-09-08 10:13:31.750593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d/varnish_.in munin-2.0.42/plugins/node.d/varnish_.in +--- munin-2.0.42.orig/plugins/node.d/varnish_.in 2018-10-11 15:24:44.282033000 +0000 ++++ munin-2.0.42/plugins/node.d/varnish_.in 2018-10-11 15:25:02.400033000 +0000 @@ -54,7 +54,7 @@ session, session_herd You can link them yourself with something like this: @@ -907,9 +941,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/varnish_.in munin-2.0.25/plugins/nod =head1 INTERPRETATION -diff -urNp munin-2.0.25.orig/plugins/node.d.cygwin/df.in munin-2.0.25/plugins/node.d.cygwin/df.in ---- munin-2.0.25.orig/plugins/node.d.cygwin/df.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.cygwin/df.in 2015-09-08 10:13:31.751593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d.cygwin/df.in munin-2.0.42/plugins/node.d.cygwin/df.in +--- munin-2.0.42.orig/plugins/node.d.cygwin/df.in 2018-10-11 15:24:44.277033000 +0000 ++++ munin-2.0.42/plugins/node.d.cygwin/df.in 2018-10-11 15:25:02.400033000 +0000 @@ -13,7 +13,7 @@ Cygwin 1.7.x or higher systems with core =head1 USAGE @@ -919,9 +953,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.cygwin/df.in munin-2.0.25/plugins/no The plugin excludes per default the following special, read-only or dynamically allocating file systems from graphing: -diff -urNp munin-2.0.25.orig/plugins/node.d.debug/if.in munin-2.0.25/plugins/node.d.debug/if.in ---- munin-2.0.25.orig/plugins/node.d.debug/if.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.debug/if.in 2015-09-08 10:13:31.751593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d.debug/if.in munin-2.0.42/plugins/node.d.debug/if.in +--- munin-2.0.42.orig/plugins/node.d.debug/if.in 2018-10-11 15:24:44.277033000 +0000 ++++ munin-2.0.42/plugins/node.d.debug/if.in 2018-10-11 15:25:02.400033000 +0000 @@ -21,7 +21,7 @@ variable. For example: =head1 USAGE @@ -931,9 +965,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.debug/if.in munin-2.0.25/plugins/nod =head1 MAGIC MARKERS -diff -urNp munin-2.0.25.orig/plugins/node.d.debug/tc.in munin-2.0.25/plugins/node.d.debug/tc.in ---- munin-2.0.25.orig/plugins/node.d.debug/tc.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.debug/tc.in 2015-09-08 10:13:31.751593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d.debug/tc.in munin-2.0.42/plugins/node.d.debug/tc.in +--- munin-2.0.42.orig/plugins/node.d.debug/tc.in 2018-10-11 15:24:44.277033000 +0000 ++++ munin-2.0.42/plugins/node.d.debug/tc.in 2018-10-11 15:25:02.400033000 +0000 @@ -21,7 +21,7 @@ For example: =head1 USAGE @@ -943,10 +977,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.debug/tc.in munin-2.0.25/plugins/nod =head1 MAGIC MARKERS -diff -urNp munin-2.0.25.orig/plugins/node.d.linux/acpi.in munin-2.0.25/plugins/node.d.linux/acpi.in ---- munin-2.0.25.orig/plugins/node.d.linux/acpi.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.linux/acpi.in 2015-09-08 10:13:31.751593251 +0000 -@@ -17,7 +17,7 @@ Load the 'thermal_zone' kernel module an +diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/acpi.in munin-2.0.42/plugins/node.d.linux/acpi.in +--- munin-2.0.42.orig/plugins/node.d.linux/acpi.in 2018-10-11 15:24:44.278033000 +0000 ++++ munin-2.0.42/plugins/node.d.linux/acpi.in 2018-10-11 15:25:02.401033000 +0000 +@@ -17,7 +17,7 @@ Load the 'thermal' kernel module and the =head1 USAGE @@ -955,9 +989,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/acpi.in munin-2.0.25/plugins/n =head1 INTERPRETATION -diff -urNp munin-2.0.25.orig/plugins/node.d.linux/apt.in munin-2.0.25/plugins/node.d.linux/apt.in ---- munin-2.0.25.orig/plugins/node.d.linux/apt.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.linux/apt.in 2015-09-08 10:13:31.752593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/apt.in munin-2.0.42/plugins/node.d.linux/apt.in +--- munin-2.0.42.orig/plugins/node.d.linux/apt.in 2018-10-11 15:24:44.278033000 +0000 ++++ munin-2.0.42/plugins/node.d.linux/apt.in 2018-10-11 15:25:02.401033000 +0000 @@ -38,7 +38,7 @@ Remember to randomize when these cronjob =head1 USAGE @@ -967,10 +1001,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/apt.in munin-2.0.25/plugins/no =head1 NOTES -diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df.in munin-2.0.25/plugins/node.d.linux/df.in ---- munin-2.0.25.orig/plugins/node.d.linux/df.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.linux/df.in 2015-09-08 10:13:31.752593251 +0000 -@@ -28,7 +28,7 @@ This configuration snipplet is an exampl +diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/df.in munin-2.0.42/plugins/node.d.linux/df.in +--- munin-2.0.42.orig/plugins/node.d.linux/df.in 2018-10-11 15:24:44.278033000 +0000 ++++ munin-2.0.42/plugins/node.d.linux/df.in 2018-10-11 15:25:02.401033000 +0000 +@@ -31,7 +31,7 @@ This configuration snipplet is an exampl env.warning 92 env.critical 98 @@ -979,7 +1013,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df.in munin-2.0.25/plugins/nod You may specify filesystem specific warning and critical levels: -@@ -55,7 +55,7 @@ RE will not be included. +@@ -58,7 +58,7 @@ RE will not be included. =head1 USAGE @@ -988,9 +1022,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df.in munin-2.0.25/plugins/nod =head1 MAGIC MARKERS -diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df_inode.in munin-2.0.25/plugins/node.d.linux/df_inode.in ---- munin-2.0.25.orig/plugins/node.d.linux/df_inode.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.linux/df_inode.in 2015-09-08 10:13:31.752593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/df_inode.in munin-2.0.42/plugins/node.d.linux/df_inode.in +--- munin-2.0.42.orig/plugins/node.d.linux/df_inode.in 2018-10-11 15:24:44.278033000 +0000 ++++ munin-2.0.42/plugins/node.d.linux/df_inode.in 2018-10-11 15:25:02.401033000 +0000 @@ -28,7 +28,7 @@ This configuration snipplet is an exampl env.warning 92 env.critical 98 @@ -1009,9 +1043,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df_inode.in munin-2.0.25/plugi =head1 MAGIC MARKERS -diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.25/plugins/node.d.linux/fw_conntrack.in ---- munin-2.0.25.orig/plugins/node.d.linux/fw_conntrack.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.linux/fw_conntrack.in 2015-09-08 10:13:31.753593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.42/plugins/node.d.linux/fw_conntrack.in +--- munin-2.0.42.orig/plugins/node.d.linux/fw_conntrack.in 2018-10-11 15:24:44.278033000 +0000 ++++ munin-2.0.42/plugins/node.d.linux/fw_conntrack.in 2018-10-11 15:25:02.401033000 +0000 @@ -11,7 +11,7 @@ This plugin must run with root privilege =head2 CONFIGURATION EXAMPLE @@ -1021,9 +1055,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.25/p [fw_*] user root -diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.25/plugins/node.d.linux/fw_forwarded_local.in ---- munin-2.0.25.orig/plugins/node.d.linux/fw_forwarded_local.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.linux/fw_forwarded_local.in 2015-09-08 10:13:31.753593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.42/plugins/node.d.linux/fw_forwarded_local.in +--- munin-2.0.42.orig/plugins/node.d.linux/fw_forwarded_local.in 2018-10-11 15:24:44.278033000 +0000 ++++ munin-2.0.42/plugins/node.d.linux/fw_forwarded_local.in 2018-10-11 15:25:02.401033000 +0000 @@ -10,7 +10,7 @@ This plugin must run with root privilege =head2 CONFIGURATION EXAMPLE @@ -1033,10 +1067,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2. [fw_*] user root -diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_packets.in munin-2.0.25/plugins/node.d.linux/fw_packets.in ---- munin-2.0.25.orig/plugins/node.d.linux/fw_packets.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.linux/fw_packets.in 2015-09-08 10:13:31.754593251 +0000 -@@ -11,7 +11,7 @@ This plugin must run with root privilege +diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_packets.in munin-2.0.42/plugins/node.d.linux/fw_packets.in +--- munin-2.0.42.orig/plugins/node.d.linux/fw_packets.in 2018-10-11 15:24:44.278033000 +0000 ++++ munin-2.0.42/plugins/node.d.linux/fw_packets.in 2018-10-11 15:25:02.401033000 +0000 +@@ -14,7 +14,7 @@ This plugin must run with root privilege =head1 CONFIGURATION EXAMPLE @@ -1045,9 +1079,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_packets.in munin-2.0.25/plu [fw*] user root -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 2015-09-08 10:05:55.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.linux/iostat.in 2015-09-08 10:13:31.754593251 +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:24:44.279033000 +0000 ++++ munin-2.0.42/plugins/node.d.linux/iostat.in 2018-10-11 15:25:02.401033000 +0000 @@ -24,7 +24,7 @@ guest OS/dom-U IO-traffic originates in. =head1 USAGE @@ -1057,9 +1091,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat.in munin-2.0.25/plugins =head1 INTERPRETATION -diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.25/plugins/node.d.linux/iostat_ios.in ---- munin-2.0.25.orig/plugins/node.d.linux/iostat_ios.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.linux/iostat_ios.in 2015-09-08 10:13:31.754593251 +0000 +diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.42/plugins/node.d.linux/iostat_ios.in +--- munin-2.0.42.orig/plugins/node.d.linux/iostat_ios.in 2018-10-11 15:24:44.278033000 +0000 ++++ munin-2.0.42/plugins/node.d.linux/iostat_ios.in 2018-10-11 15:25:02.401033000 +0000 @@ -15,7 +15,7 @@ None needed =head1 USAGE @@ -1069,10 +1103,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.25/plu =head1 INTERPRETATION -diff -urNp munin-2.0.25.orig/plugins/node.d.linux/irqstats.in munin-2.0.25/plugins/node.d.linux/irqstats.in ---- munin-2.0.25.orig/plugins/node.d.linux/irqstats.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/plugins/node.d.linux/irqstats.in 2015-09-08 10:13:31.754593251 +0000 -@@ -15,7 +15,7 @@ None needed +diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/irqstats.in munin-2.0.42/plugins/node.d.linux/irqstats.in +--- munin-2.0.42.orig/plugins/node.d.linux/irqstats.in 2018-10-11 15:24:44.278033000 +0000 ++++ munin-2.0.42/plugins/node.d.linux/irqstats.in 2018-10-11 15:25:02.401033000 +0000 +@@ -18,7 +18,7 @@ None needed =head1 USAGE @@ -1081,9 +1115,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/irqstats.in munin-2.0.25/plugi =head1 INTERPRETATION -diff -urNp munin-2.0.25.orig/resources/hpux-init.d_munin-node.in munin-2.0.25/resources/hpux-init.d_munin-node.in ---- munin-2.0.25.orig/resources/hpux-init.d_munin-node.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/resources/hpux-init.d_munin-node.in 2015-09-08 10:13:31.755593251 +0000 +diff -urNpa munin-2.0.42.orig/resources/hpux-init.d_munin-node.in munin-2.0.42/resources/hpux-init.d_munin-node.in +--- munin-2.0.42.orig/resources/hpux-init.d_munin-node.in 2018-10-11 15:24:44.287033000 +0000 ++++ munin-2.0.42/resources/hpux-init.d_munin-node.in 2018-10-11 15:25:02.402033000 +0000 @@ -6,7 +6,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin NAME=munin-node @@ -1093,9 +1127,9 @@ diff -urNp munin-2.0.25.orig/resources/hpux-init.d_munin-node.in munin-2.0.25/re RUN_AS=$(awk '$1~/user/{print$2}' $CONFFILE) PIDFILE=$(awk '$1~/pid/{print$2}' $CONFFILE) MYCONF=/etc/rc.config.d/muninconf -diff -urNp munin-2.0.25.orig/resources/linux-cron.d_munin-node.in munin-2.0.25/resources/linux-cron.d_munin-node.in ---- munin-2.0.25.orig/resources/linux-cron.d_munin-node.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/resources/linux-cron.d_munin-node.in 2015-09-08 10:13:31.755593251 +0000 +diff -urNpa munin-2.0.42.orig/resources/linux-cron.d_munin-node.in munin-2.0.42/resources/linux-cron.d_munin-node.in +--- munin-2.0.42.orig/resources/linux-cron.d_munin-node.in 2018-10-11 15:24:44.287033000 +0000 ++++ munin-2.0.42/resources/linux-cron.d_munin-node.in 2018-10-11 15:25:02.402033000 +0000 @@ -8,5 +8,5 @@ MAILTO=root # an hour (12 invokations an hour, 1 in 12 chance that the update will # happen), but ensure that there will never be more than two hour (7200 @@ -1103,9 +1137,9 @@ diff -urNp munin-2.0.25.orig/resources/linux-cron.d_munin-node.in munin-2.0.25/r -*/5 * * * * root [ -x @@CONFDIR@@/plugins/apt ] && @@CONFDIR@@/plugins/apt update 7200 12 >/dev/null +*/5 * * * * root [ -x @@NCONFDIR@@/plugins/apt ] && @@NCONFDIR@@/plugins/apt update 7200 12 >/dev/null -diff -urNp munin-2.0.25.orig/t/Makefile.config munin-2.0.25/t/Makefile.config ---- munin-2.0.25.orig/t/Makefile.config 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/t/Makefile.config 2015-09-08 10:13:31.755593251 +0000 +diff -urNpa munin-2.0.42.orig/t/Makefile.config munin-2.0.42/t/Makefile.config +--- munin-2.0.42.orig/t/Makefile.config 2018-10-11 15:24:44.287033000 +0000 ++++ munin-2.0.42/t/Makefile.config 2018-10-11 15:25:02.402033000 +0000 @@ -9,7 +9,8 @@ PREFIX = $(PWD)/t/install diff --git a/munin-templatedir.patch b/munin-templatedir.patch index 905fd6d..d0aa37b 100644 --- a/munin-templatedir.patch +++ b/munin-templatedir.patch @@ -1,6 +1,6 @@ -diff -urNp munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.25/common/lib/Munin/Common/Defaults.pm ---- munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/common/lib/Munin/Common/Defaults.pm 2015-09-08 10:12:45.556593251 +0000 +diff -urNpa munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.42/common/lib/Munin/Common/Defaults.pm +--- munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:23:51.538033000 +0000 ++++ munin-2.0.42/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:24:16.385033000 +0000 @@ -32,6 +32,7 @@ our $MUNIN_SPOOLDIR = ''; our $MUNIN_MANDIR = ''; our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/"; @@ -9,9 +9,9 @@ diff -urNp munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.25/co our $MUNIN_USER = getpwuid $UID; our $MUNIN_GROUP = getgrgid $GID; our $MUNIN_PLUGINUSER = getpwuid $UID; -diff -urNp munin-2.0.25.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.25/contrib/munin-every-services-all-boxes-build-html.in ---- munin-2.0.25.orig/contrib/munin-every-services-all-boxes-build-html.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/contrib/munin-every-services-all-boxes-build-html.in 2015-09-08 10:12:45.898593251 +0000 +diff -urNpa munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in +--- munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.in 2018-10-11 15:23:51.545033000 +0000 ++++ munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in 2018-10-11 15:24:16.386033000 +0000 @@ -23,7 +23,7 @@ optional for find : -mtime -30 ; will ig chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes @@ -21,10 +21,10 @@ diff -urNp munin-2.0.25.orig/contrib/munin-every-services-all-boxes-build-html.i
every services on all boxes -diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile ---- munin-2.0.25.orig/Makefile 2015-09-08 10:02:24.000000000 +0000 -+++ munin-2.0.25/Makefile 2015-09-08 10:12:45.899593251 +0000 -@@ -75,9 +75,9 @@ install-pre: Makefile Makefile.config +diff -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile +--- munin-2.0.42.orig/Makefile 2018-10-11 15:23:51.545033000 +0000 ++++ munin-2.0.42/Makefile 2018-10-11 15:24:16.386033000 +0000 +@@ -100,9 +100,9 @@ install-pre: Makefile Makefile.config $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) install-master-prime: $(INFILES_MASTER) install-pre install-master @@ -37,7 +37,7 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile mkdir -p $(CONFDIR)/munin-conf.d mkdir -p $(LIBDIR) mkdir -p $(BINDIR) -@@ -96,15 +96,15 @@ install-master-prime: $(INFILES_MASTER) +@@ -121,15 +121,15 @@ install-master-prime: $(INFILES_MASTER) $(CHMOD) 0755 $(DBDIR)/cgi-tmp for p in master/www/*.tmpl ; do \ @@ -56,27 +56,9 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile done $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/ -@@ -249,6 +249,7 @@ build/%: %.in - -e 's|@@GOODSH@@|$(GOODSH)|g' \ - -e 's|@@BASH@@|$(BASH)|g' \ - -e 's|@@HASSETR@@|$(HASSETR)|g' \ -+ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \ - $< > $@; - - -@@ -326,7 +327,8 @@ common/blib/lib/Munin/Common/Defaults.pm - s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \ - s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \ - s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \ -- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \ -+ s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \ -+ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\ - $< > $@ - - build-doc: build-doc-stamp Makefile Makefile.config -diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config ---- munin-2.0.25.orig/Makefile.config 2015-09-08 10:02:24.000000000 +0000 -+++ munin-2.0.25/Makefile.config 2015-09-08 10:12:45.899593251 +0000 +diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config +--- munin-2.0.42.orig/Makefile.config 2018-10-11 15:23:51.545033000 +0000 ++++ munin-2.0.42/Makefile.config 2018-10-11 15:24:16.386033000 +0000 @@ -40,6 +40,7 @@ LIBDIR = $(PREFIX)/share/munin # Server only - Output directory HTMLDIR = $(DESTDIR)/var/lib/munin/html @@ -85,9 +67,33 @@ diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config # Where to put internal data for master (RRD, internal files, ...) DBDIR = $(DESTDIR)/var/lib/munin/db -diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/doc/munin.conf.pod.in ---- munin-2.0.25.orig/master/doc/munin.conf.pod.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/doc/munin.conf.pod.in 2015-09-08 10:12:45.899593251 +0000 +diff -urNpa munin-2.0.42.orig/Makefile.rej munin-2.0.42/Makefile.rej +--- munin-2.0.42.orig/Makefile.rej 1970-01-01 00:00:00.000000000 +0000 ++++ munin-2.0.42/Makefile.rej 2018-10-11 15:24:16.386033000 +0000 +@@ -0,0 +1,20 @@ ++--- Makefile 2015-09-08 10:02:24.000000000 +0000 +++++ Makefile 2015-09-08 10:12:45.899593251 +0000 ++@@ -249,6 +249,7 @@ build/%: %.in ++ -e 's|@@GOODSH@@|$(GOODSH)|g' \ ++ -e 's|@@BASH@@|$(BASH)|g' \ ++ -e 's|@@HASSETR@@|$(HASSETR)|g' \ +++ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \ ++ $< > $@; ++ ++ ++@@ -326,7 +327,8 @@ common/blib/lib/Munin/Common/Defaults.pm ++ s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \ ++ s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \ ++ s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \ ++- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \ +++ s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \ +++ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\ ++ $< > $@ ++ ++ build-doc: build-doc-stamp Makefile Makefile.config +diff -urNpa munin-2.0.42.orig/master/doc/munin.conf.pod.in munin-2.0.42/master/doc/munin.conf.pod.in +--- munin-2.0.42.orig/master/doc/munin.conf.pod.in 2018-10-11 15:23:51.547033000 +0000 ++++ munin-2.0.42/master/doc/munin.conf.pod.in 2018-10-11 15:24:16.387033000 +0000 @@ -70,7 +70,7 @@ Directory for HTML pages and graphs. Re Directory for files tracking munin's current running state. Required. @@ -97,9 +103,9 @@ diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/do Directory for templates used to generate HTML pages. Required. -diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Config.pm munin-2.0.25/master/lib/Munin/Master/Config.pm ---- munin-2.0.25.orig/master/lib/Munin/Master/Config.pm 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/lib/Munin/Master/Config.pm 2015-09-08 10:12:45.900593251 +0000 +diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Config.pm munin-2.0.42/master/lib/Munin/Master/Config.pm +--- munin-2.0.42.orig/master/lib/Munin/Master/Config.pm 2018-10-11 15:23:51.547033000 +0000 ++++ munin-2.0.42/master/lib/Munin/Master/Config.pm 2018-10-11 15:24:16.387033000 +0000 @@ -159,8 +159,8 @@ my %booleans = map {$_ => 1} qw( tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem", tls_verify_certificate => 0, @@ -109,12 +115,12 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Config.pm munin-2.0.25/mast + tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR", + staticdir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR/static", cgitmpdir => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp", - }, $class ), - -diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm munin-2.0.25/master/lib/Munin/Master/Utils.pm ---- munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/lib/Munin/Master/Utils.pm 2015-09-08 10:12:45.901593251 +0000 -@@ -1018,8 +1018,8 @@ sub munin_readconfig_base { + ssh_command => "ssh", + ssh_options => "-o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no", +diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm munin-2.0.42/master/lib/Munin/Master/Utils.pm +--- munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm 2018-10-11 15:23:51.547033000 +0000 ++++ munin-2.0.42/master/lib/Munin/Master/Utils.pm 2018-10-11 15:24:16.387033000 +0000 +@@ -1001,8 +1001,8 @@ sub munin_readconfig_base { $config->{'rundir'} ||= $Munin::Common::Defaults::MUNIN_STATEDIR; $config->{'dbdir'} ||= $Munin::Common::Defaults::MUNIN_DBDIR; $config->{'logdir'} ||= $Munin::Common::Defaults::MUNIN_LOGDIR; @@ -125,9 +131,9 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm munin-2.0.25/maste $config->{'htmldir'} ||= $Munin::Common::Defaults::MUNIN_HTMLDIR; $config->{'spooldir'} ||= $Munin::Common::Defaults::MUNIN_SPOOLDIR; $config->{'#%#parent'} = undef; -diff -urNp munin-2.0.25.orig/master/munin.conf.in munin-2.0.25/master/munin.conf.in ---- munin-2.0.25.orig/master/munin.conf.in 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/munin.conf.in 2015-09-08 10:12:45.901593251 +0000 +diff -urNpa munin-2.0.42.orig/master/munin.conf.in munin-2.0.42/master/munin.conf.in +--- munin-2.0.42.orig/master/munin.conf.in 2018-10-11 15:23:51.548033000 +0000 ++++ munin-2.0.42/master/munin.conf.in 2018-10-11 15:24:16.387033000 +0000 @@ -12,11 +12,11 @@ # Where to look for the HTML templates diff --git a/munin-timeout.patch b/munin-timeout.patch index 3df9cf2..c0234f7 100644 --- a/munin-timeout.patch +++ b/munin-timeout.patch @@ -1,6 +1,6 @@ -diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Node.pm munin-2.0.25/master/lib/Munin/Master/Node.pm ---- munin-2.0.25.orig/master/lib/Munin/Master/Node.pm 2014-11-24 21:46:24.000000000 +0000 -+++ munin-2.0.25/master/lib/Munin/Master/Node.pm 2015-09-08 10:14:27.201593251 +0000 +diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Node.pm munin-2.0.42/master/lib/Munin/Master/Node.pm +--- munin-2.0.42.orig/master/lib/Munin/Master/Node.pm 2018-10-11 16:33:01.036033000 +0000 ++++ munin-2.0.42/master/lib/Munin/Master/Node.pm 2018-10-11 16:34:05.467033000 +0000 @@ -37,7 +37,7 @@ sub new { pid => undef, writer => undef, diff --git a/munin.spec b/munin.spec index 4070868..91e9c58 100644 --- a/munin.spec +++ b/munin.spec @@ -5,12 +5,12 @@ Summary: Munin - the Linpro RRD data agent Summary(pl.UTF-8): Munin - agent danych RRD Linpro Name: munin -Version: 2.0.25 -Release: 2 +Version: 2.0.42 +Release: 1 License: GPL Group: Applications/WWW -Source0: http://downloads.sourceforge.net/munin/%{name}-%{version}.tar.gz -# Source0-md5: b418a667ce42665557329a7ac3bd1b93 +Source0: https://github.com/munin-monitoring/munin/archive/%{version}.tar.gz +# Source0-md5: 802394c56aa714a97b8535c8d6388b17 Source1: %{name}-node.init Source2: %{name}.cron Source3: %{name}-apache.conf -- 2.37.3