From e30aa534662d9bf5adcdcd225a9c54b1ded6ebe3 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Wed, 26 Aug 2009 23:47:01 +0000 Subject: Restore files/munin-1.3.2-plugins.conf that is used by all ebuilds. Bug #276637: fix overly verbose munin-graph debug output. (Portage version: 2.2_rc38/cvs/Linux x86_64) --- net-analyzer/munin/ChangeLog | 8 ++- net-analyzer/munin/files/munin-1.3.2-plugins.conf | 68 ++++++++++++++++++++++ .../files/munin-1.3.4-terser-munin-graph.patch | 18 ++++++ net-analyzer/munin/munin-1.3.4-r2.ebuild | 8 ++- 4 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 net-analyzer/munin/files/munin-1.3.2-plugins.conf create mode 100644 net-analyzer/munin/files/munin-1.3.4-terser-munin-graph.patch (limited to 'net-analyzer') diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog index 895476b00996..0bc41309ab79 100644 --- a/net-analyzer/munin/ChangeLog +++ b/net-analyzer/munin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/munin # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.25 2009/08/26 23:27:22 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.26 2009/08/26 23:47:00 robbat2 Exp $ + + 26 Aug 2009; Robin H. Johnson + +files/munin-1.3.2-plugins.conf, munin-1.3.4-r2.ebuild, + +files/munin-1.3.4-terser-munin-graph.patch: + Restore files/munin-1.3.2-plugins.conf that is used by all ebuilds. Bug + #276637: fix overly verbose munin-graph debug output. 26 Aug 2009; Robin H. Johnson munin-1.3.4-r2.ebuild: Fix double install of manpages. diff --git a/net-analyzer/munin/files/munin-1.3.2-plugins.conf b/net-analyzer/munin/files/munin-1.3.2-plugins.conf new file mode 100644 index 000000000000..c988c5b63cbe --- /dev/null +++ b/net-analyzer/munin/files/munin-1.3.2-plugins.conf @@ -0,0 +1,68 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-1.3.2-plugins.conf,v 1.3 2009/08/26 23:47:01 robbat2 Exp $ +# +# This file contains configuration options for the plugins. Three +# options are understood by munin-node itself: +# +# user # Set the user to run the plugin as +# group # Set the group to run the plugin as +# command # Run instead of the plugin. %c +# expands to what would normally be run. +# env. # Sets in the plugin's environment, see the +# individual plugins to find out which variables they +# care about. +# +# + +[smart_*] +user root +group disk + +# Example for a 3ware 8000-series card, with 2 disks +# use /dev/twe0 as the actual device +# and replicate this entry for each drive, increasing the number in -d +#[smart_3ware-0_twe0] +#user root +#group root +#env.smartargs -H -i -c -l error -l selftest -l selective -a -d 3ware,0 +#[smart_3ware-1_twe0] +#user root +#group root +#env.smartargs -H -i -c -l error -l selftest -l selective -a -d 3ware,1 + +[bind9*] +user root + +[iostat*] +user munin +group munin + +[iostat_ios] +user root +group disk + +[vlan*] +user root + +[postfix*] +user root +env.logfile maillog + +[sendmail*] +env.mspqueue /var/spool/clientmqueue + +[mysql*] +#env.mysqlopts -u someuser + +[exim*] +group mail + +[cps*] +user root + +# More 3ware examples +#[hddtemp_smartctl] +#env.drives twe0_0 twe0_1 hda +#env.type_twe0_0 3ware,0 +#env.type_twe0_1 3ware,1 diff --git a/net-analyzer/munin/files/munin-1.3.4-terser-munin-graph.patch b/net-analyzer/munin/files/munin-1.3.4-terser-munin-graph.patch new file mode 100644 index 000000000000..694fc12cd413 --- /dev/null +++ b/net-analyzer/munin/files/munin-1.3.4-terser-munin-graph.patch @@ -0,0 +1,18 @@ +diff -Nuar munin-1.3.4.orig/server/munin-graph.in munin-1.3.4/server/munin-graph.in +--- munin-1.3.4.orig/server/munin-graph.in 2009-08-26 23:10:11.942546516 +0000 ++++ munin-1.3.4/server/munin-graph.in 2009-08-26 23:37:53.639047143 +0000 +@@ -476,12 +476,12 @@ + my $graphable = munin_get ($service, "graphable", 0);; + if (!$graphable) { + foreach my $field (@{munin_get_field_order ($service)}) { +- logger ("DEBUG: single_value: Checking field \"$field\"."); ++ logger ("DEBUG: single_value: Checking field \"$field\".") if $DEBUG; + $graphable++ if munin_draw_field ($service->{$field}); + } + munin_set_var_loc ($service, ["graphable"], $graphable); + } +- logger ("Debug: service ". join (' :: ', @{munin_get_node_loc ($service)}) ." has $graphable elements."); ++ logger ("Debug: service ". join (' :: ', @{munin_get_node_loc ($service)}) ." has $graphable elements.") if $DEBUG; + return ($graphable == 1); + } + diff --git a/net-analyzer/munin/munin-1.3.4-r2.ebuild b/net-analyzer/munin/munin-1.3.4-r2.ebuild index f02545735b02..a13d11520f00 100644 --- a/net-analyzer/munin/munin-1.3.4-r2.ebuild +++ b/net-analyzer/munin/munin-1.3.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.4-r2.ebuild,v 1.3 2009/08/26 23:27:22 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.3.4-r2.ebuild,v 1.4 2009/08/26 23:47:00 robbat2 Exp $ EAPI="2" @@ -70,7 +70,11 @@ src_prepare() { # Bug #267801, ensure that directories to install to are created before # trying to populate them for parallel install. - EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-parallel-make-fix.patch + EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-parallel-make-fix.patch + + # Bug #276637, make munin-graph be terser. No more debug output unless + # --debug is on. + EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.3.4-terser-munin-graph.patch } src_compile() { -- cgit v1.2.3-65-gdbad