From c72cd2d7d8b6262fcc9b605332d08d93a9613443 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 14:16:31 +0200 Subject: [PATCH 01/16] add healtcheck --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 515f7e4..e98865d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,5 +47,9 @@ VOLUME /var/cache/munin EXPOSE 80 +# health check +HEALTHCHECK --interval=5m --timeout=3s \ + CMD curl -f http://localhost/munin/ || exit 1 + # launcher CMD ["/usr/local/bin/run"] From 35038ea0a75a1fb01721bb0898f5c2f9d8f73e7a Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 14:41:22 +0200 Subject: [PATCH 02/16] add plugins --- Dockerfile | 3 ++ munin.conf | 2 + munin_stats | 118 ++++++++++++++++++++++++++++++++++++++++++++++++ munin_update | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++ run.sh | 4 -- 5 files changed, 246 insertions(+), 4 deletions(-) create mode 100644 munin_stats create mode 100644 munin_update diff --git a/Dockerfile b/Dockerfile index e98865d..49dc950 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,9 @@ COPY ssmtp.conf /etc/ssmtp/ssmtp.conf COPY revaliases /etc/ssmtp/revaliases COPY munin_mail.conf /etc/munin/munin-conf.d/munin_mail.conf +COPY munin_stats /etc/munin/plugins/munin_stats +COPY munin_update /etc/munin/plugins/munin_update + # copy launcher COPY run.sh /usr/local/bin/run RUN chmod +x /usr/local/bin/run diff --git a/munin.conf b/munin.conf index 83e7199..6475e17 100644 --- a/munin.conf +++ b/munin.conf @@ -1,3 +1,5 @@ includedir /etc/munin/munin-conf.d +munin-server:127.0.0.1 + # remote host diff --git a/munin_stats b/munin_stats new file mode 100644 index 0000000..c03cab0 --- /dev/null +++ b/munin_stats @@ -0,0 +1,118 @@ +#!/usr/bin/perl +# +# Copyright (C) 2006-2009 Rodolphe Quiédeville +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; version 2 dated June, +# 1991. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# +# Magic markers (used by munin-node-configure and some installation scripts): +#%# family=auto +#%# capabilities=autoconf + +use strict; +use warnings; + +use Munin::Plugin; + + +my $missing_module = undef; +$missing_module = "File::ReadBackwards" unless (eval "require File::ReadBackwards"); + +my @logs = qw/update graph html limits/; +my $logdir = ($ENV{'logdir'} || $ENV{'MUNIN_LOGDIR'} || '/var/log/munin'); + +if ($ENV{'fields'}) { + @logs = split(/ +/, $ENV{'fields'}); +} + +sub uses_graph_cron { + my $log_file = $_[0]; + my $bw = File::ReadBackwards->new($log_file) or + die "can't read 'log_file' $!"; + if (defined(my $log_line = $bw->readline)) { + if ($log_line =~ ('.*graphing is cgi, do nothing$')) { + return 0; + } else { + return 1; + } + } else { + return 1; + } +} + + +if ($ARGV[0] and $ARGV[0] eq 'autoconf') { + my $munin_update_location = + "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-update"; + + if (! -e $munin_update_location) { + print "no (munin-update was not found at $munin_update_location)\n"; + } elsif (! -x $munin_update_location) { + print "no ($munin_update_location was found, but is not executable)\n"; + } elsif (defined($missing_module)) { + print "no (missing Perl module: '$missing_module')\n"; + } else { + print "yes\n"; + } + exit 0; +} + +if ($ARGV[0] and $ARGV[0] eq "config") { + print "graph_title Munin processing time\n", + "graph_info This graph shows the run time of the four different processes making up a munin-master run. Munin-master is run from cron every 5 minutes and we want each of the programmes in munin-master to complete before the next instance starts. If munin-update uses too long time to run please see the munin-update graph to determine which host is slowing it down.\n", + "graph_args --base 1000 -l 0\n", + "graph_scale yes\n", + "graph_vlabel seconds\n", + "graph_category munin\n"; + foreach my $log (@logs) { + print "$log.label munin $log\n"; + print "$log.draw AREASTACK\n"; + + next unless $log eq "update" || $log eq "graph"; + + print_thresholds("$log", undef, undef, 240, 285); + } + exit 0; +} + + +if (defined($missing_module)) { + die "Failed to run due to missing Perl module '$missing_module'"; +} + +foreach my $log (@logs) { + my $logfile = "$logdir/munin-$log.log"; + my $time = 'U'; + + if (! -r $logfile) { + print "$log.extinfo Can't open $logfile for reading\n"; + print "$log.value $time\n"; + next; + } + + my $bw = File::ReadBackwards->new("$logdir/munin-$log.log") or + die "can't read 'log_file' $!"; + my $found_previous_finished = 0; + while(defined(my $log_line = $bw->readline) && $found_previous_finished == 0) { + if ($log_line =~ (/(finished|generated) \((\d+\.\d+)\ssec\)$/)) { + $time = $2; + $found_previous_finished = 1; + } + } + + if ($log ne "graph" || uses_graph_cron("$logdir/munin-$log.log")) { + print "$log.value $time\n"; + } +} diff --git a/munin_update b/munin_update new file mode 100644 index 0000000..174d87d --- /dev/null +++ b/munin_update @@ -0,0 +1,123 @@ +#!/bin/sh + +: <<=cut + +=head1 NAME + +munin_update - Munin plugin to graph the time to query about each host from the nodes. + +=head1 APPLICABLE SYSTEMS + +Munin master servers. + +=head1 CONFIGURATION + +Normally needs no configuration. You may configure it with the +following parameter: + + [munin*] + env.UPDATE_STATSFILE .../munin-update.stats + env.MUNIN_UPDATE_LOCACTION .../munin-update + +The first is the statistics file for munin update. + +The exact location of this file is package/site specific, but +munin_update will know where it is unless you have made changes. + +=head1 INTERPRETATION + +The script reads the munin-update "stats" file to determine how long +it takes to query the nodes about each host configured in Munin. + +Munin is run from cron every 5 minutes and before the next run of +munin-update the previous run needs to be done. Each run of +munin-update forks one process pr. host that needs to get data +collected, so all collection runs in parallel. + +Any host that is slow, for example slower than 4 miniutes, causes a +risk that the next run of munin-update must be canceled due to the +lateness of the previous run. In such cases there will be single line +gaps in the "by day" graph. + +Keep your hosts updating quickly and all will be well. + +=head1 MAGIC MARKERS + + #%# family=manual + #%# capabilities=autoconf + +=head1 BUGS + +Munin-update is always run at the same time as this plugin runs - +therefore the stats file may be incompletely written and the plugin +will likely show a incomplete list of hosts. It should be using +munin-update.old-stats, which is not currently even made. + +Munin-update removes the "domain" information on all hosts. If there +are two hosts with the same host name in different domains then one of +them will be disappeared by the munin-update collection process. + +=head1 AUTHOR + +The munin_update plugin has been included in munin for many years (at +least 2004). The most likely author is one of the original munin team. + +Documentation and updating to 2009 for Munin 1.4 by Nicolai Langfeldt. + +(C) 2004-2009 The Munin Team, Redpill Linpro AS + +=head1 LICENSE + +GPLv2 + +=cut + +. "$MUNIN_LIBDIR/plugins/plugin.sh" + + +UPDATE_STATSFILE=${UPDATE_STATSFILE:-$MUNIN_DBDIR/munin-update.stats} +MUNIN_UPDATE_LOCATION=${MUNIN_UPDATE_LOCATION:-$MUNIN_LIBDIR/munin-update} + + +if [ "$1" = "autoconf" ]; then + if [ -e "$MUNIN_UPDATE_LOCATION" ] ; then + echo "yes" + else + echo "no ($MUNIN_UPDATE_LOCATION is not present so this is not a munin-master)" + fi + exit 0 +fi + +if [ "$1" = "config" ]; then + [ -f "$UPDATE_STATSFILE" ] || { + echo 'graph_title Plugin error' + echo "graph_info Plugin cannot read stats file $UPDATE_STATSFILE" + echo 'error.label Error' + echo 'error.critical 1' + exit 0 + } + + echo 'graph_title Munin-update' + echo 'graph_vlabel seconds' + echo 'graph_category munin' + echo 'graph_info This graph shows the time it takes to collect data from each hosts that munin collects data on. Munin-master is run from cron every 5 minutes and we want each of the munin-update runs to complete before the next one starts. If munin-update uses too long time to run on one host run it with --debug to determine which plugin(s) are slow and solve the problem with them if possible.' + sed '/^UD|/!d; s/.*;//; s/|/ /;' < "$UPDATE_STATSFILE" | sort | + while read -r i j; do + name="$(clean_fieldname "$i")" + echo "$name.label $i" + warning=${warning:-240} critical=${critical:-285} print_thresholds "$name" + done + exit 0 +fi + +[ -f "$UPDATE_STATSFILE" ] || { + echo 'error.value 1' + echo "error.extinfo Plugin cannot read stats file $UPDATE_STATSFILE" + exit 0 +} + +sed '/^UD|/!d; s/.*;//; s/|/ /;' < "$UPDATE_STATSFILE" | sort | +while read -r i j; do + name="$(clean_fieldname "$i")" + echo "$name.value $j" +done diff --git a/run.sh b/run.sh index 34aa4d2..1991426 100644 --- a/run.sh +++ b/run.sh @@ -23,10 +23,6 @@ sed -i "s/^\( *address\) 127\.0\.0\.1\$/\1 $THISNODEIP/" /etc/munin/munin.conf THISSERVERNAME=${SERVERNAME:="munin"} sed -i "s/^\[localhost\.localdomain\]/\[$SERVERNAME\]/g" /etc/apache2/sites-available/000-default.conf -if [[ $DISABLELOCALNODE == "yes" ]] ; then - echo "includedir /etc/munin/munin-conf.d" > /etc/munin/munin.conf -fi - # configure mail notification if [[ -n "$MAILCONTACT" && -n "$MAILSERVER" && -n "$MAILPORT" && -n "$MAILUSER" && -n "$MAILPASSWORD" && -n "$MAILDOMAIN" ]] ; then From f97358cf9c43032efaa908d4a582600390c3b2a9 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 14:58:22 +0200 Subject: [PATCH 03/16] add munin-node --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 49dc950..ae0f545 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && \ ssmtp \ mailutils \ curl tzdata \ + munin-node \ autoconf \ && apt-get clean && \ rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* @@ -29,6 +30,8 @@ RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) (chfn -f 'munin' root) && \ (/usr/sbin/a2enmod fcgid) +RUN rm -rf /etc/munin/plugins + COPY 000-default.conf /etc/apache2/sites-available/000-default.conf COPY logrotate-munin /etc/logrotate.d/munin COPY munin.conf /etc/munin/munin.conf From 9f76c6056f7ecb5c28b24c7d6c9b2cc765cbaae1 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 14:59:44 +0200 Subject: [PATCH 04/16] extra run --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ae0f545..815dd82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,8 @@ COPY munin_mail.conf /etc/munin/munin-conf.d/munin_mail.conf COPY munin_stats /etc/munin/plugins/munin_stats COPY munin_update /etc/munin/plugins/munin_update - +RUN chmod +x /etc/munin/plugins/munin_stats +RUN chmod +x /etc/munin/plugins/munin_update # copy launcher COPY run.sh /usr/local/bin/run RUN chmod +x /usr/local/bin/run From 56e529a11e441bad489be98955ae58dd924382ad Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:01:29 +0200 Subject: [PATCH 05/16] localhost --- munin.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/munin.conf b/munin.conf index 6475e17..a4c76df 100644 --- a/munin.conf +++ b/munin.conf @@ -1,5 +1,5 @@ includedir /etc/munin/munin-conf.d -munin-server:127.0.0.1 +munin-server:localhost # remote host From d40b2b520bd20cf7b75cdcad6ebd34b01e738994 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:02:42 +0200 Subject: [PATCH 06/16] perl --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 815dd82..f936ce9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get update && \ libapache2-mod-fcgid \ libcgi-fast-perl \ ssmtp \ + perl \ mailutils \ curl tzdata \ munin-node \ From 5da0fba6e6d5c60caa170e929c5a130883c21cae Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:03:08 +0200 Subject: [PATCH 07/16] run --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f936ce9..e74beaa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,8 +42,7 @@ COPY munin_mail.conf /etc/munin/munin-conf.d/munin_mail.conf COPY munin_stats /etc/munin/plugins/munin_stats COPY munin_update /etc/munin/plugins/munin_update -RUN chmod +x /etc/munin/plugins/munin_stats -RUN chmod +x /etc/munin/plugins/munin_update +RUN chmod +x /etc/munin/plugins/munin_stats ; chmod +x /etc/munin/plugins/munin_update # copy launcher COPY run.sh /usr/local/bin/run RUN chmod +x /usr/local/bin/run From acaaec6e96cd6523c4c8d84ee50b2d5026fbe7f4 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:07:18 +0200 Subject: [PATCH 08/16] run --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e74beaa..b7fe1bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,9 @@ RUN apt-get update && \ && apt-get clean && \ rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* +COPY munin_stats /etc/munin/plugins/munin_stats +COPY munin_update /etc/munin/plugins/munin_update + RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) && \ (sed -i 's/^Alias.*/Alias \/ \/var\/cache\/munin\/www\//g' /etc/apache2/sites-available/000-default.conf) && \ (sed -i 's/Allow from .*/Satisfy Any/g' /etc/apache2/sites-available/000-default.conf) && \ @@ -29,9 +32,10 @@ RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) (mkdir -p /var/run/munin && \ chown -R munin:munin /var/run/munin) && \ (chfn -f 'munin' root) && \ - (/usr/sbin/a2enmod fcgid) - -RUN rm -rf /etc/munin/plugins + (/usr/sbin/a2enmod fcgid) \ + rm -rf /etc/munin/plugins \ + chmod +x /etc/munin/plugins/munin_stats \ + chmod +x /etc/munin/plugins/munin_update COPY 000-default.conf /etc/apache2/sites-available/000-default.conf COPY logrotate-munin /etc/logrotate.d/munin @@ -40,9 +44,6 @@ COPY ssmtp.conf /etc/ssmtp/ssmtp.conf COPY revaliases /etc/ssmtp/revaliases COPY munin_mail.conf /etc/munin/munin-conf.d/munin_mail.conf -COPY munin_stats /etc/munin/plugins/munin_stats -COPY munin_update /etc/munin/plugins/munin_update -RUN chmod +x /etc/munin/plugins/munin_stats ; chmod +x /etc/munin/plugins/munin_update # copy launcher COPY run.sh /usr/local/bin/run RUN chmod +x /usr/local/bin/run From e615fbbb4acc34294d5136adbc16010bd62bce82 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:09:53 +0200 Subject: [PATCH 09/16] conf --- munin.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/munin.conf b/munin.conf index a4c76df..014f553 100644 --- a/munin.conf +++ b/munin.conf @@ -1,5 +1,7 @@ includedir /etc/munin/munin-conf.d -munin-server:localhost +[munin-container] + address localhost + use_node_name yes # remote host From 9827a69090fa3a8543be08327d30d1d72a0fad1d Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:11:02 +0200 Subject: [PATCH 10/16] && --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b7fe1bc..e38bc75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,14 +27,14 @@ COPY munin_update /etc/munin/plugins/munin_update RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) && \ (sed -i 's/^Alias.*/Alias \/ \/var\/cache\/munin\/www\//g' /etc/apache2/sites-available/000-default.conf) && \ - (sed -i 's/Allow from .*/Satisfy Any/g' /etc/apache2/sites-available/000-default.conf) && \ + (sed -i 's/Allow from .*/Satisfy Any/g' /etc/apache2/sites-available/000-default.conf) && \ (sed -i 's/Order allow,deny.*/Allow from all/g' /etc/apache2/sites-available/000-default.conf) && \ (mkdir -p /var/run/munin && \ chown -R munin:munin /var/run/munin) && \ (chfn -f 'munin' root) && \ - (/usr/sbin/a2enmod fcgid) \ - rm -rf /etc/munin/plugins \ - chmod +x /etc/munin/plugins/munin_stats \ + (/usr/sbin/a2enmod fcgid) && \ + rm -rf /etc/munin/plugins && \ + chmod +x /etc/munin/plugins/munin_stats && \ chmod +x /etc/munin/plugins/munin_update COPY 000-default.conf /etc/apache2/sites-available/000-default.conf From b1c2c3f6168ab3c5b2087ce1307bc8c8442cfbf4 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:12:10 +0200 Subject: [PATCH 11/16] run --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index e38bc75..6c17481 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,7 @@ RUN apt-get update && \ && apt-get clean && \ rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* +COPY run.sh /usr/local/bin/run COPY munin_stats /etc/munin/plugins/munin_stats COPY munin_update /etc/munin/plugins/munin_update @@ -35,7 +36,8 @@ RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) (/usr/sbin/a2enmod fcgid) && \ rm -rf /etc/munin/plugins && \ chmod +x /etc/munin/plugins/munin_stats && \ - chmod +x /etc/munin/plugins/munin_update + chmod +x /etc/munin/plugins/munin_update && \ + chmod +x /usr/local/bin/run COPY 000-default.conf /etc/apache2/sites-available/000-default.conf COPY logrotate-munin /etc/logrotate.d/munin @@ -44,10 +46,6 @@ COPY ssmtp.conf /etc/ssmtp/ssmtp.conf COPY revaliases /etc/ssmtp/revaliases COPY munin_mail.conf /etc/munin/munin-conf.d/munin_mail.conf -# copy launcher -COPY run.sh /usr/local/bin/run -RUN chmod +x /usr/local/bin/run - # persist VOLUME /var/lib/munin VOLUME /var/log/munin From bfaa3dd51789b7e50ac866498ee38319c809d35b Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:13:14 +0200 Subject: [PATCH 12/16] mkdir --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 6c17481..7b501e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,6 +35,7 @@ RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) (chfn -f 'munin' root) && \ (/usr/sbin/a2enmod fcgid) && \ rm -rf /etc/munin/plugins && \ + mkdir -p /etc/munin/plugins && \ chmod +x /etc/munin/plugins/munin_stats && \ chmod +x /etc/munin/plugins/munin_update && \ chmod +x /usr/local/bin/run From 681a9fdd3b93c9783f5164ae38d5567f2f22755f Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:16:05 +0200 Subject: [PATCH 13/16] run --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b501e3..4b52e44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,12 @@ RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) (/usr/sbin/a2enmod fcgid) && \ rm -rf /etc/munin/plugins && \ mkdir -p /etc/munin/plugins && \ - chmod +x /etc/munin/plugins/munin_stats && \ + +COPY run.sh /usr/local/bin/run +COPY munin_stats /etc/munin/plugins/munin_stats +COPY munin_update /etc/munin/plugins/munin_update + +RUN chmod +x /etc/munin/plugins/munin_stats && \ chmod +x /etc/munin/plugins/munin_update && \ chmod +x /usr/local/bin/run From f882cd586bb891b1736d749356495e19f4b54ca9 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:18:55 +0200 Subject: [PATCH 14/16] test --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4b52e44..6f48493 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,10 +22,6 @@ RUN apt-get update && \ && apt-get clean && \ rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* -COPY run.sh /usr/local/bin/run -COPY munin_stats /etc/munin/plugins/munin_stats -COPY munin_update /etc/munin/plugins/munin_update - RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) && \ (sed -i 's/^Alias.*/Alias \/ \/var\/cache\/munin\/www\//g' /etc/apache2/sites-available/000-default.conf) && \ (sed -i 's/Allow from .*/Satisfy Any/g' /etc/apache2/sites-available/000-default.conf) && \ From 2481d53d17147ca1c79c95713f31287744b0e5d2 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:21:25 +0200 Subject: [PATCH 15/16] typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6f48493..02f0255 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) (chfn -f 'munin' root) && \ (/usr/sbin/a2enmod fcgid) && \ rm -rf /etc/munin/plugins && \ - mkdir -p /etc/munin/plugins && \ + mkdir -p /etc/munin/plugins COPY run.sh /usr/local/bin/run COPY munin_stats /etc/munin/plugins/munin_stats From cc1a5f16eef685ca068c7aaab6f4d45b3afff152 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:38:55 +0200 Subject: [PATCH 16/16] libfile-readbackwards-perl --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 02f0255..6d0b36b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update && \ curl tzdata \ munin-node \ autoconf \ + libfile-readbackwards-perl \ && apt-get clean && \ rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/*