Date: Sun, 22 May 2005 12:23:47 +0200 From: Attila Nagy <bra@fsn.hu> To: Rob B <rbyrnes@mailshack.com> Cc: ports@freebsd.org, munin-users@lists.sourceforge.net, lupe@lupe-christophe.de Subject: Re: [munin-users] munin problems after updating to rrdtool 1.2.x Message-ID: <42905DB3.6060603@fsn.hu> In-Reply-To: <6.2.1.2.2.20050518005907.02a1f008@127.0.0.1> References: <6.2.1.2.2.20050518005907.02a1f008@127.0.0.1>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------050904040900040307070604 Content-Type: text/plain; charset=ISO-8859-2; format=flowed Content-Transfer-Encoding: 7bit Rob B wrote: > > after cvsuping last night, i updated rrdtool (before 1.0.49) to the new > > 1.2.4 in /usr/ports/net/rrdtool. after doing this, running > > /usr/local/bin/munin-cron segfaults with: See the attached diff. This is required for munin-main port to operate in FreeBSD, because the current rrdtool port needs escaped ":" in the COMMENTs. -- Attila Nagy e-mail: Attila.Nagy@fsn.hu Free Software Network (FSN.HU) phone @work: +361 371 3536 ISOs: http://www.fsn.hu/?f=download cell.: +3630 306 6758 --------------050904040900040307070604 Content-Type: text/x-patch; name="munin-graph.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="munin-graph.diff" --- munin-graph.in Sat Jan 8 23:38:25 2005 +++ /tmp/munin-graph.in Sun May 22 12:18:15 2005 @@ -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"); } @@ -1009,9 +1009,9 @@ # Do the header (title, vtitle, size, etc...) push @complete, @{&get_header ($node, $config, $domain, $name, $service, $time)}; push @complete, @rrd; - - push (@complete, "COMMENT:Last update: " . localtime($lastupdate) . "\\r"); - + my $loctime = localtime($lastupdate); + push (@complete, "COMMENT:Last update\\: " . escape($loctime) . "\\ +r"); if (time - 300 < $lastupdate) { push @complete, "--end",(int($lastupdate/$resolutions{$time}))*$resolutions{$time}; @@ -1040,7 +1040,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 $loctime = localtime($lastupdate); + push (@rrd_sum, "COMMENT:Last update\\: " . escape($loctime) . +"\\r"); my $labelled = 0; my @defined = (); --------------050904040900040307070604--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?42905DB3.6060603>