From e00b066f2dcaac4a5df12f46c1aa39d810906c48 Mon Sep 17 00:00:00 2001 From: dipohl Date: Mon, 20 Feb 2017 22:14:23 +0100 Subject: [PATCH] Category Tree: Reduce number of categories --- plugins/backuppc/backuppc | 6 +++--- plugins/bacula/bacula_job | 2 +- plugins/bacula/bacula_sd | 2 +- plugins/dspam/dspam_ | 6 +++--- plugins/dspam/dspam_activity | 2 +- plugins/raspberry-pi/raspi_temp | 2 +- plugins/s3/s3_items | 2 +- plugins/s3/s3_storage | 2 +- plugins/sensors/allnet__ | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/backuppc/backuppc b/plugins/backuppc/backuppc index 7d80cb93..ea5f3cf8 100755 --- a/plugins/backuppc/backuppc +++ b/plugins/backuppc/backuppc @@ -28,7 +28,7 @@ if [ "$1" = "config" ]; then echo "graph_title BackupPC - Last Backup Size" echo "graph_args --base 1024 -l 0" echo "graph_vlabel Bytes" - echo "graph_category Backuppc" + echo "graph_category backup" for h in ${HOSTS} do @@ -40,7 +40,7 @@ if [ "$1" = "config" ]; then echo "graph_title BackupPC - Last Backup Age" echo "graph_args -l 0" echo "graph_vlabel days" - echo "graph_category Backuppc" + echo "graph_category backup" for h in ${HOSTS} do @@ -57,7 +57,7 @@ if [ "$1" = "config" ]; then echo "graph_title BackupPC - Last Full Backup Age" echo "graph_args -l 0" echo "graph_vlabel days" - echo "graph_category Backuppc" + echo "graph_category backup" for h in ${HOSTS} do diff --git a/plugins/bacula/bacula_job b/plugins/bacula/bacula_job index 2dffa984..0774712e 100755 --- a/plugins/bacula/bacula_job +++ b/plugins/bacula/bacula_job @@ -118,7 +118,7 @@ def print_config(): print "graph_args --base 1024 -l 0" print "graph_scale yes" print "graph_info Bacula Job measurement." - print "graph_category Bacula" + print "graph_category backup" print "graph_order", for fd in clients: print fd[1], diff --git a/plugins/bacula/bacula_sd b/plugins/bacula/bacula_sd index 6ce537ae..7cb0922d 100755 --- a/plugins/bacula/bacula_sd +++ b/plugins/bacula/bacula_sd @@ -106,7 +106,7 @@ def print_config(): print "graph_args --base 1024 -l 0" print "graph_scale yes" print "graph_info Bacula Storage Daemon througput measurement based on written bytes. This may be somewhat inacurate whenever a tape is changed." - print "graph_category Bacula" + print "graph_category backup" print "graph_order", for dev in devstats: print dev[2], diff --git a/plugins/dspam/dspam_ b/plugins/dspam/dspam_ index 5f95927e..0704409c 100755 --- a/plugins/dspam/dspam_ +++ b/plugins/dspam/dspam_ @@ -368,7 +368,7 @@ print_config() { fi echo "graph_title Accuracy for $uid" - echo graph_category dspam + echo graph_category spamfilter echo graph_args --base 1000 --upper-limit 100 --rigid echo graph_vlabel Accuracy in % echo "graph_info This graph shows the current DSPAM Overall Accuracy for $uid ($uid_count uids). Overall Accuracy is the percentage of messages that is classified correctly as either ham or spam." @@ -406,7 +406,7 @@ print_config() { fi echo "graph_title Processed messages for $uid (%)" - echo graph_category dspam + echo graph_category spamfilter echo graph_args --base 1000 --upper-limit 100 --rigid echo graph_vlabel Messages in % echo "graph_info This graph shows the messages that DSPAM processed for $uid ($uid_count uids) in percentages of all processed messages. Messages are divided in the following categories: true positives/negatives, false positives/negatives, and corpusfed ham/spam." @@ -451,7 +451,7 @@ print_config() { fi echo "graph_title Processed messages for $uid" - echo graph_category dspam + echo graph_category spamfilter echo graph_args --base 1000 echo graph_vlabel Messages echo graph_total Total diff --git a/plugins/dspam/dspam_activity b/plugins/dspam/dspam_activity index 39ffd5bf..b4e1f952 100755 --- a/plugins/dspam/dspam_activity +++ b/plugins/dspam/dspam_activity @@ -169,7 +169,7 @@ print_config() { debug printing config echo "graph_title DSPAM activity" - echo graph_category dspam + echo graph_category spamfilter echo graph_args --base 1000 echo graph_vlabel Messages / \${graph_period} echo graph_period minute diff --git a/plugins/raspberry-pi/raspi_temp b/plugins/raspberry-pi/raspi_temp index eb4b5028..733271b7 100755 --- a/plugins/raspberry-pi/raspi_temp +++ b/plugins/raspberry-pi/raspi_temp @@ -40,7 +40,7 @@ case $1 in graph_title BCM2835 core temperature graph_vlabel temp in C graph_args --base 1000 -l 0 -graph_category Temperature +graph_category sensors temp.label Temperature temp.warning 60 temp.critical 85 diff --git a/plugins/s3/s3_items b/plugins/s3/s3_items index 2c7277d3..44511240 100755 --- a/plugins/s3/s3_items +++ b/plugins/s3/s3_items @@ -66,7 +66,7 @@ if ( $ARGV[0] eq "config" ) { # The headers print "graph_title S3 Items\n"; - print "graph_category s3\n"; + print "graph_category cloud\n"; print "graph_vlabel items\n"; print 'graph_info Plugin available at http://www.ohardt.com/dev/munin/' . "\n"; diff --git a/plugins/s3/s3_storage b/plugins/s3/s3_storage index e579dba3..ac73a125 100755 --- a/plugins/s3/s3_storage +++ b/plugins/s3/s3_storage @@ -61,7 +61,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") { # The headers print "graph_title S3 Storage Usage\n"; - print "graph_category s3\n"; + print "graph_category cloud\n"; print "graph_args --base 1024 -l 0\n"; print "graph_vlabel bytes\n"; print "graph_info Plugin available at https://github.com/aptivate/munin-contrib/blob/master/plugins/s3/s3_storage\n"; diff --git a/plugins/sensors/allnet__ b/plugins/sensors/allnet__ index 6a25749b..96fb7e0a 100755 --- a/plugins/sensors/allnet__ +++ b/plugins/sensors/allnet__ @@ -155,7 +155,7 @@ if ((@ARGV > 0) && ($ARGV[0] eq "config")) { print("graph_args --lower-limit 0\n"); print("graph_vlabel Ampere\n"); } - print("graph_category envsensors\n"); + print("graph_category sensors\n"); print("host_name $hostname\n"); } my $sensordata = XMLin($sensorxml, KeyAttr => { }, ForceArray => [ 'data' ] );