From f41b68619bee4bba1a908b36150db16d22468307 Mon Sep 17 00:00:00 2001 From: dipohl Date: Thu, 23 Feb 2017 00:15:13 +0100 Subject: [PATCH] Category Tree: Reduce number of categories monit -> munin nova -> cloud (nova) powermta -> mail (powermta) redis -> search (redis) and system (redis) --- plugins/monit/monit_parser | 2 +- plugins/mpd/mpdstats_ | 2 +- plugins/nova/nova_floating_ips | 2 +- plugins/nova/nova_instance_ | 2 +- plugins/nova/nova_instance_launched | 2 +- plugins/nova/nova_instance_timing | 2 +- plugins/nova/nova_services | 2 +- plugins/powermta/powermta_vmta_recpients | 2 +- plugins/redis/redis-speed | 2 +- plugins/redis/redis_ | 12 ++++++------ plugins/redis/resque | 10 +++++----- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/monit/monit_parser b/plugins/monit/monit_parser index 31261a56..8cdb36b1 100755 --- a/plugins/monit/monit_parser +++ b/plugins/monit/monit_parser @@ -113,7 +113,7 @@ elif action == 'config': procs = parse_processes() print('graph_title Per process stats from Monit') print('graph_vlabel usage of memory [kB] or cpu [%]') - print('graph_category monit') + print('graph_category munin') for process in procs: for stat in procs[process]: print("monit_%s_%s.label %s.%s" % (sanitize(process), stat, process, stat)) diff --git a/plugins/mpd/mpdstats_ b/plugins/mpd/mpdstats_ index 35381fa9..f9d0360a 100755 --- a/plugins/mpd/mpdstats_ +++ b/plugins/mpd/mpdstats_ @@ -124,7 +124,7 @@ case "$1" in get_mpd_stats_keys ;; config) - echo "graph_category MPD" + echo "graph_category streaming" echo "graph_args --base 1000 -l 0" echo "graph_scale no" if [ -z "$ACTION" ]; then diff --git a/plugins/nova/nova_floating_ips b/plugins/nova/nova_floating_ips index 8cf6496d..6b7e95ba 100755 --- a/plugins/nova/nova_floating_ips +++ b/plugins/nova/nova_floating_ips @@ -35,7 +35,7 @@ def print_config(): print 'graph_title Nova Floating IPs' print 'graph_vlabel IPs' print 'graph_args --base 1000 --lower-limit 0' - print 'graph_category nova' + print 'graph_category cloud' print 'graph_scale no' print 'graph_info This graph shows the number of Floating IPs in Nova and their status' for state in states: diff --git a/plugins/nova/nova_instance_ b/plugins/nova/nova_instance_ index 32f7de5c..d34730b7 100755 --- a/plugins/nova/nova_instance_ +++ b/plugins/nova/nova_instance_ @@ -75,7 +75,7 @@ def print_config(metric): print 'graph_title Nova Instance %s' % metric print 'graph_vlabel instances' print 'graph_args --base 1000 --lower-limit 0' - print 'graph_category nova' + print 'graph_category cloud' print 'graph_scale no' print 'graph_info This graph shows the number of instances by %s' % metric for state in states: diff --git a/plugins/nova/nova_instance_launched b/plugins/nova/nova_instance_launched index cdd82424..2e80c2ce 100755 --- a/plugins/nova/nova_instance_launched +++ b/plugins/nova/nova_instance_launched @@ -32,7 +32,7 @@ def print_config(): print 'graph_title Nova Instances Launched' print 'graph_vlabel qty' print 'graph_args --base 1000 --lower-limit 0' - print 'graph_category nova' + print 'graph_category cloud' print 'graph_scale no' print 'graph_info This graph shows the number of instances launched since the beginning of time' print 'instances.label instances' diff --git a/plugins/nova/nova_instance_timing b/plugins/nova/nova_instance_timing index 243775af..8e59ca0e 100755 --- a/plugins/nova/nova_instance_timing +++ b/plugins/nova/nova_instance_timing @@ -33,7 +33,7 @@ def print_config(): print 'graph_title Nova Launch Times' print 'graph_vlabel seconds' print 'graph_args --base 1000 --lower-limit 0' - print 'graph_category nova' + print 'graph_category cloud' print 'graph_scale no' print 'graph_info This the average time for the last 5 schedulings/launchings' print 'schedule.label schedule time' diff --git a/plugins/nova/nova_services b/plugins/nova/nova_services index 0daf67ee..d12823ea 100755 --- a/plugins/nova/nova_services +++ b/plugins/nova/nova_services @@ -30,7 +30,7 @@ def print_config(): print 'graph_title Nova Services' print 'graph_vlabel qty' print 'graph_args --base 1000 --lower-limit 0' - print 'graph_category nova' + print 'graph_category cloud' print 'graph_scale no' print 'graph_info Nova services - alive and active' for service in services: diff --git a/plugins/powermta/powermta_vmta_recpients b/plugins/powermta/powermta_vmta_recpients index f873dc99..f4fb697e 100755 --- a/plugins/powermta/powermta_vmta_recpients +++ b/plugins/powermta/powermta_vmta_recpients @@ -16,7 +16,7 @@ case $1 in echo "graph_title RGMTA2 PMTA VMTA $vmta Recipents" echo "graph_vlabel recipents" echo "graph_scale no" -echo "graph_category PowerMTA" +echo "graph_category mail" for i in ${queues[@]};do queue=(`pmta show queue $i`) unset queue[0] diff --git a/plugins/redis/redis-speed b/plugins/redis/redis-speed index 9864e6b6..fd190da3 100755 --- a/plugins/redis/redis-speed +++ b/plugins/redis/redis-speed @@ -50,7 +50,7 @@ if ( $config ) { print "ping.label PING time\n"; print "get.label GET time\n"; print "set.label SET time\n"; - print "graph_category redis\n"; + print "graph_category search\n"; exit 0; } diff --git a/plugins/redis/redis_ b/plugins/redis/redis_ index 2d61ca9d..55474435 100755 --- a/plugins/redis/redis_ +++ b/plugins/redis/redis_ @@ -80,7 +80,7 @@ switch ($0) { my $maxclients= get_config("maxclients")->{"maxclients"}; print "graph_title ${TITLE_PREFIX}Connected clients\n"; print "graph_vlabel Connected clients\n"; - print "graph_category redis\n"; + print "graph_category search\n"; print "graph_args -l 0\n"; print "connected_clients.line $maxclients:ff0000:Limit\n"; print "connected_clients.label connected clients\n"; @@ -95,7 +95,7 @@ switch ($0) { if ( $config ) { print "graph_title ${TITLE_PREFIX}Keys Per Second\n"; print "graph_vlabel per \${graph_period}\n"; - print "graph_category redis\n"; + print "graph_category search\n"; print "graph_args -l 0\n"; print "hits.label hits\n"; print "hits.type COUNTER\n"; @@ -118,7 +118,7 @@ switch ($0) { if ( $config ) { print "graph_title ${TITLE_PREFIX}Key Hit vs Miss Ratio\n"; print "graph_vlabel per \${graph_period}\n"; - print "graph_category redis\n"; + print "graph_category search\n"; print "graph_args -u 100 -l 0 -r --base 1000\n"; print "hitratio.label hit ratio\n"; print "hitratio.type GAUGE\n"; @@ -145,7 +145,7 @@ switch ($0) { if ( $config ) { print "graph_title ${TITLE_PREFIX}Per second\n"; print "graph_vlabel per \${graph_period}\n"; - print "graph_category redis\n"; + print "graph_category search\n"; print "graph_args -l 0\n"; print "requests.label requests\n"; print "requests.type COUNTER\n"; @@ -164,7 +164,7 @@ switch ($0) { my $maxmemory = get_config("maxmemory")->{"maxmemory"}; print "graph_title ${TITLE_PREFIX}Used memory\n"; print "graph_vlabel Used memory\n"; - print "graph_category redis\n"; + print "graph_category search\n"; print "graph_args -l 0 --base 1024\n"; print "used_memory.line $maxmemory:ff0000:Limit\n"; print "used_memory.label used memory\n"; @@ -189,7 +189,7 @@ switch ($0) { if ( $config ) { print "graph_title ${TITLE_PREFIX}Used keys\n"; print "graph_vlabel Used keys\n"; - print "graph_category redis\n"; + print "graph_category search\n"; print "graph_args -l 0\n"; foreach my $db (keys %{$dbs}) { diff --git a/plugins/redis/resque b/plugins/redis/resque index 38be29f2..23b75c73 100755 --- a/plugins/redis/resque +++ b/plugins/redis/resque @@ -48,7 +48,7 @@ my $opt = $0 ? $0 : 'default'; if ($opt eq 'failed') { if ($config) { print "graph_title Resque Failure rate\n"; - print "graph_category Resque\n"; + print "graph_category system\n"; print "graph_info This graph shows resque jobs that failed\n"; print "graph_args --lower-limit 0\n"; print 'graph_vlabel fails/s\n'; @@ -64,7 +64,7 @@ if ($opt eq 'failed') { elsif ($opt eq 'queues') { if ($config) { print "graph_title Resque queue rates\n"; - print "graph_category Resque\n"; + print "graph_category system\n"; print "graph_vlabel queue rates/s\n"; print "graph_info This graph monitors the in and out rate of the queues\n"; print "graph_args --lower-limit 0\n"; @@ -97,7 +97,7 @@ elsif ($opt eq 'queues') { elsif ($opt eq 'queues_size') { if ($config) { print "graph_title Resque queue current size\n"; - print "graph_category Resque\n"; + print "graph_category system\n"; print "graph_vlabel queue size\n"; print "graph_info This graph monitors the current queues size\n"; print "graph_args --lower-limit 0\n"; @@ -133,7 +133,7 @@ elsif ($opt eq 'queues_size') { elsif ($opt eq 'workers_count') { if ($config) { print "graph_title Resque Workers Count\n"; - print "graph_category Resque\n"; + print "graph_category system\n"; print "graph_info This graph shows number of resque workers\n"; print "graph_args --lower-limit 0\n"; print "graph_vlabel workers\n"; @@ -149,7 +149,7 @@ elsif ($opt eq 'workers_count') { elsif ($opt eq 'workers_working') { if ($config) { print "graph_title Resque Workers in use\n"; - print "graph_category Resque\n"; + print "graph_category system\n"; print "graph_info This graph shows the \%age of resque workers busy\n"; print "graph_args --lower-limit 0 --upper-limit 100\n"; print "graph_vlabel %\n";