From 99542938b14ccc390a8002c57da725e1d3ee39f8 Mon Sep 17 00:00:00 2001 From: dipohl Date: Thu, 23 Feb 2017 20:45:01 +0100 Subject: [PATCH] Reduce number of categories --- plugins/cyrus/cyrus-imapd | 2 +- plugins/mongodb/mongo_btree | 2 +- plugins/mongodb/mongo_collection_ | 12 ++++++------ plugins/mongodb/mongo_conn | 2 +- plugins/mongodb/mongo_lag | 2 +- plugins/mongodb/mongo_lock | 2 +- plugins/mongodb/mongo_mem | 2 +- plugins/mongodb/mongo_ops | 2 +- plugins/network/dartybox | 10 +++++----- plugins/other/i2p_ | 4 ++-- plugins/sabnzbd/sabnzbd_dataleft | 4 ++-- plugins/sabnzbd/sabnzbd_speed | 4 ++-- plugins/thin/thin_memory | 2 +- plugins/thin/thin_threads | 2 +- plugins/thin/thins_peak_memory | 2 +- plugins/{network => }/tor/tor-bandwidth-usage | 0 plugins/{network => }/tor/tor-connections | 2 +- plugins/{network => }/tor/tor-traffic | 2 +- plugins/{network => }/tor/tor_routers | 2 +- plugins/{network => }/tor/tor_traffic | 0 20 files changed, 30 insertions(+), 30 deletions(-) rename plugins/{network => }/tor/tor-bandwidth-usage (100%) rename plugins/{network => }/tor/tor-connections (98%) rename plugins/{network => }/tor/tor-traffic (97%) rename plugins/{network => }/tor/tor_routers (99%) rename plugins/{network => }/tor/tor_traffic (100%) diff --git a/plugins/cyrus/cyrus-imapd b/plugins/cyrus/cyrus-imapd index e2b54e3a..4492b7a1 100755 --- a/plugins/cyrus/cyrus-imapd +++ b/plugins/cyrus/cyrus-imapd @@ -94,7 +94,7 @@ if [ "$1" = "config" ]; then echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel connections' echo 'graph_scale no' - echo 'graph_category cyrus' + echo 'graph_category mail' echo 'graph_info Current connections to the imap server. bawue.net e.V. Trac repository.' echo 'graph_order connections authenticated_users unique_users' echo 'connections.label Connections' diff --git a/plugins/mongodb/mongo_btree b/plugins/mongodb/mongo_btree index 820b2f04..bddd972a 100755 --- a/plugins/mongodb/mongo_btree +++ b/plugins/mongodb/mongo_btree @@ -31,7 +31,7 @@ def doConfig(): print "graph_title MongoDB btree stats" print "graph_args --base 1000 -l 0" print "graph_vlabel mb ${graph_period}" - print "graph_category MongoDB" + print "graph_category db" for k in get(): print k + ".label " + k diff --git a/plugins/mongodb/mongo_collection_ b/plugins/mongodb/mongo_collection_ index 67024d19..229435fe 100644 --- a/plugins/mongodb/mongo_collection_ +++ b/plugins/mongodb/mongo_collection_ @@ -52,7 +52,7 @@ typeIndex['collcount']['title'] = 'per collection document count' typeIndex['collcount']['yaxis'] = 'documents' typeIndex['collcount']['base'] = '1000' typeIndex['collcount']['scale'] = '--logarithmic -l1' -typeIndex['collcount']['category'] = 'MongoDB' +typeIndex['collcount']['category'] = 'db' typeIndex['collsize'] = {} typeIndex['collsize']['index'] = 'size' @@ -60,7 +60,7 @@ typeIndex['collsize']['title'] = 'per collection data size' typeIndex['collsize']['yaxis'] = 'Byte' typeIndex['collsize']['base'] = '1024' typeIndex['collsize']['scale'] = '--logarithmic -l1 --units=si' -typeIndex['collsize']['category'] = 'MongoDB' +typeIndex['collsize']['category'] = 'db' typeIndex['avgsize'] = {} typeIndex['avgsize']['index'] = 'avgObjSize' @@ -68,7 +68,7 @@ typeIndex['avgsize']['title'] = 'average object size' typeIndex['avgsize']['yaxis'] = 'Byte' typeIndex['avgsize']['base'] = '1024' typeIndex['avgsize']['scale'] = '--logarithmic --units=si' -typeIndex['avgsize']['category'] = 'MongoDB' +typeIndex['avgsize']['category'] = 'db' typeIndex['storage'] = {} typeIndex['storage']['index'] = 'storageSize' @@ -76,7 +76,7 @@ typeIndex['storage']['title'] = 'per collection storage size' typeIndex['storage']['yaxis'] = 'Byte' typeIndex['storage']['base'] = '1024' typeIndex['storage']['scale'] = '--logarithmic -l1 --units=si' -typeIndex['storage']['category'] = 'MongoDB' +typeIndex['storage']['category'] = 'db' typeIndex['indexsize'] = {} typeIndex['indexsize']['index'] = 'totalIndexSize' @@ -84,7 +84,7 @@ typeIndex['indexsize']['title'] = 'per collection index size' typeIndex['indexsize']['yaxis'] = 'Byte' typeIndex['indexsize']['base'] = '1024' typeIndex['indexsize']['scale'] = '--logarithmic -l 1 --units=si' -typeIndex['indexsize']['category'] = 'MongoDB' +typeIndex['indexsize']['category'] = 'db' def getCollstats(graphtype): @@ -141,7 +141,7 @@ def doConfig(base,graphtype): print "graph_title MongoDB " + typeIndex[graphtype]['title'] + " for database " + d print "graph_args --base " + typeIndex[graphtype]['base'] + " " + typeIndex[graphtype]['scale'] print "graph_vlabel " + typeIndex[graphtype]['yaxis'] - print "graph_category MongoDB" + print "graph_category db" print "%s_%s.label %s" % (graphtype, k, k) print "%s_%s.min 0" % (graphtype, k) print "%s_%s.draw LINE1" % (graphtype, k) diff --git a/plugins/mongodb/mongo_conn b/plugins/mongodb/mongo_conn index b149f78f..62324c65 100755 --- a/plugins/mongodb/mongo_conn +++ b/plugins/mongodb/mongo_conn @@ -26,7 +26,7 @@ def doConfig(): print "graph_title MongoDB current connections" print "graph_args --base 1000 -l 0" print "graph_vlabel connections" - print "graph_category MongoDB" + print "graph_category db" print name + ".label " + name diff --git a/plugins/mongodb/mongo_lag b/plugins/mongodb/mongo_lag index a54c0f50..80fdfbd2 100755 --- a/plugins/mongodb/mongo_lag +++ b/plugins/mongodb/mongo_lag @@ -49,7 +49,7 @@ def config(): print """graph_title MongoDB replication lag graph_args --base 1000 graph_vlabel Replication lag (seconds) -graph_category MongoDB +graph_category db """ for member in _get_members(): diff --git a/plugins/mongodb/mongo_lock b/plugins/mongodb/mongo_lock index 7b059df7..ef490d7d 100755 --- a/plugins/mongodb/mongo_lock +++ b/plugins/mongodb/mongo_lock @@ -33,7 +33,7 @@ def doConfig(): print "graph_title MongoDB write lock percentage" print "graph_args --base 1000 -l 0 " print "graph_vlabel percentage" - print "graph_category MongoDB" + print "graph_category db" print name + ".label " + name diff --git a/plugins/mongodb/mongo_mem b/plugins/mongodb/mongo_mem index 3a4d96b5..8f720602 100755 --- a/plugins/mongodb/mongo_mem +++ b/plugins/mongodb/mongo_mem @@ -27,7 +27,7 @@ def doConfig(): print "graph_title MongoDB memory usage" print "graph_args --base 1024 -l 0 --vertical-label Bytes" - print "graph_category MongoDB" + print "graph_category db" for k in getServerStatus()["mem"]: if ok( k ): diff --git a/plugins/mongodb/mongo_ops b/plugins/mongodb/mongo_ops index 2bb9c973..15f6b8b9 100755 --- a/plugins/mongodb/mongo_ops +++ b/plugins/mongodb/mongo_ops @@ -26,7 +26,7 @@ def doConfig(): print "graph_title MongoDB ops" print "graph_args --base 1000 -l 0" print "graph_vlabel ops / ${graph_period}" - print "graph_category MongoDB" + print "graph_category db" print "graph_total total" for k in getServerStatus()["opcounters"]: diff --git a/plugins/network/dartybox b/plugins/network/dartybox index 3deaf5e9..33ecb279 100755 --- a/plugins/network/dartybox +++ b/plugins/network/dartybox @@ -21,22 +21,22 @@ if [ "$1" = "config" ] then echo multigraph dbox_adsl_bw echo graph_title DartyBox Adsl Bandwidth - echo graph_category DartyBox + echo graph_category other echo up.label UpStream echo down.label DownStream echo multigraph dbox_adsl_att echo graph_title DartyBox Adsl Attenuation - echo graph_category DartyBox + echo graph_category other echo up.label UpStream echo down.label DownStream echo multigraph dbox_adsl_snr echo graph_title DartyBox Adsl SignalNoise Ratio - echo graph_category DartyBox + echo graph_category other echo up.label UpStream echo down.label DownStream echo multigraph dbox_adsl_pkt echo graph_title DartyBox Adsl Packets - echo graph_category DartyBox + echo graph_category other echo up.label UpStream echo down.label DownStream echo up_c.label UpStream "(Correctable)" @@ -57,7 +57,7 @@ then echo down_u.min 0 echo multigraph dbox_adsl_uptime echo graph_title DartyBox Adsl Uptime - echo graph_category DartyBox + echo graph_category other echo graph_vlabel days echo uptime.label Uptime diff --git a/plugins/other/i2p_ b/plugins/other/i2p_ index f066d8a0..1c4d93bf 100755 --- a/plugins/other/i2p_ +++ b/plugins/other/i2p_ @@ -26,7 +26,7 @@ def config(): print('graph_title i2p bps') print('graph_vlabel bps') print('graph_info i2p sending and receiving bytes per second') - print('graph_category i2p') + print('graph_category network') print('receivebps.label Receive bps') print('sendbps.label Send bps') elif 'uptime' == plugin_var: @@ -34,7 +34,7 @@ def config(): print('graph_scale no') print('graph_args --base 1000 -l 0') print('graph_vlabel uptime in whole hours') - print('graph_category i2p') + print('graph_category network') print('uptime.label i2p uptime') print('uptime.draw AREA') else: diff --git a/plugins/sabnzbd/sabnzbd_dataleft b/plugins/sabnzbd/sabnzbd_dataleft index 41bad9b8..1f56ea8b 100644 --- a/plugins/sabnzbd/sabnzbd_dataleft +++ b/plugins/sabnzbd/sabnzbd_dataleft @@ -44,7 +44,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config') print <XMLin($vals); #get/output vals my $left = $xmlvals->{mbleft}; $left =~ /(\d+)\./; -print "rem.value ".$1."\n"; \ No newline at end of file +print "rem.value ".$1."\n"; diff --git a/plugins/sabnzbd/sabnzbd_speed b/plugins/sabnzbd/sabnzbd_speed index 474e8def..fb466c7b 100644 --- a/plugins/sabnzbd/sabnzbd_speed +++ b/plugins/sabnzbd/sabnzbd_speed @@ -44,7 +44,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config') print <XMLin($vals); #get/output vals my $speed = $xmlvals->{kbpersec}; $speed =~ /(\d+)\./; -print "speed.value ".$1."\n"; \ No newline at end of file +print "speed.value ".$1."\n"; diff --git a/plugins/thin/thin_memory b/plugins/thin/thin_memory index a496ede4..580ee91e 100755 --- a/plugins/thin/thin_memory +++ b/plugins/thin/thin_memory @@ -77,7 +77,7 @@ case ARGV[0] when "config" puts "graph_title Thin Memory" puts "graph_vlabel RSS" - puts "graph_category Thin" + puts "graph_category webserver" puts "graph_args --base 1024 -l 0" puts "graph_scale yes" puts "graph_info Tracks the size of individual thin processes" diff --git a/plugins/thin/thin_threads b/plugins/thin/thin_threads index bfb09bc7..d559bd08 100755 --- a/plugins/thin/thin_threads +++ b/plugins/thin/thin_threads @@ -81,7 +81,7 @@ case ARGV[0] when "config" puts "graph_title Thin Threads" puts "graph_vlabel Threads" - puts "graph_category Thin" + puts "graph_category webserver" puts "graph_args -l 0" puts "graph_scale yes" puts "graph_info Tracks how many threads per thin processes" diff --git a/plugins/thin/thins_peak_memory b/plugins/thin/thins_peak_memory index 4dc47e5b..3797cc44 100755 --- a/plugins/thin/thins_peak_memory +++ b/plugins/thin/thins_peak_memory @@ -79,7 +79,7 @@ case ARGV[0] when "config" puts "graph_title Thin Peak Memory (High Water Mark)" puts "graph_vlabel HWM" - puts "graph_category Thin" + puts "graph_category webserver" puts "graph_args -l 0" puts "graph_scale yes" puts "graph_info Tracks the peak memory of thin processes, aka High Water Mark." diff --git a/plugins/network/tor/tor-bandwidth-usage b/plugins/tor/tor-bandwidth-usage similarity index 100% rename from plugins/network/tor/tor-bandwidth-usage rename to plugins/tor/tor-bandwidth-usage diff --git a/plugins/network/tor/tor-connections b/plugins/tor/tor-connections similarity index 98% rename from plugins/network/tor/tor-connections rename to plugins/tor/tor-connections index f481d92c..d3ffb26f 100755 --- a/plugins/network/tor/tor-connections +++ b/plugins/tor/tor-connections @@ -17,7 +17,7 @@ if ($cmd == "config") { print "graph_title Connections\n"; print "graph_args -l 0 --base 1000\n"; print "graph_vlabel connections\n"; - print "graph_category Tor\n"; + print "graph_category network\n"; print "graph_info This graph shows the number of Tor OR connections.\n"; print "graph_period second\n"; diff --git a/plugins/network/tor/tor-traffic b/plugins/tor/tor-traffic similarity index 97% rename from plugins/network/tor/tor-traffic rename to plugins/tor/tor-traffic index 8f62e0c2..0b377532 100755 --- a/plugins/network/tor/tor-traffic +++ b/plugins/tor/tor-traffic @@ -17,7 +17,7 @@ if ($cmd == "config") { echo "graph_title Traffic\n"; echo "graph_args --base 1000 \n"; echo "graph_vlabel bits in (-) / out (+) per ${graph_period}\n"; - echo "graph_category Tor\n"; + echo "graph_category network\n"; echo "down.label Download\n"; echo "down.type GAUGE\n"; diff --git a/plugins/network/tor/tor_routers b/plugins/tor/tor_routers similarity index 99% rename from plugins/network/tor/tor_routers rename to plugins/tor/tor_routers index 27bb7b21..4709bfd4 100755 --- a/plugins/network/tor/tor_routers +++ b/plugins/tor/tor_routers @@ -99,7 +99,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") { print "graph_title Routers\n"; print "graph_args -l 0\n"; print "graph_vlabel routers\n"; - print "graph_category Tor\n"; + print "graph_category network\n"; print "graph_info This graph shows the number of known Tor ORs.\n"; print "ors.label routers\n"; diff --git a/plugins/network/tor/tor_traffic b/plugins/tor/tor_traffic similarity index 100% rename from plugins/network/tor/tor_traffic rename to plugins/tor/tor_traffic