Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b065b83c9565372fb8b49570e941428af5f2bf75
commit b065b83c9565372fb8b49570e941428af5f2bf75 Author: DeX77 <[email protected]> Date: Mon Jul 31 15:33:11 2017 +0200 munin-2.0.33-1-x86_64 * version bump * make munin-node a subpkg diff --git a/source/network-extra/munin-node/FrugalBuild b/source/network-extra/munin-node/FrugalBuild deleted file mode 100644 index 2fa4a8d..0000000 --- a/source/network-extra/munin-node/FrugalBuild +++ /dev/null @@ -1,65 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: CSÉCSY László <[email protected]> -# Contributor: Karoly CZOVEK <[email protected]> - -pkgname=munin-node -pkgver=1.2.6 -pkgrel=14 -pkgdesc="Munin is a tool for graphing all sorts of information about one or more servers and displaying it in a web interface. (Node)" -_F_sourceforge_name="munin" -_F_sourceforge_dirname="munin" -_F_sourceforge_sep="_" -Finclude sourceforge -url="http://munin.projects.linpro.no/"; -depends=('perl-net-server') -groups=('network-extra') -archs=('i686' 'x86_64') -up2date="lynx -dump $url|grep 'Stable'|sed 's/.*: \(.*\)\ .*D.*/\1/'" -source=($source Makefile.config munin-node.service munin-node.logrotate munin-node.conf) -sha1sums=('bdc6d1767df1ea618071d76f0c4525dda2ea33d9' \ - '1ef1cef662f90e0177a67655afb020bf856235b8' \ - 'fee509af81baeebe9ecb309943afbbab8aed0335' \ - '2950e0a37d42abb2b152a40f24498982613a4b62' \ - '30389dab21fbffdbdab52f7aacf3eb63b9e32ef9') -options=('scriptlet') -backup=(etc/munin/{munin-node.conf,plugin-conf.d/munin-node}) -removes=('usr/lib/perl5/site_perl/current/Munin/Plugin.pm') -_F_systemd_scriptlet="$pkgname.install" -_F_systemd_units=(munin-node=) -Finclude systemd -up2date="$pkgver" - -build() -{ - Fcd munin-$pkgver - cp -f $Fsrcdir/Makefile.config ./ - Fsed '5B' '' node/node.d/courier_.in - make install-node DESTDIR=$Fdestdir HASSETR=1 MKTEMP='mktemp -p /tmp/ $$1' - make install-node-plugins DESTDIR=$Fdestdir - - Ffile etc/logrotate.d/munin-node.logrotate - Fmv etc/logrotate.d/munin-node.logrotate etc/logrotate.d/munin-node - - Ffile etc/munin/plugin-conf.d/munin-node.conf - Fmv etc/munin/plugin-conf.d/munin-node.conf etc/munin/plugin-conf.d/munin-node - - Fsed "$Fdestdir" "" $Fdestdir/etc/munin/munin-node.conf - Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-node - Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-node-configure -# Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-node-configure-snmp - Fsed "$Fdestdir" "" $Fdestdir/usr/sbin/munin-run - - Fsed "$Fdestdir" "" $Fdestdir/usr/share/munin/plugins/* - - Frm /var/run - Fmkdir /etc/tmpfiles.d - cat > $Fdestdir/etc/tmpfiles.d/munin-node.conf << EOF -d $Flocalstatedir/run/munin 0755 munin munin - -EOF - Fdirschown /var/log/munin 47 47 - Fdirschown /var/lib/munin 47 47 - Ffile /lib/systemd/system/munin-node.service - Fgenscriptlet -} - -# optimization OK diff --git a/source/network-extra/munin-node/Makefile.config b/source/network-extra/munin-node/Makefile.config deleted file mode 100644 index 8a6e69f..0000000 --- a/source/network-extra/munin-node/Makefile.config +++ /dev/null @@ -1,88 +0,0 @@ -# This file specifies where Munin will look for things after you've -# run 'make' in the source directory. Modify it to suit your needs. - -# DESTDIR is empty during building, and optionally set to point to -# a shadow tree during make install. - -# -# the base of the Munin installation. -# -PREFIX = $(DESTDIR)/ - -# Where Munin keeps its configurations (server.conf, client.conf, ++) -CONFDIR = $(DESTDIR)/etc/munin - -# Server only - where to put munin-cron -BINDIR = $(PREFIX)/usr/bin - -# Client only - where to put munin-node, munin-node-configure, and munin-run -SBINDIR = $(PREFIX)/usr/sbin - -# Where to put text and html documentation -DOCDIR = $(PREFIX)/usr/share/doc/munin - -# Where to put man pages -MANDIR = $(PREFIX)/usr/share/man/munin - -# Where to put internal binaries and plugin repository -LIBDIR = $(PREFIX)/usr/share/munin - -# Server only - Output directory -HTMLDIR = $(PREFIX)/var/www/html/munin -CGIDIR = $(PREFIX)/usr/libexec/cgi-bin - -# Client only - Where to put RRD files and other intenal data -DBDIR = $(DESTDIR)/var/lib/munin - -# Client only - Where plugins should put their states. Must be writable by -# group "munin", and should be preserved between reboots -PLUGSTATE = $(DBDIR)/plugin-state - -# Where Munin should place its logs. -LOGDIR = $(DESTDIR)/var/log/munin - -# Location of PID files and other statefiles. On the server, must be -# writable by the user "munin". -STATEDIR = $(DESTDIR)/var/run/munin - -# The perl interpreter to use -PERL = $(shell which perl) - -# The python interpreter to use (used by some plugins) -PYTHON = /usr/bin/env python - -# Server only - Where to install the perl libraries -PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib_stem | cut -d= -f2 | sed "s/[\';]//g")/current - -# Client only - Install plugins for this architecture -OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') - -# How to figure out the hostname. (Only used in default configuration -# files) -HOSTNAME = localhost.localdomain - -# Munin version number. -VERSION = $(shell cat RELEASE) - -# User to run munin as -USER = munin -GROUP = munin - -# Default user to run the plugins as -PLUGINUSER = munin - -# Which command to use to check if the USER and GROUP to run Munin as, exists. -GETENT = $(shell which getent || which true 2>/dev/null) - -CHECKUSER = \# -CHECKGROUP = \# -CHOWN = \# -CHMOD = \# -CHGRP = \# - -#CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) -#CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) - -#CHOWN = chown -#CHMOD = chmod -#CHGRP = chgrp diff --git a/source/network-extra/munin/FrugalBuild b/source/network-extra/munin/FrugalBuild index cf9f443..88130ae 100644 --- a/source/network-extra/munin/FrugalBuild +++ b/source/network-extra/munin/FrugalBuild @@ -3,55 +3,72 @@ # Contributor: Karoly CZOVEK <[email protected]> pkgname=munin -pkgver=1.2.6 -pkgrel=7 +pkgver=2.0.33 +pkgrel=1 pkgdesc="Munin is a tool for graphing all sorts of information about one or more servers and displaying it in a web interface." -_F_github_tag=yes -_F_github_author="munin-monitoring" -_F_github_grepv="2.99" ## devel -Finclude github url="http://munin-monitoring.org/"; depends=('rrdtool>=1.2.11-2' 'perl-html-template') +makedepends=('perl-module-build' 'perl-net-snmp' 'perl-net-server' 'perl-net-ssleay' 'perl-log-log4perl') groups=('network-extra') -archs=('i686' 'x86_64') -source+=( Makefile.config munin.cron munin.logrotate README.Frugalware) -sha1sums=('a01bf2fcd14f9f019ec21cc65055c99978d783ab' \ - '1ef1cef662f90e0177a67655afb020bf856235b8' \ - '876dfcb7c1690be14611db4e9d55b9b40cedac88' \ - 'a1ce31369c2278c1f53509178856341f9a9f6cc6' \ - '264321148f314a2d28a71b688f414e933a0dee03') +archs=('x86_64') +up2date="Flastverdir http://downloads.munin-monitoring.org/munin/stable/"; +source=(http://downloads.munin-monitoring.org/munin/stable/$pkgver/munin-$pkgver.tar.gz \ + Makefile.config \ + munin.cron \ + munin.logrotate \ + munin-node.conf \ + munin-node.logrotate \ + munin-node.service \ + README.Frugalware) +signatures=("${source[0]}.asc" '' '' '' '' '' '' '') + options=('scriptlet') backup=('etc/munin/munin.conf') -removes=('usr/lib/perl5/site_perl/current/Munin.pm') + +subpkgs=("munin-node") +subdescs=("$pkgdesc (Node)") +subdepends=('perl-net-server') +subgroups=('network-extra') +subarchs=('x86_64') + build() { Fcd Fpatchall cp -f $Fsrcdir/Makefile.config ./ - make install-main DESTDIR=$Fdestdir + export PERL_USE_UNSAFE_INC=1 + Fexec make -j1 PREFIX='' + Fexec make -j1 PREFIX='' common/blib/lib/Munin/Common/Defaults.pm + Fexec make install-node DESTDIR=$Fdestdir HASSETR=1 MKTEMP='mktemp -p /tmp/ $$1' + Fexec make install-node-plugins DESTDIR=$Fdestdir + + + Ffile etc/logrotate.d/munin-node.logrotate + Fmv etc/logrotate.d/munin-node.logrotate etc/logrotate.d/munin-node + + Ffile etc/munin/plugin-conf.d/munin-node.conf + Fmv etc/munin/plugin-conf.d/munin-node.conf etc/munin/plugin-conf.d/munin-node + + Ffile /lib/systemd/system/munin-node.service + + Fsplit munin-node /\* + Fmakeinstall + Ffile var/spool/cron/crontabs/munin.cron Fmv var/spool/cron/crontabs/munin.cron var/spool/cron/crontabs/munin Ffile etc/logrotate.d/munin.logrotate Fmv etc/logrotate.d/munin.logrotate etc/logrotate.d/munin - Fsed "$Fdestdir\/*" "\/" $Fdestdir/etc/munin/munin.conf - Fsed "$Fdestdir"/"" "" $Fdestdir/usr/bin/munin-cron - Fsed "$Fdestdir" "" $Fdestdir/usr/lib/perl5/site_perl/current/Munin.pm - Fsed "$Fdestdir" "" $Fdestdir/usr/share/munin/munin-graph - Fsed "$Fdestdir" "" $Fdestdir/usr/share/munin/munin-html - Fsed "$Fdestdir" "" $Fdestdir/usr/share/munin/munin-limits - Fsed "$Fdestdir" "" $Fdestdir/usr/share/munin/munin-update - Fsed "$Fdestdir" "" $Fdestdir/usr/libexec/cgi-bin/munin-cgi-graph + Frm /run - Frm /var/run Fmkdir /etc/tmpfiles.d cat > $Fdestdir/etc/tmpfiles.d/munin.conf << EOF d $Flocalstatedir/run/munin 0755 munin munin - EOF Fdirschown /var/log/munin 47 47 Fdirschown /var/lib/munin 47 47 - Fdirschown /var/www/html/munin 47 47 + } # optimization OK diff --git a/source/network-extra/munin/Makefile.config b/source/network-extra/munin/Makefile.config index 8a6e69f..d6df885 100644 --- a/source/network-extra/munin/Makefile.config +++ b/source/network-extra/munin/Makefile.config @@ -1,13 +1,20 @@ +# -*- makefile -*- # This file specifies where Munin will look for things after you've # run 'make' in the source directory. Modify it to suit your needs. +# DESTDIR is meant only for use when making Munin packages. Unless +# you're doing packaging do NOT set it. # DESTDIR is empty during building, and optionally set to point to # a shadow tree during make install. +# Note: There is a need for a VARDIR, with DBDIR, PLUGSTATE, HTMLDIR +# and LOGDIR as subdirectories. Today, DBDIR contains configured +# domains, as well as PLUGSTATE, and we risk collisions. + # # the base of the Munin installation. -# -PREFIX = $(DESTDIR)/ +# +PREFIX = $(DESTDIR) # Where Munin keeps its configurations (server.conf, client.conf, ++) CONFDIR = $(DESTDIR)/etc/munin @@ -16,73 +23,118 @@ CONFDIR = $(DESTDIR)/etc/munin BINDIR = $(PREFIX)/usr/bin # Client only - where to put munin-node, munin-node-configure, and munin-run -SBINDIR = $(PREFIX)/usr/sbin +SBINDIR = $(PREFIX)/usr/bin # Where to put text and html documentation DOCDIR = $(PREFIX)/usr/share/doc/munin # Where to put man pages -MANDIR = $(PREFIX)/usr/share/man/munin +MANDIR = $(PREFIX)/usr/share/man # Where to put internal binaries and plugin repository -LIBDIR = $(PREFIX)/usr/share/munin +LIBDIR = $(PREFIX)/usr/lib/munin # Server only - Output directory -HTMLDIR = $(PREFIX)/var/www/html/munin -CGIDIR = $(PREFIX)/usr/libexec/cgi-bin +HTMLDIR = $(PREFIX)/usr/share/munin/www +CGIDIR = $(PREFIX)/usr/share/munin/cgi -# Client only - Where to put RRD files and other intenal data +# Where to put internal data for master (RRD, internal files, ...) DBDIR = $(DESTDIR)/var/lib/munin +# Where to put internal data for node (plugin state, ...) +DBDIRNODE = $(DESTDIR)/var/lib/munin + +# Client only - Where the spool files are written. Must be writable by +# group "munin", and should be preserved between reboots +SPOOLDIR = $(DBDIR)/spool + # Client only - Where plugins should put their states. Must be writable by # group "munin", and should be preserved between reboots -PLUGSTATE = $(DBDIR)/plugin-state +PLUGSTATE = $(DBDIRNODE)/plugin-state # Where Munin should place its logs. -LOGDIR = $(DESTDIR)/var/log/munin +LOGDIR = $(PREFIX)/var/log/munin # Location of PID files and other statefiles. On the server, must be # writable by the user "munin". -STATEDIR = $(DESTDIR)/var/run/munin +STATEDIR = $(DESTDIR)/run/munin # The perl interpreter to use -PERL = $(shell which perl) +PERL := /usr/bin/perl # The python interpreter to use (used by some plugins) -PYTHON = /usr/bin/env python +PYTHON := /usr/bin/env python2 + +# The ruby interpreter to use (used by some plugins) +RUBY := /usr/bin/env ruby + +# The java runtime to use (used by some plugins) +JAVARUN := /usr/bin/java + +# The java library dir to use (used by some plugins) +# this is needed in order to be able to install +# java libraries in a custom location. Many distrubutions +# enforce a spesific location for java libraries. +JAVALIBDIR:= $(LIBDIR) + + +# A modern (posix) shell. We're not looking for arrays, but $() and +# other modern stuff is expected. On a posix-system the expression +# below will find the right shell. Most Unixes released the last 10 +# years are POSIX compliant enough for this to work (he said bravely). +# +# On Linux /bin/sh, SunOS/Solaris /usr/xpg4/bin/sh or /bin/ksh +# In general: bash or ksh will work +# +GOODSH := /bin/sh + +# Path of bash for bash specific plugins +BASH := /bin/bash # Server only - Where to install the perl libraries PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib_stem | cut -d= -f2 | sed "s/[\';]//g")/current # Client only - Install plugins for this architecture -OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') +OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]') # How to figure out the hostname. (Only used in default configuration # files) -HOSTNAME = localhost.localdomain +HOSTNAME := myhostname + +# What is the safest way to create a tempfile. +# Default is to figure it out by testing various methods. +# Replace this with a known platform-specific method +MKTEMP := $(shell ./test-mktemp) # Munin version number. -VERSION = $(shell cat RELEASE) +VERSION := $(shell ./getversion) # User to run munin as -USER = munin -GROUP = munin +USER := munin +GROUP := munin # Default user to run the plugins as -PLUGINUSER = munin +PLUGINUSER := nobody + +# Default user to run the cgi as +CGIUSER := nobody # Which command to use to check if the USER and GROUP to run Munin as, exists. -GETENT = $(shell which getent || which true 2>/dev/null) +GETENT := /bin/true +CHECKUSER := /bin/true +CHECKGROUP := /bin/true + +CHOWN := true +CHMOD := chmod +CHGRP := true -CHECKUSER = \# -CHECKGROUP = \# -CHOWN = \# -CHMOD = \# -CHGRP = \# +# Java compiler stuff - only needed on the buildhost +JC := javac +JFLAGS := -g -source 1.5 -target 1.5 +JAR := jar -#CHECKUSER = $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) -#CHECKGROUP = $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) +# Check if the java compiler works +JCVALID := no -#CHOWN = chown -#CHMOD = chmod -#CHGRP = chgrp +# Check whether setruid functionality can be used +HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) diff --git a/source/network-extra/munin-node/munin-node.conf b/source/network-extra/munin/munin-node.conf similarity index 100% rename from source/network-extra/munin-node/munin-node.conf rename to source/network-extra/munin/munin-node.conf diff --git a/source/network-extra/munin-node/munin-node.install b/source/network-extra/munin/munin-node.install similarity index 100% rename from source/network-extra/munin-node/munin-node.install rename to source/network-extra/munin/munin-node.install diff --git a/source/network-extra/munin-node/munin-node.logrotate b/source/network-extra/munin/munin-node.logrotate similarity index 100% rename from source/network-extra/munin-node/munin-node.logrotate rename to source/network-extra/munin/munin-node.logrotate diff --git a/source/network-extra/munin-node/munin-node.service b/source/network-extra/munin/munin-node.service similarity index 100% rename from source/network-extra/munin-node/munin-node.service rename to source/network-extra/munin/munin-node.service diff --git a/source/network-extra/munin/munin.install b/source/network-extra/munin/munin.install index 0de7887..c13afeb 100644 --- a/source/network-extra/munin/munin.install +++ b/source/network-extra/munin/munin.install @@ -1,10 +1,10 @@ post_install() { if ! grep -q '^munin:' /etc/group ; then - groupadd -g 47 munin + /usr/sbin/groupadd -g 47 munin fi if ! grep -q '^munin:' /etc/passwd ; then - useradd -u 47 -g 47 -s /bin/false -c "Munin User" -d /var/lib/munin munin + /usr/sbin/useradd -u 47 -g 47 -s /bin/false -c "Munin User" -d /var/lib/munin munin fi } @@ -15,16 +15,6 @@ post_remove() /usr/sbin/groupdel munin >/dev/null 2>&1 fi - rm -f /var/lib/munin/datafile - rm -f /var/lib/munin/limits - rm -f /var/lib/munin/*.stats - rm -f /var/lib/munin/*/*.ok - rm -f /var/run/munin/*.lock - rm -f /var/log/munin/munin-update.log* - rm -f /var/log/munin/munin-graph.log* - rm -f /var/log/munin/munin-html.log* - rm -f /var/log/munin/munin-limits.log* - rm -f /var/log/munin/munin-nagios.log* } op=$1 diff --git a/source/network-extra/munin/rrdtool12.patch b/source/network-extra/munin/rrdtool12.patch deleted file mode 100644 index 31475fb..0000000 --- a/source/network-extra/munin/rrdtool12.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -Naur munin-1.2.3.orig/server/munin-graph.in munin-1.2.3/server/munin-graph.in ---- munin-1.2.3.orig/server/munin-graph.in 2005-04-03 02:18:24.000000000 +0200 -+++ munin-1.2.3/server/munin-graph.in 2005-09-05 23:40:43.000000000 +0200 -@@ -1,4 +1,4 @@ --#!@@PERL@@ -w -+#!/usr/bin/perl -w - # - # Copyright (C) 2002-2004 Jimmy Olsen, Audun Ytterdal - # -@@ -87,7 +87,7 @@ - # Added new option "graph_sums" which creates summarised graphs. - # - # Revision 1.30 2004/09/08 15:25:33 ilmari --# Use @@PERL@@ in all perl shebang lines. -+# Use /usr/bin/perl in all perl shebang lines. - # - # Revision 1.29 2004/09/07 21:45:38 jimmyo - # Changes of min and max values now causes corresponding changes in the RRD files. -@@ -294,7 +294,7 @@ - options may be supplied. - --host <host> Limit graphed hosts to <host>. Multiple --host options - may be supplied. -- --config <file> Use <file> as configuration file. [@@CONFDIR@@/munin.conf] -+ --config <file> Use <file> as configuration file. [@@CONFDIR@@munin.conf] - --[no]list-images List the filenames of the images created. - [--nolist-images] - --[no]day Create day-graphs. [--day] -@@ -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,10 @@ - push @complete, @{&get_header ($node, $config, $domain, $name, $service, $time)}; - push @complete, @rrd; - -- push (@complete, "COMMENT:Last update: " . localtime($lastupdate) . "\\r"); -+ my $tmp_time = localtime($lastupdate); -+ $tmp_time =~ s/\:/\\:/g; -+ -+ push (@complete, "COMMENT:Last update\\: " . $tmp_time . "\\r"); - - if (time - 300 < $lastupdate) - { -@@ -1040,7 +1043,11 @@ - push @rrd_sum, "--end",(int($lastupdate/$resolutions{$time}))*$resolutions{$time}; - } - push @rrd_sum, @rrd; -- push (@rrd_sum, "COMMENT:Last update: " . localtime($lastupdate) . "\\r"); -+ -+ my $tmp_time = localtime($lastupdate); -+ $tmp_time =~ s/\:/\\:/g; -+ -+ push (@rrd_sum, "COMMENT:Last update\\: " . $tmp_time . "\\r"); - - my $labelled = 0; - my @defined = ();
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
