From 3ad41d6a4abf18f229fa8caded7a2194c97a4a56 Mon Sep 17 00:00:00 2001 From: dipohl Date: Thu, 23 Feb 2017 04:29:44 +0100 Subject: [PATCH] Category Tree: Reduce number of categories squid -> webserver (squid) openfire -> chate nfs -> fs xastir -> radio --- plugins/emc/emc_vnx_file_ | 26 ++++++++++----------- plugins/hdfs/hadoop-under_replicated-blocks | 2 +- plugins/{network => nfs}/nfsv4 | 0 plugins/openfire/openfire_ | 16 ++++++------- plugins/squid/squid | 20 ++++++++-------- plugins/squid/squid_efficiency | 2 +- plugins/squid/squid_times | 2 +- plugins/xastir/xastir | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) rename plugins/{network => nfs}/nfsv4 (100%) diff --git a/plugins/emc/emc_vnx_file_ b/plugins/emc/emc_vnx_file_ index 0ccd520d..ed5271a4 100755 --- a/plugins/emc/emc_vnx_file_ +++ b/plugins/emc/emc_vnx_file_ @@ -300,7 +300,7 @@ if [ "$1" = "config" ] ; then multigraph vnx_emc_v3_calls_s graph_title EMC VNX 5300 NFSv3 Calls per second graph_vlabel Calls - graph_category nfs + graph_category fs graph_args --base 1000 EOF for graph in "${graphs[@]}"; do @@ -313,7 +313,7 @@ if [ "$1" = "config" ] ; then multigraph vnx_emc_v3_usec_call graph_title EMC VNX 5300 NFSv3 uSeconds per call graph_vlabel uSec / call - graph_category nfs + graph_category fs graph_args --base 1000 EOF for graph in "${graphs[@]}"; do @@ -326,7 +326,7 @@ if [ "$1" = "config" ] ; then graph_title EMC VNX 5300 NFSv3 Op % graph_vlabel % graph_scale no - graph_category nfs + graph_category fs EOF for graph in "${graphs[@]}"; do field=$(echo "$graph" | cut -d '.' -f4 ) @@ -341,7 +341,7 @@ if [ "$1" = "config" ] ; then multigraph vnx_emc_v4_calls_s graph_title EMC VNX 5300 NFSv4 Calls per second graph_vlabel Calls - graph_category nfs + graph_category fs graph_args --base 1000 EOF for graph in "${graphs[@]}"; do @@ -354,7 +354,7 @@ if [ "$1" = "config" ] ; then multigraph vnx_emc_v4_usec_call graph_title EMC VNX 5300 NFSv4 uSeconds per call graph_vlabel uSec / call - graph_category nfs + graph_category fs graph_args --base 1000 EOF for graph in "${graphs[@]}"; do @@ -367,7 +367,7 @@ if [ "$1" = "config" ] ; then graph_title EMC VNX 5300 NFSv4 Op % graph_vlabel % graph_scale no - graph_category nfs + graph_category fs EOF for graph in "${graphs[@]}"; do field=$(echo "$graph" | cut -d '.' -f4 ) @@ -386,7 +386,7 @@ if [ "$1" = "config" ] ; then multigraph vnx_emc_nfs_client_ops_s graph_title EMC VNX 5300 NFS Client Ops/s graph_vlabel Ops/s - graph_category nfs + graph_category fs EOF echo -n "graph_order " for graph in "${graphs_array[@]}"; do @@ -408,7 +408,7 @@ if [ "$1" = "config" ] ; then multigraph vnx_emc_nfs_client_b_s graph_title EMC VNX 5300 NFS Client B/s graph_vlabel B/s - graph_category nfs + graph_category fs EOF echo -n "graph_order " for graph in "${graphs_array[@]}"; do @@ -429,7 +429,7 @@ if [ "$1" = "config" ] ; then multigraph vnx_emc_nfs_client_avg_usec graph_title EMC VNX 5300 NFS Client Avg uSec/call graph_vlabel uSec/call - graph_category nfs + graph_category fs EOF for graph in "${graphs_array[@]}"; do field="$(clean_fieldname "_$graph")" @@ -444,7 +444,7 @@ if [ "$1" = "config" ] ; then multigraph vnx_emc_nfs_std_nfs_ops graph_title EMC VNX 5300 Std NFS Ops/s graph_vlabel Ops/s - graph_category nfs + graph_category fs EOF echo "graph_order ${filtered_server}_rops ${filtered_server}_wops ${filtered_server}_tops" echo "${filtered_server}_rops.label $server Read Ops/s" @@ -457,7 +457,7 @@ if [ "$1" = "config" ] ; then multigraph vnx_emc_nfs_std_nfs_b_s graph_title EMC VNX 5300 Std NFS B/s graph_vlabel B/s - graph_category nfs + graph_category fs EOF echo "graph_order ${filtered_server}_rbs ${filtered_server}_wbs ${filtered_server}_tbs" echo "${filtered_server}_rbs.label $server Read B/s" @@ -471,7 +471,7 @@ if [ "$1" = "config" ] ; then multigraph vnx_emc_nfs_std_nfs_avg graph_title EMC VNX 5300 Std NFS Average Size Bytes graph_vlabel Bytes - graph_category nfs + graph_category fs EOF echo "${filtered_server}_avg_readsize.label $server Average Read Size Bytes" echo "${filtered_server}_avg_writesize.label $server Average Write Size Bytes" @@ -481,7 +481,7 @@ if [ "$1" = "config" ] ; then multigraph vnx_emc_nfs_std_nfs_threads graph_title EMC VNX 5300 Std NFS Active Threads graph_vlabel Threads - graph_category nfs + graph_category fs EOF echo "${filtered_server}_threads.label $server Active Threads" fi diff --git a/plugins/hdfs/hadoop-under_replicated-blocks b/plugins/hdfs/hadoop-under_replicated-blocks index 5fc49783..0deda0fe 100755 --- a/plugins/hdfs/hadoop-under_replicated-blocks +++ b/plugins/hdfs/hadoop-under_replicated-blocks @@ -8,7 +8,7 @@ case $1 in config) cat <<'EOM' graph_title Under Replicated Blocks Hadoop -graph_category hadoop +graph_category fs graph_vlabel block block.label block EOM diff --git a/plugins/network/nfsv4 b/plugins/nfs/nfsv4 similarity index 100% rename from plugins/network/nfsv4 rename to plugins/nfs/nfsv4 diff --git a/plugins/openfire/openfire_ b/plugins/openfire/openfire_ index 8c04ec4a..3e992f9e 100755 --- a/plugins/openfire/openfire_ +++ b/plugins/openfire/openfire_ @@ -73,7 +73,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_args --base 1000 -l 0\n"; print "graph_title Openfire DB Usage\n"; print "graph_vlabel Number of Connections\n"; - print "graph_category Openfire\n"; + print "graph_category chat\n"; print "graph_info The Graph shows Number of DB Connections\n"; print "db_used.draw AREA\ndb_used.label used\ndb_used.type GAUGE\n"; print "db_current.draw STACK\ndb_current.label current\ndb_current.type GAUGE\n"; @@ -85,7 +85,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_scale no\n"; print "graph_title Openfire Threads\n"; print "graph_vlabel Number of Threads\n"; - print "graph_category Openfire\n"; + print "graph_category chat\n"; print "graph_info The Graph shows Number of Threads\n"; print "thread_core.draw AREA\nthread_core.label Core Threads\nthread_core.type GAUGE\n"; print "thread_active.draw STACK\nthread_active.label active Threads\nthread_active.type GAUGE\n"; @@ -95,7 +95,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_scale no\n"; print "graph_title Openfire Tasks\n"; print "graph_vlabel Number of Tasks\n"; - print "graph_category Openfire\n"; + print "graph_category chat\n"; print "graph_info The Graph shows Number of Tasks\n"; print "task_queue.draw AREA\ntask_queue.label queued Tasks\ntask_queue.type GAUGE\n"; print "task_completed.draw STACK\ntask_completed.label completed Tasks\ntask_completed.type DERIVE\n"; @@ -105,7 +105,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_scale no\n"; print "graph_title Openfire Sessions\n"; print "graph_vlabel Number of Sessions\n"; - print "graph_category Openfire\n"; + print "graph_category chat\n"; print "graph_info The Graph shows Number of Jabber Sessions\n"; print "sessions.label Jabber Sessions\nsessions.type GAUGE\n"; } @@ -113,7 +113,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_args --base 1000 -l 0\n"; print "graph_title Openfire I/O (NIO)\n"; print "graph_vlabel Reads/Writes per \${graph_period} in (-) / out (+)\n"; - print "graph_category Openfire\n"; + print "graph_category chat\n"; print "graph_info The Graph shows Number of Stanzas\n"; print "nio_written.label nio\nnio_written.draw LINE1\nnio_written.max 10000\nnio_written.min 0\nnio_written.graph no\n"; print "nio_read.label nio\nnio_read.draw LINE1\nnio_read.max 10000\nnio_read.min 0\nnio_read.negative nio_written\nnio_read.type DERIVE\n"; @@ -122,7 +122,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_args --base 1000 -l 0\n"; print "graph_title Openfire Queue\n"; print "graph_vlabel Number of queued Stanzas\n"; - print "graph_category Openfire\n"; + print "graph_category chat\n"; print "graph_info The Graph shows Number of queued Stanzas\n"; print "nio_queued_events.draw AREA\nnio_queued_events.label queued Events\nnio_queued_events.type GAUGE\n"; print "nio_queued_writes.draw STACK\nnio_queued_writes.label queued Writes\nnio_queued_writes.type GAUGE\n"; @@ -131,7 +131,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_args --base 1000 -l 0\n"; print "graph_title Openfire Log Timestamp\n"; print "graph_vlabel Timestamp\n"; - print "graph_category Openfire\n"; + print "graph_category chat\n"; print "graph_info The Graph shows the Timestamp of the Log\n"; print "timestamp.draw AREA\ntimestamp.label Log Timestamp\ntimestamp.type GAUGE\n"; } @@ -173,4 +173,4 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { print "nio_queued_events.value $array[12-$diff]\n"; print "nio_queued_writes.value $array[13-$diff]"; } -} \ No newline at end of file +} diff --git a/plugins/squid/squid b/plugins/squid/squid index 3a84ef86..59afe4fb 100755 --- a/plugins/squid/squid +++ b/plugins/squid/squid @@ -125,7 +125,7 @@ if($ARGV[0] and $ARGV[0] eq "config") $config{$name}{'graph'}{'vlabel'} = '%'; $config{$name}{'graph'}{'args'} = '--lower-limit 0 --upper-limit 100'; $config{$name}{'graph'}{'scale'} = 'no'; - $config{$name}{'graph'}{'category'} = 'squid'; + $config{$name}{'graph'}{'category'} = 'webserver'; $config{$name}{'graph'}{'order'} = 'all bytes memory disk'; $config{$name}{'field'}{'all'}{'draw'} = 'AREA'; $config{$name}{'field'}{'all'}{'label'} = 'Hits of all requests'; @@ -145,7 +145,7 @@ if($ARGV[0] and $ARGV[0] eq "config") $config{'squid_traffic'}{'graph'}{'title'} = 'Traffic statistics'; $config{'squid_traffic'}{'graph'}{'vlabel'} = 'bytes in (-) / out (+) per second'; $config{'squid_traffic'}{'graph'}{'args'} = '--base 1000'; - $config{'squid_traffic'}{'graph'}{'category'} = 'squid'; + $config{'squid_traffic'}{'graph'}{'category'} = 'webserver'; $config{'squid_traffic'}{'graph'}{'order'} = 'client_http_in server_all_in server_http_in server_ftp_in ' . 'server_other_in icp_in icp_q_in icp_r_in cd_in client_http_hit_out ' . 'client_http_out server_all_out server_http_out server_ftp_out ' . @@ -179,7 +179,7 @@ if($ARGV[0] and $ARGV[0] eq "config") $config{'squid_ipcache'}{'graph'}{'title'} = 'IP cache statistics'; $config{'squid_ipcache'}{'graph'}{'vlabel'} = 'Count'; $config{'squid_ipcache'}{'graph'}{'args'} = '--base 1000';# --logarithmic'; - $config{'squid_ipcache'}{'graph'}{'category'} = 'squid'; + $config{'squid_ipcache'}{'graph'}{'category'} = 'webserver'; $config{'squid_ipcache'}{'graph'}{'order'} = 'request hits misses numhits neghits invdreqests entries'; $config{'squid_ipcache'}{'field'}{'entries'}{'label'} = 'Entries'; $config{'squid_ipcache'}{'field'}{'request'}{'label'} = 'Requests'; @@ -195,7 +195,7 @@ if($ARGV[0] and $ARGV[0] eq "config") $config{'squid_requests'}{'graph'}{'title'} = 'Requests statistics'; $config{'squid_requests'}{'graph'}{'vlabel'} = 'errors (-) / requests (+) per second'; $config{'squid_requests'}{'graph'}{'args'} = '--base 1000'; - $config{'squid_requests'}{'graph'}{'category'} = 'squid'; + $config{'squid_requests'}{'graph'}{'category'} = 'webserver'; $config{'squid_requests'}{'graph'}{'order'} = 'client_http_errors server_all_errors server_http_errors ' . 'server_ftp_errors server_other_errors ' . 'client_http_hits aborted_requests client_http_requests ' . @@ -226,7 +226,7 @@ if($ARGV[0] and $ARGV[0] eq "config") $config{'squid_storedir'}{'graph'}{'title'} = 'Store directory statistics'; $config{'squid_storedir'}{'graph'}{'vlabel'} = 'bytes'; $config{'squid_storedir'}{'graph'}{'args'} = '--base 1000'; - $config{'squid_storedir'}{'graph'}{'category'} = 'squid'; + $config{'squid_storedir'}{'graph'}{'category'} = 'webserver'; $config{'squid_storedir'}{'graph'}{'order'} = 'maximum current'; $config{'squid_storedir'}{'field'}{'maximum'}{'label'} = 'Maximum'; $config{'squid_storedir'}{'field'}{'maximum'}{'draw'} = 'AREA'; @@ -238,7 +238,7 @@ if($ARGV[0] and $ARGV[0] eq "config") $config{'squid_memory'}{'graph'}{'title'} = 'Store memory statistics'; $config{'squid_memory'}{'graph'}{'vlabel'} = 'bytes'; $config{'squid_memory'}{'graph'}{'args'} = '--base 1000'; - $config{'squid_memory'}{'graph'}{'category'} = 'squid'; + $config{'squid_memory'}{'graph'}{'category'} = 'webserver'; $config{'squid_memory'}{'graph'}{'order'} = 'mi_tsia mi_ob mi_sb mi_hb mi_fsb mi_fob mi_tiu mi_tf mi_ts ta ma mu'; $config{'squid_memory'}{'field'}{'mi_tsia'}{'label'} = '[mallinfo()] Total space in arena'; $config{'squid_memory'}{'field'}{'mi_ob'}{'label'} = '[mallinfo()] Ordinary blocks'; @@ -261,7 +261,7 @@ if($ARGV[0] and $ARGV[0] eq "config") $config{'squid_meanobject'}{'graph'}{'title'} = 'Mean object size'; $config{'squid_meanobject'}{'graph'}{'vlabel'} = 'bytes'; $config{'squid_meanobject'}{'graph'}{'args'} = '--base 1000'; - $config{'squid_meanobject'}{'graph'}{'category'} = 'squid'; + $config{'squid_meanobject'}{'graph'}{'category'} = 'webserver'; $config{'squid_meanobject'}{'graph'}{'order'} = 'mos'; $config{'squid_meanobject'}{'field'}{'mos'}{'label'} = 'Mean object size'; $config{'squid_meanobject'}{'field'}{'mos'}{'draw'} = 'LINE1'; @@ -270,7 +270,7 @@ if($ARGV[0] and $ARGV[0] eq "config") $config{'squid_cpu'}{'graph'}{'title'} = 'CPU usage'; $config{'squid_cpu'}{'graph'}{'vlabel'} = '%'; $config{'squid_cpu'}{'graph'}{'args'} = '--base 1000 --lower-limit 0'; - $config{'squid_cpu'}{'graph'}{'category'} = 'squid'; + $config{'squid_cpu'}{'graph'}{'category'} = 'webserver'; $config{'squid_cpu'}{'graph'}{'scale'} = 'no'; $config{'squid_cpu'}{'graph'}{'order'} = 'cur av5 av60'; $config{'squid_cpu'}{'field'}{'cur'}{'label'} = 'Current'; @@ -288,7 +288,7 @@ if($ARGV[0] and $ARGV[0] eq "config") $config{'squid_ids'}{'graph'}{'title'} = 'Internal data structures'; $config{'squid_ids'}{'graph'}{'vlabel'} = 'Count'; $config{'squid_ids'}{'graph'}{'args'} = '--lower-limit 0'; - $config{'squid_ids'}{'graph'}{'category'} = 'squid'; + $config{'squid_ids'}{'graph'}{'category'} = 'webserver'; $config{'squid_ids'}{'graph'}{'order'} = 'se sewmo hoci odo'; $config{'squid_ids'}{'field'}{'se'}{'label'} = 'StoreEntries'; $config{'squid_ids'}{'field'}{'se'}{'draw'} = 'LINE1'; @@ -305,7 +305,7 @@ if($ARGV[0] and $ARGV[0] eq "config") $config{$name}{'graph'}{'title'} = "Median service times in ${time} minuts"; $config{$name}{'graph'}{'vlabel'} = 'seconds'; $config{$name}{'graph'}{'args'} = '--base 1000'; - $config{$name}{'graph'}{'category'} = 'squid'; + $config{$name}{'graph'}{'category'} = 'webserver'; $config{$name}{'graph'}{'order'} = 'hra cm ch nh nmr dl iq'; $config{$name}{'field'}{'hra'}{'label'} = 'HTTP Requests (All)'; $config{$name}{'field'}{'hra'}{'draw'} = 'LINE1'; diff --git a/plugins/squid/squid_efficiency b/plugins/squid/squid_efficiency index 86d0a24a..0e4a9ac8 100755 --- a/plugins/squid/squid_efficiency +++ b/plugins/squid/squid_efficiency @@ -60,7 +60,7 @@ port=${squidport:-3128} test "$1" = "config" && { echo 'graph_title Squid Efficiency' echo 'graph_info This graph shows the proxy efficiency over the last five mins.' - echo 'graph_category squid' + echo 'graph_category webserver' echo "graph_args --lower-limit 0 --upper-limit 100" echo 'graph_vlabel %' echo 'request.label request hits' diff --git a/plugins/squid/squid_times b/plugins/squid/squid_times index 5f3ef5e7..23f935e0 100755 --- a/plugins/squid/squid_times +++ b/plugins/squid/squid_times @@ -30,7 +30,7 @@ fi if [ "$1" = "config" ]; then echo 'graph_title Squid Median Services Times' echo 'graph_info This graph shows the proxy median services response times.' - echo 'graph_category squid' + echo 'graph_category webserver' echo 'graph_args --lower-limit 0' echo 'graph_vlabel median response times (s)' diff --git a/plugins/xastir/xastir b/plugins/xastir/xastir index c8944d6b..5894b181 100755 --- a/plugins/xastir/xastir +++ b/plugins/xastir/xastir @@ -47,7 +47,7 @@ case $1 in graph_title Xastir Packet Stats graph_vlabel Packets -graph_category ham_radio +graph_category radio graph_scale no graph_printf %.0lf