Package: munin Version: 1.2.3-1 Followup-For: Bug #324605 Attached is a patch to escape colons in COMMENT:
It gets munin-graph working again..... Rob -- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.4.27-2-k7 Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) Versions of packages munin depends on: pn libdigest-md5-perl <none> (no description available) ii libhtml-template-perl 2.6-2 HTML::Template : A module for usin ii libparse-recdescent-perl 1.94-4 Generates recursive-descent parser ii librrds-perl 1.2.11-0.2 Time-series data storage and displ pn libtime-hires-perl <none> (no description available) ii perl [libstorable-perl] 5.8.7-4 Larry Wall's Practical Extraction ii perl-modules 5.8.7-4 Core Perl modules Versions of packages munin recommends: ii libdate-manip-perl 5.44-1 a perl library for manipulating da ii munin-node 1.2.3-1 network-wide graphing framework (n -- no debconf information -- Robert Loomans [EMAIL PROTECTED]
--- munin-graph.old 2005-08-24 10:54:55.000000000 +1000
+++ munin-graph 2005-08-24 10:51:48.000000000 +1000
@@ -848,10 +848,10 @@
elsif ($global_headers == 1)
{
push (@rrd, "COMMENT:" . (" " x $max_field_len));
- push (@rrd, "COMMENT: Cur:");
- push (@rrd, "COMMENT:Min:");
- push (@rrd, "COMMENT:Avg:");
- push (@rrd, "COMMENT:Max: \\j");
+ push (@rrd, "COMMENT: Cur\\:");
+ push (@rrd, "COMMENT:Min\\:");
+ push (@rrd, "COMMENT:Avg\\:");
+ push (@rrd, "COMMENT:Max\\: \\j");
$global_headers++;
}
@@ -924,13 +924,13 @@
}
else
{
- push (@rrd, "COMMENT: Cur:") unless $global_headers;
+ push (@rrd, "COMMENT: Cur\\:") unless $global_headers;
push (@rrd, "GPRINT:c$rrdname:LAST:%6.2lf" .
(munin_get_bool_val ($node->{client}->{$service}->{graph_scale},
"yes")?"%s":"") . "");
- push (@rrd, "COMMENT: Min:") unless $global_headers;
+ push (@rrd, "COMMENT: Min\\:") unless $global_headers;
push (@rrd, "GPRINT:i$rrdname:MIN:%6.2lf" . (munin_get_bool_val
($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
- push (@rrd, "COMMENT: Avg:") unless $global_headers;
+ push (@rrd, "COMMENT: Avg\\:") unless $global_headers;
push (@rrd, "GPRINT:g$rrdname:AVERAGE:%6.2lf" .
(munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") .
"");
- push (@rrd, "COMMENT: Max:") unless $global_headers;
+ push (@rrd, "COMMENT: Max\\:") unless $global_headers;
push (@rrd, "GPRINT:a$rrdname:MAX:%6.2lf" . (munin_get_bool_val
($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "\\j");
push (@{$total_pos{'min'}}, "i$rrdname");
push (@{$total_pos{'avg'}}, "g$rrdname");
@@ -991,13 +991,13 @@
push (@rrd, "CDEF:dpostotal=ipostotal,UN,ipostotal,UNKN,IF");
push (@rrd, "LINE1:dpostotal#000000:" .
$node->{client}->{$service}->{graph_total} . (" " x ($max_field_len - length
($node->{client}->{$service}->{graph_total}) + 1)));
- push (@rrd, "COMMENT: Cur:") unless $global_headers;
+ push (@rrd, "COMMENT: Cur\\:") unless $global_headers;
push (@rrd, "GPRINT:gpostotal:LAST:%6.2lf" . (munin_get_bool_val
($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
- push (@rrd, "COMMENT: Min:") unless $global_headers;
+ push (@rrd, "COMMENT: Min\\:") unless $global_headers;
push (@rrd, "GPRINT:ipostotal:MIN:%6.2lf" . (munin_get_bool_val
($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
- push (@rrd, "COMMENT: Avg:") unless $global_headers;
+ push (@rrd, "COMMENT: Avg\\:") unless $global_headers;
push (@rrd, "GPRINT:gpostotal:AVERAGE:%6.2lf" . (munin_get_bool_val
($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
- push (@rrd, "COMMENT: Max:") unless $global_headers;
+ push (@rrd, "COMMENT: Max\\:") unless $global_headers;
push (@rrd, "GPRINT:apostotal:MAX:%6.2lf" . (munin_get_bool_val
($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "\\j");
}
@@ -1010,7 +1010,9 @@
push @complete, @{&get_header ($node, $config, $domain, $name,
$service, $time)};
push @complete, @rrd;
- push (@complete, "COMMENT:Last update: " . localtime($lastupdate) .
"\\r");
+ my $localtime_lastupdate = localtime($lastupdate);
+ $localtime_lastupdate =~ s/:/\\:/g;
+ push (@complete, "COMMENT:Last update\\: $localtime_lastupdate\\r");
if (time - 300 < $lastupdate)
{
@@ -1040,7 +1042,9 @@
push @rrd_sum,
"--end",(int($lastupdate/$resolutions{$time}))*$resolutions{$time};
}
push @rrd_sum, @rrd;
- push (@rrd_sum, "COMMENT:Last update: " .
localtime($lastupdate) . "\\r");
+ my $localtime_lastupdate = localtime($lastupdate);
+ $localtime_lastupdate =~ s/:/\\:/g;
+ push (@rrd_sum, "COMMENT:Last update\\:
$localtime_lastupdate\\r");
my $labelled = 0;
my @defined = ();
signature.asc
Description: Digital signature
