diff --git a/plugins/gearman/gearman_workers b/plugins/gearman/gearman_workers index 618db2dc..2fe602c6 100755 --- a/plugins/gearman/gearman_workers +++ b/plugins/gearman/gearman_workers @@ -35,7 +35,7 @@ if (defined $ARGV[0] and $ARGV[0] eq 'config') { print "graph_title Gearman workers\n"; print "graph_args --base 1000\n"; print "graph_vlabel workers\n"; - print "graph_category Gearman\n"; + print "graph_category other\n"; foreach my $key (@sorted) { my $param = $key."_"."total"; print "$param.type GAUGE\n"; diff --git a/plugins/snmp/snmp__netscaler_connections b/plugins/netscaler/snmp__netscaler_connections similarity index 99% rename from plugins/snmp/snmp__netscaler_connections rename to plugins/netscaler/snmp__netscaler_connections index 717145dc..d8048643 100755 --- a/plugins/snmp/snmp__netscaler_connections +++ b/plugins/netscaler/snmp__netscaler_connections @@ -130,7 +130,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") { print "graph_args --base 1024 -l 0\n"; print "graph_vlabel Connections\n"; print "graph_title Netscaler Connections for $o_host\n"; - print "graph_category netscaler\n"; + print "graph_category loadbalancer\n"; print "graph_period second\n"; print "graph_info This graph shows the netscaler TCP connections.\n"; print "graph_order ", diff --git a/plugins/snmp/snmp__netscaler_cpu b/plugins/netscaler/snmp__netscaler_cpu similarity index 99% rename from plugins/snmp/snmp__netscaler_cpu rename to plugins/netscaler/snmp__netscaler_cpu index ac81ff11..b9ff57f1 100755 --- a/plugins/snmp/snmp__netscaler_cpu +++ b/plugins/netscaler/snmp__netscaler_cpu @@ -147,7 +147,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") { print "graph_vlabel %\n"; print "graph_scale no\n"; print "graph_title CPU usage for $o_host\n"; - print "graph_category netscaler\n"; + print "graph_category loadbalancer\n"; print "graph_period second\n"; print "graph_info This graph shows how CPU time is spent.\n"; print "avg.label avg\n"; diff --git a/plugins/nfs/nfsv4 b/plugins/nfs/nfsv4 index 4eb8e563..1de3e7e0 100755 --- a/plugins/nfs/nfsv4 +++ b/plugins/nfs/nfsv4 @@ -61,7 +61,7 @@ if [ "$1" = "config" ]; then echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel requests / ${graph_period}' echo 'graph_total total' - echo 'graph_category NFS' + echo 'graph_category fs' for a in $proc ; do echo "$a.label $a" ; echo "$a.type DERIVE"; echo "$a.min 0"; done exit 0 fi diff --git a/plugins/other/passenger_memory b/plugins/passenger/passenger_memory similarity index 100% rename from plugins/other/passenger_memory rename to plugins/passenger/passenger_memory diff --git a/plugins/other/passenger_processes b/plugins/passenger/passenger_processes similarity index 100% rename from plugins/other/passenger_processes rename to plugins/passenger/passenger_processes diff --git a/plugins/passenger/passenger_status b/plugins/passenger/passenger_status index 5fd24419..cd3e2a17 100755 --- a/plugins/passenger/passenger_status +++ b/plugins/passenger/passenger_status @@ -2,7 +2,7 @@ def output_config puts <<-END -graph_category passenger +graph_category webserver graph_title status graph_vlabel count graph_info This graph shows how much passenger process are working, available and how much queries are waiting. @@ -52,4 +52,4 @@ if ARGV[0] == "config" output_config else output_values -end \ No newline at end of file +end diff --git a/plugins/reddit_karma/reddit_karma_ b/plugins/reddit_karma/reddit_karma_ index 855cd478..b7389846 100755 --- a/plugins/reddit_karma/reddit_karma_ +++ b/plugins/reddit_karma/reddit_karma_ @@ -49,7 +49,7 @@ if [ "$1" = "config" ]; then echo 'graph_args --base 1000' echo 'graph_scale no' echo 'graph_vlabel Link Karma' - echo 'graph_category Reddit' + echo 'graph_category other' echo 'comment_karma.label Comment Karma' echo 'comment_karma.draw LINE' echo 'link_karma.label Link Karma' diff --git a/plugins/requesttracker/rt_ticket_loadtime b/plugins/requesttracker/rt_ticket_loadtime index 9f0b9d5d..e7629329 100755 --- a/plugins/requesttracker/rt_ticket_loadtime +++ b/plugins/requesttracker/rt_ticket_loadtime @@ -89,7 +89,7 @@ if [ "$1" = "config" ]; then echo "graph_title RT ticket loadtime" echo "graph_args --base 1000 -l 0" echo "graph_vlabel Loadtime in seconds" - echo "graph_category requesttracker" + echo "graph_category other" echo "graph_info This graph shows the loadtime in seconds of RT ticket $ticket_id" echo "webui.label loadtime WebUI" echo "webui.max 300" diff --git a/plugins/riak/riak_fsm_time_95 b/plugins/riak/riak_fsm_time_95 index c00cd7fc..0df440f7 100644 --- a/plugins/riak/riak_fsm_time_95 +++ b/plugins/riak/riak_fsm_time_95 @@ -27,7 +27,7 @@ def doConfig(): print "graph_title 95th percentile of FSM time" print "graph_args --base 1000" print "graph_vlabel gets (-) puts (+) in ms" - print "graph_category Riak" + print "graph_category other" print "graph_info Response time, in milliseconds, met or beaten by 95% of riak_kv_get_fsm executions." print "get_fsm_time_95.label vnode_gets" diff --git a/plugins/riak/riak_memory b/plugins/riak/riak_memory index c1bf08b5..5f99c0f0 100755 --- a/plugins/riak/riak_memory +++ b/plugins/riak/riak_memory @@ -38,7 +38,7 @@ def doConfig(): print "graph_title Riak memory" print "graph_args --base 1000 -l 0" print "graph_vlabel memory" - print "graph_category Riak" + print "graph_category other" for name in names: print name + ".label " + name diff --git a/plugins/riak/riak_node b/plugins/riak/riak_node index 1d3dcc89..cc193bc8 100755 --- a/plugins/riak/riak_node +++ b/plugins/riak/riak_node @@ -38,7 +38,7 @@ def doConfig(): print "graph_title Riak puts and gets" print "graph_args --base 1000 -l 0" print "graph_vlabel puts/gets" - print "graph_category Riak" + print "graph_category other" for name in names: print name + ".label " + name diff --git a/plugins/sge/sge_job_stats b/plugins/sge/sge_job_stats index f04d4cad..fe2c1087 100755 --- a/plugins/sge/sge_job_stats +++ b/plugins/sge/sge_job_stats @@ -32,7 +32,7 @@ if [ "$1" = "config" ] then echo graph_title SGE gridengine jobs echo graph_vlabel count - echo graph_category processes + echo graph_category htc echo running.label Running jobs echo running.type GAUGE echo running.draw AREA diff --git a/plugins/sge/sge_queue_ b/plugins/sge/sge_queue_ index ad036245..791ee9ae 100755 --- a/plugins/sge/sge_queue_ +++ b/plugins/sge/sge_queue_ @@ -58,7 +58,7 @@ if [ "$1" = "config" ]; then echo "graph_vlabel Queue slots" echo "graph_scale no" echo "graph_info Shows global Sun Grid Engine queue state." - echo "graph_category SGE" + echo "graph_category htc" echo "graph_period minute" echo "used.label Used" echo "used.draw AREA" diff --git a/plugins/sge/sge_queue_xml_ b/plugins/sge/sge_queue_xml_ index bc026914..b20d088f 100644 --- a/plugins/sge/sge_queue_xml_ +++ b/plugins/sge/sge_queue_xml_ @@ -56,7 +56,7 @@ if [ "$1" = "config" ]; then echo "graph_vlabel Queue slots" echo "graph_scale no" echo "graph_info Shows global Grid Engine queue state." - echo "graph_category SGE" + echo "graph_category htc" echo "graph_period minute" echo "used.label Used" echo "used.draw AREA" diff --git a/plugins/forums/smf_errors b/plugins/smf/smf_errors similarity index 98% rename from plugins/forums/smf_errors rename to plugins/smf/smf_errors index e0fe43d6..5a2dc249 100644 --- a/plugins/forums/smf_errors +++ b/plugins/smf/smf_errors @@ -41,7 +41,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config') { print <