head 1.2; access; symbols pkgsrc-2019Q2:1.1.1.1.0.112 pkgsrc-2019Q2-base:1.1.1.1 pkgsrc-2019Q1:1.1.1.1.0.110 pkgsrc-2019Q1-base:1.1.1.1 pkgsrc-2018Q4:1.1.1.1.0.108 pkgsrc-2018Q4-base:1.1.1.1 pkgsrc-2018Q3:1.1.1.1.0.106 pkgsrc-2018Q3-base:1.1.1.1 pkgsrc-2018Q2:1.1.1.1.0.104 pkgsrc-2018Q2-base:1.1.1.1 pkgsrc-2018Q1:1.1.1.1.0.102 pkgsrc-2018Q1-base:1.1.1.1 pkgsrc-2017Q4:1.1.1.1.0.100 pkgsrc-2017Q4-base:1.1.1.1 pkgsrc-2017Q3:1.1.1.1.0.98 pkgsrc-2017Q3-base:1.1.1.1 pkgsrc-2017Q2:1.1.1.1.0.94 pkgsrc-2017Q2-base:1.1.1.1 pkgsrc-2017Q1:1.1.1.1.0.92 pkgsrc-2017Q1-base:1.1.1.1 pkgsrc-2016Q4:1.1.1.1.0.90 pkgsrc-2016Q4-base:1.1.1.1 pkgsrc-2016Q3:1.1.1.1.0.88 pkgsrc-2016Q3-base:1.1.1.1 pkgsrc-2016Q2:1.1.1.1.0.86 pkgsrc-2016Q2-base:1.1.1.1 pkgsrc-2016Q1:1.1.1.1.0.84 pkgsrc-2016Q1-base:1.1.1.1 pkgsrc-2015Q4:1.1.1.1.0.82 pkgsrc-2015Q4-base:1.1.1.1 pkgsrc-2015Q3:1.1.1.1.0.80 pkgsrc-2015Q3-base:1.1.1.1 pkgsrc-2015Q2:1.1.1.1.0.78 pkgsrc-2015Q2-base:1.1.1.1 pkgsrc-2015Q1:1.1.1.1.0.76 pkgsrc-2015Q1-base:1.1.1.1 pkgsrc-2014Q4:1.1.1.1.0.74 pkgsrc-2014Q4-base:1.1.1.1 pkgsrc-2014Q3:1.1.1.1.0.72 pkgsrc-2014Q3-base:1.1.1.1 pkgsrc-2014Q2:1.1.1.1.0.70 pkgsrc-2014Q2-base:1.1.1.1 pkgsrc-2014Q1:1.1.1.1.0.68 pkgsrc-2014Q1-base:1.1.1.1 pkgsrc-2013Q4:1.1.1.1.0.66 pkgsrc-2013Q4-base:1.1.1.1 pkgsrc-2013Q3:1.1.1.1.0.64 pkgsrc-2013Q3-base:1.1.1.1 pkgsrc-2013Q2:1.1.1.1.0.62 pkgsrc-2013Q2-base:1.1.1.1 pkgsrc-2013Q1:1.1.1.1.0.60 pkgsrc-2013Q1-base:1.1.1.1 pkgsrc-2012Q4:1.1.1.1.0.58 pkgsrc-2012Q4-base:1.1.1.1 pkgsrc-2012Q3:1.1.1.1.0.56 pkgsrc-2012Q3-base:1.1.1.1 pkgsrc-2012Q2:1.1.1.1.0.54 pkgsrc-2012Q2-base:1.1.1.1 pkgsrc-2012Q1:1.1.1.1.0.52 pkgsrc-2012Q1-base:1.1.1.1 pkgsrc-2011Q4:1.1.1.1.0.50 pkgsrc-2011Q4-base:1.1.1.1 pkgsrc-2011Q3:1.1.1.1.0.48 pkgsrc-2011Q3-base:1.1.1.1 pkgsrc-2011Q2:1.1.1.1.0.46 pkgsrc-2011Q2-base:1.1.1.1 pkgsrc-2011Q1:1.1.1.1.0.44 pkgsrc-2011Q1-base:1.1.1.1 pkgsrc-2010Q4:1.1.1.1.0.42 pkgsrc-2010Q4-base:1.1.1.1 pkgsrc-2010Q3:1.1.1.1.0.40 pkgsrc-2010Q3-base:1.1.1.1 pkgsrc-2010Q2:1.1.1.1.0.38 pkgsrc-2010Q2-base:1.1.1.1 pkgsrc-2010Q1:1.1.1.1.0.36 pkgsrc-2010Q1-base:1.1.1.1 pkgsrc-2009Q4:1.1.1.1.0.34 pkgsrc-2009Q4-base:1.1.1.1 pkgsrc-2009Q3:1.1.1.1.0.32 pkgsrc-2009Q3-base:1.1.1.1 pkgsrc-2009Q2:1.1.1.1.0.30 pkgsrc-2009Q2-base:1.1.1.1 pkgsrc-2009Q1:1.1.1.1.0.28 pkgsrc-2009Q1-base:1.1.1.1 pkgsrc-2008Q4:1.1.1.1.0.26 pkgsrc-2008Q4-base:1.1.1.1 pkgsrc-2008Q3:1.1.1.1.0.24 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.22 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.20 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.18 pkgsrc-2008Q1:1.1.1.1.0.16 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.14 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-2007Q3:1.1.1.1.0.12 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.10 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-2007Q1:1.1.1.1.0.8 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.6 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.4 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.2 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2019.09.09.12.21.45; author tm; state dead; branches; next 1.1; commitid Bfv9lDrkveejLkCB; 1.1 date 2006.06.08.19.16.24; author he; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2006.06.08.19.16.24; author he; state Exp; branches; next ; desc @@ 1.2 log @munin: update to version 2.0.49 Version bump from outdated version 1.x to munin 2.0.49. Developed and imported from WIP in cooperation with Sebastian Wiedenroth, Roland Illig, Filip Hajny and Francois Tigeot. @ text @$NetBSD: patch-ae,v 1.1 2006/06/08 19:16:24 he Exp $ --- server/munin-graph.in.orig 2005-01-08 23:34:38.000000000 +0100 +++ server/munin-graph.in @@@@ -490,6 +490,9 @@@@ sub get_header { push @@$result,"--width", &munin_get ($config, "graph_width", "400", $domain, $host, $service); push @@$result,"--imgformat", "PNG"; push @@$result,"--lazy" if ($force_lazy); + push @@$result,"--font", "LEGEND:" . &munin_get ($config, "legend_fontsize", "7", $domain, $host, $service) . ":"; + push @@$result,"--font", "AXIS:" . &munin_get ($config, "axis_fontsize", "7", $domain, $host, $service) . ":"; +# push @@$result,"--font-render-mode", "mono"; push (@@$result, "--units-exponent", "0") if (! &should_scale ($node, $service)); @@@@ -848,10 +851,10 @@@@ sub process_node { 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 +927,13 @@@@ sub process_node { } 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 +994,13 @@@@ sub process_node { 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 +1013,10 @@@@ sub process_node { push @@complete, @@{&get_header ($node, $config, $domain, $name, $service, $time)}; push @@complete, @@rrd; - push (@@complete, "COMMENT:Last update: " . localtime($lastupdate) . "\\r"); + my($ts); + $ts = localtime($lastupdate); + $ts =~ s/:/\\:/g; + push (@@complete, "COMMENT:Last update\\: " . $ts . "\\r"); if (time - 300 < $lastupdate) { @@@@ -1040,7 +1046,10 @@@@ sub process_node { push @@rrd_sum, "--end",(int($lastupdate/$resolutions{$time}))*$resolutions{$time}; } push @@rrd_sum, @@rrd; - push (@@rrd_sum, "COMMENT:Last update: " . localtime($lastupdate) . "\\r"); + my($ts2); + $ts2 = localtime($lastupdate); + $ts2 =~ s/:/\\:/g; + push (@@rrd_sum, "COMMENT:Last update\\: " . $ts2 . "\\r"); my $labelled = 0; my @@defined = (); @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Import a package for the server end of the Munin monitoring system. This version has a patch so that it works properly with RRDtool of version 1.2 or newer. @ text @@