diff options
| -rw-r--r-- | Dockerfile | 6 | ||||
| -rw-r--r-- | munin-graph-logging.patch | 10 | ||||
| -rw-r--r-- | munin-update-logging.patch | 10 |
3 files changed, 25 insertions, 1 deletions
@@ -5,7 +5,7 @@ MAINTAINER Leo Unbekandt <leo@scalingo.com> RUN adduser --system --home /var/lib/munin --shell /bin/false --uid 1103 --group munin RUN apt-get update -qq && RUNLEVEL=1 DEBIAN_FRONTEND=noninteractive \ - apt-get install -y -qq cron munin munin-node nginx apache2-utils wget heirloom-mailx + apt-get install -y -qq cron munin munin-node nginx apache2-utils wget heirloom-mailx patch RUN rm /etc/nginx/sites-enabled/default && mkdir -p /var/cache/munin/www && chown munin:munin /var/cache/munin/www && mkdir -p /var/run/munin && chown -R munin:munin /var/run/munin VOLUME /var/lib/munin @@ -14,6 +14,10 @@ VOLUME /var/log/munin ADD ./munin.conf /etc/munin/munin.conf ADD ./nginx-munin /etc/nginx/sites-enabled/munin ADD ./start-munin.sh /munin +ADD ./munin-graph-logging.patch /usr/share/munin +ADD ./munin-update-logging.patch /usr/share/munin + +RUN cd /usr/share/munin && patch munin-graph < munin-graph-logging.patch && patch munin-update < munin-update-logging.patch EXPOSE 8080 CMD bash /munin diff --git a/munin-graph-logging.patch b/munin-graph-logging.patch new file mode 100644 index 0000000..aa4fc56 --- /dev/null +++ b/munin-graph-logging.patch @@ -0,0 +1,10 @@ +--- /usr/share/munin/munin-graph 2015-11-28 00:45:25.274878597 +0100 ++++ /usr/share/munin/munin-graph 2015-11-28 00:45:44.622466044 +0100 +@@ -73,6 +73,7 @@ + + logger_open($config->{'logdir'}); + logger_debug() if $config->{debug} or defined($ENV{CGI_DEBUG}); ++logger_level("warn"); + + if (! graph_check_cron() ) { + # Should not be launched from cron. diff --git a/munin-update-logging.patch b/munin-update-logging.patch new file mode 100644 index 0000000..4f8e87b --- /dev/null +++ b/munin-update-logging.patch @@ -0,0 +1,10 @@ +--- /usr/share/munin/munin-update 2015-11-28 00:44:27.175435050 +0100 ++++ /usr/share/munin/munin-update 2015-11-28 00:44:57.313544402 +0100 +@@ -34,6 +34,7 @@ + + logger_open($config->{'logdir'}); + logger_debug() if $config->{debug}; ++ logger_level("warn"); + + my $update = Munin::Master::Update->new(); + $update->run(); |