Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 69365 Details for
Bug 76018
Munin is a time series graphing utility that provides server/device monitoring capability
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Munin 1.3.2 gentoo patch for the munin server side ebuild
munin-1.3.2-gentoo.patch (text/plain), 5.21 KB, created by
Christian Anton
on 2005-09-27 12:17:06 UTC
(
hide
)
Description:
Munin 1.3.2 gentoo patch for the munin server side ebuild
Filename:
MIME Type:
Creator:
Christian Anton
Created:
2005-09-27 12:17:06 UTC
Size:
5.21 KB
patch
obsolete
>--- Makefile.config 2005-04-15 22:29:18.000000000 +0200 >+++ Makefile.config 2005-09-26 17:26:21.000000000 +0200 >@@ -7,10 +7,10 @@ > # > # the base of the Munin installation. > # >-PREFIX = $(DESTDIR)/opt/munin >+PREFIX = $(DESTDIR)/usr > > # Where Munin keeps its configurations (server.conf, client.conf, ++) >-CONFDIR = $(DESTDIR)/etc/opt/munin >+CONFDIR = $(DESTDIR)/etc/munin > > # Server only - where to put munin-cron > BINDIR = $(PREFIX)/bin >@@ -19,20 +19,20 @@ BINDIR = $(PREFIX)/bin > SBINDIR = $(PREFIX)/sbin > > # Where to put text and html documentation >-DOCDIR = $(PREFIX)/doc >+DOCDIR = $(PREFIX)/share/doc > > # Where to put man pages >-MANDIR = $(PREFIX)/man >+MANDIR = $(PREFIX)/share/man > > # Where to put internal binaries and plugin repository > LIBDIR = $(PREFIX)/lib > > # Server only - Output directory >-HTMLDIR = $(PREFIX)/var/www >+HTMLDIR = $(PREFIX)/var/www/localhost/htdocs/munin > CGIDIR = $(HTMLDIR)/cgi > > # Client only - Where to put RRD files and other intenal data >-DBDIR = $(DESTDIR)/var/opt/munin >+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 > > >--- server/munin-graph.in 2005-04-15 22:31:22.000000000 +0200 >+++ server/munin-graph.in 2005-09-27 18:14:03.000000000 +0200 >@@ -649,10 +649,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++; > } > >@@ -725,13 +725,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"); >@@ -792,13 +792,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"); > } > >@@ -810,9 +810,9 @@ sub process_node { > # Do the header (title, vtitle, size, etc...) > push @complete, @{&get_header ($node, $config, $domain, $name, $service, $time)}; > push @complete, @rrd; >+ my $loctime = localtime($lastupdate); >+ push (@complete, "COMMENT:Last update\\: " . escape($loctime) . "\\r"); > >- push (@complete, "COMMENT:Last update: " . localtime($lastupdate) . "\\r"); >- > if (time - 300 < $lastupdate) > { > push @complete, "--end",(int($lastupdate/$resolutions{$time}))*$resolutions{$time}; >@@ -841,7 +841,8 @@ 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 $loctime = localtime($lastupdate); >+ push (@rrd_sum, "COMMENT:Last update\\: " . escape($loctime) ."\\r"); > > my $labelled = 0; > my @defined = ();
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 76018
:
47101
|
47102
|
47103
|
47104
|
47523
|
47524
|
47525
|
48310
|
48311
|
48312
|
48314
|
69364
| 69365 |
69366
|
69367
|
86449
|
86450
|
86453
|
86454
|
90662
|
90663
|
91329
|
91330
|
91331