From d3ec292809db3e26585e2b54bb390c35baa118a6 Mon Sep 17 00:00:00 2001 From: dipohl Date: Mon, 20 Feb 2017 18:32:37 +0100 Subject: [PATCH] Category Tree: Reduce number of categories --- plugins/apt/deb_packages/deb_packages.py | 110 +++++++++++++++++- .../example-graphs/deb_packages.py-week.png | Bin 0 -> 22153 bytes plugins/db2/db2_cnx | 2 +- plugins/mail/amavis-debian | 2 +- plugins/mail/amavis_ | 6 +- plugins/mail/amavis_awk | 2 +- plugins/mail/clamav | 2 +- plugins/mail/mailman-queue-check | 2 +- plugins/mail/mailman_subscribers | 2 +- 9 files changed, 118 insertions(+), 10 deletions(-) create mode 100644 plugins/apt/deb_packages/example-graphs/deb_packages.py-week.png diff --git a/plugins/apt/deb_packages/deb_packages.py b/plugins/apt/deb_packages/deb_packages.py index f0c37e11..c15ef299 100755 --- a/plugins/apt/deb_packages/deb_packages.py +++ b/plugins/apt/deb_packages/deb_packages.py @@ -500,7 +500,7 @@ class PackageStat(defaultdict): "multigraph {graphName}_{type}\n"\ "graph_title {type} Debian packages sorted by {option}\n"\ "graph_info {type} Debian packages sorted by {option} of its repository\n"\ - "graph_category debian\n"\ + "graph_category security\n"\ "graph_vlabel packages".format(**d) def printConfig(self): @@ -855,3 +855,111 @@ if __name__=='__main__': muninPlugin = Munin() muninPlugin.execute() # import IPython; IPython.embed() + + +### The following is the smart_ plugin documentation, intended to be used with munindoc + +""" +=head1 NAME + +deb_packages - plugin to monitor update resources and pending packages on Debian + +=head1 APPLICABLE SYSTEMS + +This plugin has checked on Debian - Wheezy and squeeze. If you want to use it +on older installations, tell me whether it works or which errors you had. It +shoud run past python-apt 0.7 and python 2.5. + +=head1 DESCRIPTION + +With this plugin munin can give you a nice graph and some details where your +packages come from, how old or new your installation is. Furtermore it tells +you how many updates you should have been installed, how many packages are +outdated and where they come from. + +You can sort installed or upgradable Packages by 'archive', 'origin', 'site', +'label' and 'component' and even some of them at once. + +The script uses caching cause it is quite expensive. It saves the output to a +cachefile and checks on each run, if dpkg-status or downloaded Packagefile have +changed. If one of them has changed, it runs, if not it gives you the cached +version + +=head1 INSTALLATION + +check out this git repository from + +=over 2 + + aptitude install python-apt + git clone git://github.com/munin-monitoring/contrib.git + cd contrib/plugins/apt/deb_packages + sudo cp deb_packages.py /etc/munin/plugins/deb_packages + sudo cp deb_packages.munin-conf /etc/munin/plugin-conf.d/deb_packages + +=back + +Verify the installation by + +=over 2 + + sudo munin-run deb_packages + +=back + + +=head1 CONFIGURATION + +If you copied deb_packages.munin-conf to plugin-conf.d you have a starting point. + +A typical configuration looks like this + +=over 2 + + [deb_packages] + # plugin is quite expensive and has to write statistics to cache output + # so it has to write to plugins.cache + user munin + + # Packagelists to this size are printed as extra information to munin.extinfo + env.MAX_LIST_SIZE_EXT_INFO 50 + + # Age in seconds an $CACHE_FILE can be. If it is older, the script updates + # default if not set is 3540 (one hour) + # at the moment this is not used, the plugin always runs (if munin calls it) + # + env.CACHE_FILE_MAX_AGE 3540 + + # All these numbers are only for sorting, so you can use env.graph01_sort_by_0 + # and env.graph01_sort_by_2 without using env.graph01_sort_by_1. + # sort_by values ... + # possible values are 'label', 'archive', 'origin', 'site', 'component' + env.graph00_type installed + env.graph00_sort_by_0 label + env.graph00_sort_by_1 archive + env.graph00_show_ext_0 origin + env.graph00_show_ext_1 site + + env.graph01_type upgradable + env.graph01_sort_by_0 label + env.graph01_sort_by_1 archive + env.graph01_show_ext_0 origin + env.graph01_show_ext_1 site + +=back + +You can sort_by one or some of these possible Values + + +=head1 AUTHOR + +unknown + +=head1 LICENSE + +Default for Munin contributions is GPLv2 (http://www.gnu.org/licenses/gpl-2.0.txt) + +=cut + + +""" diff --git a/plugins/apt/deb_packages/example-graphs/deb_packages.py-week.png b/plugins/apt/deb_packages/example-graphs/deb_packages.py-week.png new file mode 100644 index 0000000000000000000000000000000000000000..4c2515d0b8ba1ef36285f5c6926d7a6d9293ec10 GIT binary patch literal 22153 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 eg*>U#jck-; $HOME/run/$(basename $0).txt diff --git a/plugins/mail/amavis-debian b/plugins/mail/amavis-debian index 18ac8658..62fa352f 100755 --- a/plugins/mail/amavis-debian +++ b/plugins/mail/amavis-debian @@ -47,7 +47,7 @@ fi if [ "$1" = "config" ]; then echo 'graph_title Amavis filter statistics' - echo 'graph_category postfix' + echo 'graph_category antivirus' echo 'graph_order total clean spam virus other' echo 'graph_vlabel Mails filtered' echo 'graph_scale no' diff --git a/plugins/mail/amavis_ b/plugins/mail/amavis_ index ca14adba..c27d9cb2 100755 --- a/plugins/mail/amavis_ +++ b/plugins/mail/amavis_ @@ -69,7 +69,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") { if ($stats_type eq "cache") { print "graph_title Amavis cache hit / miss ratio\n"; print "graph_args --lower-limit 0 --upper-limit 100 --rigid\n"; - print "graph_category mail\n"; + print "graph_category antivirus\n"; print "graph_info The ratio of cache hits and misses for AMaViSd-new.\n"; print "graph_order hits misses\n"; print "graph_scale no\n"; @@ -84,7 +84,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") { print "misses.min 0\n"; } elsif ($stats_type eq "content") { print "graph_title Amavis scanned mails\n"; - print "graph_category mail\n"; + print "graph_category antivirus\n"; print "graph_period minute\n"; print "graph_vlabel msgs / \${graph_period}\n"; foreach my $type (qw(total clean spam spammy virus)) { @@ -100,7 +100,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") { } elsif ($stats_type eq "time") { print "graph_title Amavis average scan time\n"; print "graph_info Average time spent in each phase of the mail scanning process, per mail.\n"; - print "graph_category mail\n"; + print "graph_category antivirus\n"; print "graph_vlabel sec / mail\n"; print "graph_scale no\n"; diff --git a/plugins/mail/amavis_awk b/plugins/mail/amavis_awk index ca361ec6..04a7a942 100755 --- a/plugins/mail/amavis_awk +++ b/plugins/mail/amavis_awk @@ -33,7 +33,7 @@ fi if [ "$1" = "config" ]; then echo 'graph_title Amavis message filtering' - echo 'graph_category mail' + echo 'graph_category antivirus' echo 'graph_vlabel Mails per minute' echo 'graph_args --base 1000 -l 0' diff --git a/plugins/mail/clamav b/plugins/mail/clamav index 46565d77..042a3d4e 100755 --- a/plugins/mail/clamav +++ b/plugins/mail/clamav @@ -18,7 +18,7 @@ if [ "$1" = "config" ]; then graph_title ClamAV stats graph_args --base 1000 -l 0 graph_vlabel virus/day -graph_category Mail +graph_category antivirus virus.label virus virus.type DERIVE virus.min 0 diff --git a/plugins/mail/mailman-queue-check b/plugins/mail/mailman-queue-check index 4c75c792..3a9deab3 100755 --- a/plugins/mail/mailman-queue-check +++ b/plugins/mail/mailman-queue-check @@ -17,7 +17,7 @@ if [ "$1" = "config" ]; then echo "graph_title Mailman Queue" - echo "graph_category mailman" + echo "graph_category mailinglist" echo "graph_args --base 1000 -l 0" echo "archive.label Archive" echo "archive.draw LINE2" diff --git a/plugins/mail/mailman_subscribers b/plugins/mail/mailman_subscribers index 85181e73..a5809d4f 100755 --- a/plugins/mail/mailman_subscribers +++ b/plugins/mail/mailman_subscribers @@ -58,7 +58,7 @@ if ($ARGV[0] and $ARGV[0] eq "config" ){ print "graph_args --base 1000 -l 0\n"; print "graph_scale yes\n"; print "graph_vlabel subscribers\n"; - print "graph_category mailman\n"; + print "graph_category mailinglist\n"; print "graph_total Total\n"; print 'graph_info Plugin available at http://rodolphe.quiedeville.org/hack/munin/mailman/'."\n";