package: munin-plugins-core tags: patch upstream version: 2.1.9-1 severity: minor found: 2.0.24-1
Hi,
the munin_stats plugin should not try to graph munin-graph if graph_strategy
is set to cgi. Patch attached, though I'm not sure this is the best way to do
this... it's certainly a working way ;-)
cheers,
Holger
From 579610962834ef99bb3e85da0de76507ca11e493 Mon Sep 17 00:00:00 2001
From: Holger Levsen <hol...@layer-acht.org>
Date: Mon, 27 Oct 2014 22:19:38 +0100
Subject: [PATCH] munin_stats plugin: only graph munin-graph if
graph_strategy=cron
---
plugins/node.d/munin_stats.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/plugins/node.d/munin_stats.in b/plugins/node.d/munin_stats.in
index d85a2cb..2653ce1 100644
--- a/plugins/node.d/munin_stats.in
+++ b/plugins/node.d/munin_stats.in
@@ -27,9 +27,14 @@ use strict;
use warnings;
use Munin::Plugin;
+use Munin::Master::GraphOld;
-my @logs = qw/update graph html limits/;
+my @logs = qw/update html limits/;
my $logdir = ($ENV{'logdir'} || $ENV{'MUNIN_LOGDIR'} || '@@LOGDIR@@');
+my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
+if (! graph_check_cron() ) {
+ push (@logs, "graph");
+}
if ($ARGV[0] and $ARGV[0] eq 'autoconf') {
my $munin_update_location =
--
1.9.1
signature.asc
Description: This is a digitally signed message part.
