From fa99ece8fcc53977982fcfa87579a39dd642ff1e Mon Sep 17 00:00:00 2001 From: dipohl Date: Wed, 22 Feb 2017 00:30:20 +0100 Subject: [PATCH] Category Tree: Reduce number of categories firebird -> db mssql -> db pdns -> dns --- plugins/cpan/cpanp_o | 2 +- plugins/firebird/firebird | 2 +- plugins/mssql/microsoft-sql | 2 +- plugins/mssql/microsoft-sql-buffer-cache-hit-ratio | 2 +- plugins/mssql/microsoft-sql-data-file-sizes | 2 +- plugins/mssql/microsoft-sql-log-file-size | 2 +- plugins/network/dns/{ => bind}/bind95_ | 2 +- plugins/network/dns/{ => bind}/bind9_resolver_stats | 0 plugins/network/dns/{ => bind}/bind9_server_stats | 0 plugins/network/dns/{ => bind}/bind9_socket_stats | 0 plugins/network/dns/{ => bind}/bind_ | 2 +- plugins/network/dns/{ => pdns}/pdns_errors | 2 +- plugins/network/dns/{ => pdns}/pdns_latency | 2 +- plugins/network/dns/{ => pdns}/pdns_qsize | 2 +- plugins/network/dns/{ => pdns}/pdns_queries | 2 +- plugins/network/dns/{ => pdns}/pdns_rec_answers | 2 +- plugins/network/dns/{ => pdns}/pdns_rec_cache | 2 +- plugins/network/dns/{ => pdns}/pdns_rec_cache_size | 2 +- plugins/network/dns/{ => pdns}/pdns_rec_concurrent | 2 +- plugins/network/dns/{ => pdns}/pdns_rec_issues | 2 +- plugins/network/dns/{ => pdns}/pdns_rec_outqueries | 2 +- plugins/network/dns/{ => pdns}/pdns_rec_qtypes | 4 ++-- plugins/network/dns/{ => pdns}/pdns_rec_querylatency | 2 +- plugins/network/dns/{ => pdns}/pdns_rec_questions | 2 +- plugins/network/dns/{ => pdns}/pdns_rec_throttle | 2 +- plugins/network/dns/{ => pdns}/pdns_rec_unauth | 2 +- plugins/network/dns/{ => pdns}/pdns_rel | 2 +- 27 files changed, 25 insertions(+), 25 deletions(-) rename plugins/network/dns/{ => bind}/bind95_ (98%) rename plugins/network/dns/{ => bind}/bind9_resolver_stats (100%) rename plugins/network/dns/{ => bind}/bind9_server_stats (100%) rename plugins/network/dns/{ => bind}/bind9_socket_stats (100%) rename plugins/network/dns/{ => bind}/bind_ (98%) rename plugins/network/dns/{ => pdns}/pdns_errors (97%) rename plugins/network/dns/{ => pdns}/pdns_latency (95%) rename plugins/network/dns/{ => pdns}/pdns_qsize (95%) rename plugins/network/dns/{ => pdns}/pdns_queries (97%) rename plugins/network/dns/{ => pdns}/pdns_rec_answers (98%) rename plugins/network/dns/{ => pdns}/pdns_rec_cache (97%) rename plugins/network/dns/{ => pdns}/pdns_rec_cache_size (97%) rename plugins/network/dns/{ => pdns}/pdns_rec_concurrent (96%) rename plugins/network/dns/{ => pdns}/pdns_rec_issues (98%) rename plugins/network/dns/{ => pdns}/pdns_rec_outqueries (97%) rename plugins/network/dns/{ => pdns}/pdns_rec_qtypes (99%) rename plugins/network/dns/{ => pdns}/pdns_rec_querylatency (96%) rename plugins/network/dns/{ => pdns}/pdns_rec_questions (97%) rename plugins/network/dns/{ => pdns}/pdns_rec_throttle (96%) rename plugins/network/dns/{ => pdns}/pdns_rec_unauth (97%) rename plugins/network/dns/{ => pdns}/pdns_rel (97%) diff --git a/plugins/cpan/cpanp_o b/plugins/cpan/cpanp_o index 3d30ebd3..f1b32942 100755 --- a/plugins/cpan/cpanp_o +++ b/plugins/cpan/cpanp_o @@ -7,7 +7,7 @@ given ($ARGV[0]) { graph_title CPAN modules not up to date graph_args --base 1000 -l 0 graph_vlabel modules -graph_category CPAN +graph_category other graph_info The number of installed CPAN modules that aren't up to date count.label modules count.type GAUGE diff --git a/plugins/firebird/firebird b/plugins/firebird/firebird index 972d741d..1e70bd79 100755 --- a/plugins/firebird/firebird +++ b/plugins/firebird/firebird @@ -22,7 +22,7 @@ graph_title Firebird Transaction Stats graph_order oldest_trans oldest_active oldest_snapshot next_transaction oldest_trans_gap1 oldest_trans_gap2 graph_args --base 1000 graph_scale no -graph_category firebird +graph_category db oldest_trans.label Oldest transaction - OIT oldest_trans.graph no oldest_active.label Oldest active diff --git a/plugins/mssql/microsoft-sql b/plugins/mssql/microsoft-sql index f29e6a27..457298b1 100755 --- a/plugins/mssql/microsoft-sql +++ b/plugins/mssql/microsoft-sql @@ -93,7 +93,7 @@ if ARGV[0] == "autoconf" elsif ARGV[0] == "config" puts "graph_args --base 1000 -r --lower-limit 0" puts "graph_title MSSQL Transactions/s" - puts "graph_category MSSQL" + puts "graph_category db" puts "graph_info This graph shows transactions/s" puts "graph_vlabel transactions/s" puts "graph_scale no" diff --git a/plugins/mssql/microsoft-sql-buffer-cache-hit-ratio b/plugins/mssql/microsoft-sql-buffer-cache-hit-ratio index d5f23c97..ef48f336 100755 --- a/plugins/mssql/microsoft-sql-buffer-cache-hit-ratio +++ b/plugins/mssql/microsoft-sql-buffer-cache-hit-ratio @@ -83,7 +83,7 @@ if ARGV[0] == "autoconf" elsif ARGV[0] == "config" puts "graph_args --base 1000 -r --lower-limit 0" puts "graph_title MSSQL Buffer Cache Hit Ratio " - puts "graph_category MSSQL" + puts "graph_category db" puts "graph_info This graph shows Buffer Cache Hit Ratio" puts "graph_vlabel %" puts "graph_scale no" diff --git a/plugins/mssql/microsoft-sql-data-file-sizes b/plugins/mssql/microsoft-sql-data-file-sizes index 62fb0119..1e068e5d 100755 --- a/plugins/mssql/microsoft-sql-data-file-sizes +++ b/plugins/mssql/microsoft-sql-data-file-sizes @@ -91,7 +91,7 @@ if ARGV[0] == "autoconf" elsif ARGV[0] == "config" puts "graph_args --base 1024k -r --lower-limit 0" puts "graph_title MSSQL DB File Sizes" - puts "graph_category MSSQL" + puts "graph_category db" puts "graph_info This graph shows DB File Sizes (MB)" puts "graph_vlabel MB" puts "graph_scale no" diff --git a/plugins/mssql/microsoft-sql-log-file-size b/plugins/mssql/microsoft-sql-log-file-size index cbec4af4..45951c6a 100755 --- a/plugins/mssql/microsoft-sql-log-file-size +++ b/plugins/mssql/microsoft-sql-log-file-size @@ -91,7 +91,7 @@ if ARGV[0] == "autoconf" elsif ARGV[0] == "config" puts "graph_args --base 1024k -r --lower-limit 0" puts "graph_title MSSQL DB Log File Sizes" - puts "graph_category MSSQL" + puts "graph_category db" puts "graph_info This graph shows DB Log File Sizes (MB)" puts "graph_vlabel MB" puts "graph_scale no" diff --git a/plugins/network/dns/bind95_ b/plugins/network/dns/bind/bind95_ similarity index 98% rename from plugins/network/dns/bind95_ rename to plugins/network/dns/bind/bind95_ index 9883a9b9..bf42fe81 100755 --- a/plugins/network/dns/bind95_ +++ b/plugins/network/dns/bind/bind95_ @@ -108,7 +108,7 @@ sub parseFile { if ( defined($ARGV[0]) && $ARGV[0] eq "config" ) { printf "graph_title Dns requests %s\n",($domain eq "View: _bind" ? " all domains":$domain); printf "graph_vlabel requests/s\n"; - printf "graph_category network\n"; + printf "graph_category dns\n"; printf "graph_info This graph display dns requests for %s\n",($domain eq "View: _bind" ? "all domains":$domain); foreach(@counters) { diff --git a/plugins/network/dns/bind9_resolver_stats b/plugins/network/dns/bind/bind9_resolver_stats similarity index 100% rename from plugins/network/dns/bind9_resolver_stats rename to plugins/network/dns/bind/bind9_resolver_stats diff --git a/plugins/network/dns/bind9_server_stats b/plugins/network/dns/bind/bind9_server_stats similarity index 100% rename from plugins/network/dns/bind9_server_stats rename to plugins/network/dns/bind/bind9_server_stats diff --git a/plugins/network/dns/bind9_socket_stats b/plugins/network/dns/bind/bind9_socket_stats similarity index 100% rename from plugins/network/dns/bind9_socket_stats rename to plugins/network/dns/bind/bind9_socket_stats diff --git a/plugins/network/dns/bind_ b/plugins/network/dns/bind/bind_ similarity index 98% rename from plugins/network/dns/bind_ rename to plugins/network/dns/bind/bind_ index fb0a5ee5..92fd8759 100755 --- a/plugins/network/dns/bind_ +++ b/plugins/network/dns/bind/bind_ @@ -72,7 +72,7 @@ sub parseFile { if ( defined($ARGV[0]) && $ARGV[0] eq "config" ) { printf "graph_title Dns requests %s\n",($domain eq "" ? " all domains":$domain); printf "graph_vlabel requests/s\n"; - printf "graph_category network\n"; + printf "graph_category dns\n"; printf "graph_info This graph display dns requests for %s\n",($domain eq "" ? " all domains":$domain); printf "success.label Success\n"; printf "success.type COUNTER\n"; diff --git a/plugins/network/dns/pdns_errors b/plugins/network/dns/pdns/pdns_errors similarity index 97% rename from plugins/network/dns/pdns_errors rename to plugins/network/dns/pdns/pdns_errors index 19bf66ac..82b0ffcb 100755 --- a/plugins/network/dns/pdns_errors +++ b/plugins/network/dns/pdns/pdns_errors @@ -20,7 +20,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Power DNS errors' echo 'graph_args -l 0 --base 1000' echo 'graph_vlabel numbers of' - echo 'graph_category Power DNS' + echo 'graph_category dns' echo 'graph_info This graph shows Power DNS performance on the machine.' echo 'corrupt_packets.label corrupt packets' echo 'corrupt_packets.type DERIVE' diff --git a/plugins/network/dns/pdns_latency b/plugins/network/dns/pdns/pdns_latency similarity index 95% rename from plugins/network/dns/pdns_latency rename to plugins/network/dns/pdns/pdns_latency index 9398d6d5..5178dfd6 100755 --- a/plugins/network/dns/pdns_latency +++ b/plugins/network/dns/pdns/pdns_latency @@ -20,7 +20,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Power DNS latency' echo 'graph_args -l 0' echo 'graph_vlabel usec' - echo 'graph_category Power DNS' + echo 'graph_category dns' echo 'graph_info This graph shows Power DNS latency on the machine.' echo 'latency.label latency' echo 'latency.info Average number of microseconds needed to answer a question' diff --git a/plugins/network/dns/pdns_qsize b/plugins/network/dns/pdns/pdns_qsize similarity index 95% rename from plugins/network/dns/pdns_qsize rename to plugins/network/dns/pdns/pdns_qsize index d818fea8..5256e8e6 100755 --- a/plugins/network/dns/pdns_qsize +++ b/plugins/network/dns/pdns/pdns_qsize @@ -20,7 +20,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Power DNS database queue' echo 'graph_args -l 0' echo 'graph_vlabel number of waiting queries' - echo 'graph_category Power DNS' + echo 'graph_category dns' echo 'graph_info This graph shows Power DNS database performance on the machine.' echo 'qsize.label qsize' echo 'qsize.info Number of questions waiting for database attention' diff --git a/plugins/network/dns/pdns_queries b/plugins/network/dns/pdns/pdns_queries similarity index 97% rename from plugins/network/dns/pdns_queries rename to plugins/network/dns/pdns/pdns_queries index 8c9f4ea9..82f85477 100755 --- a/plugins/network/dns/pdns_queries +++ b/plugins/network/dns/pdns/pdns_queries @@ -20,7 +20,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Power DNS queries' echo 'graph_args -l 0 --base 1000' echo 'graph_vlabel numbers of' - echo 'graph_category Power DNS' + echo 'graph_category dns' echo 'graph_info This graph shows Power DNS performance on the machine.' echo 'recursing_answers.label recursing answers' echo 'recursing_answers.type DERIVE' diff --git a/plugins/network/dns/pdns_rec_answers b/plugins/network/dns/pdns/pdns_rec_answers similarity index 98% rename from plugins/network/dns/pdns_rec_answers rename to plugins/network/dns/pdns/pdns_rec_answers index 82f14161..a78de5de 100755 --- a/plugins/network/dns/pdns_rec_answers +++ b/plugins/network/dns/pdns/pdns_rec_answers @@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then echo 'graph_order a b c d e f' echo 'graph_vlabel queries' echo 'graph_info Time required per answer.' - echo 'graph_category pdns' + echo 'graph_category dns' echo 'a.label in 1ms' echo 'a.min 0' diff --git a/plugins/network/dns/pdns_rec_cache b/plugins/network/dns/pdns/pdns_rec_cache similarity index 97% rename from plugins/network/dns/pdns_rec_cache rename to plugins/network/dns/pdns/pdns_rec_cache index b6f44216..e72d1ed0 100755 --- a/plugins/network/dns/pdns_rec_cache +++ b/plugins/network/dns/pdns/pdns_rec_cache @@ -28,7 +28,7 @@ if [ "$1" = "config" ]; then echo "graph_order hits misses $ISRESENDS" echo 'graph_vlabel entries' echo 'graph_info Hit/miss rate' - echo 'graph_category pdns' + echo 'graph_category dns' echo 'hits.label hits' echo 'hits.min 0' diff --git a/plugins/network/dns/pdns_rec_cache_size b/plugins/network/dns/pdns/pdns_rec_cache_size similarity index 97% rename from plugins/network/dns/pdns_rec_cache_size rename to plugins/network/dns/pdns/pdns_rec_cache_size index bab0ec46..6e855253 100755 --- a/plugins/network/dns/pdns_rec_cache_size +++ b/plugins/network/dns/pdns/pdns_rec_cache_size @@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then echo 'graph_order entries negative' echo 'graph_vlabel entries' echo 'graph_info Size of the cache' - echo 'graph_category pdns' + echo 'graph_category dns' echo 'entries.label Entries' echo 'entries.min 0' diff --git a/plugins/network/dns/pdns_rec_concurrent b/plugins/network/dns/pdns/pdns_rec_concurrent similarity index 96% rename from plugins/network/dns/pdns_rec_concurrent rename to plugins/network/dns/pdns/pdns_rec_concurrent index 86eb4ab5..bb3ac11e 100755 --- a/plugins/network/dns/pdns_rec_concurrent +++ b/plugins/network/dns/pdns/pdns_rec_concurrent @@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then echo 'graph_order concurrent' echo 'graph_vlabel queries' echo 'graph_info Concurrent queries' - echo 'graph_category pdns' + echo 'graph_category dns' echo 'concurrent.label queries' echo 'concurrent.min 0' diff --git a/plugins/network/dns/pdns_rec_issues b/plugins/network/dns/pdns/pdns_rec_issues similarity index 98% rename from plugins/network/dns/pdns_rec_issues rename to plugins/network/dns/pdns/pdns_rec_issues index 9c9cee83..d605113f 100755 --- a/plugins/network/dns/pdns_rec_issues +++ b/plugins/network/dns/pdns/pdns_rec_issues @@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then echo 'graph_order spoofs resource client server overflow' echo 'graph_vlabel queries' echo 'graph_info Exceptional queries' - echo 'graph_category pdns' + echo 'graph_category dns' echo 'spoofs.label spoofs' echo 'spoofs.min 0' diff --git a/plugins/network/dns/pdns_rec_outqueries b/plugins/network/dns/pdns/pdns_rec_outqueries similarity index 97% rename from plugins/network/dns/pdns_rec_outqueries rename to plugins/network/dns/pdns/pdns_rec_outqueries index a9ce3a7e..524d0056 100755 --- a/plugins/network/dns/pdns_rec_outqueries +++ b/plugins/network/dns/pdns/pdns_rec_outqueries @@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then echo 'graph_order all tcp' echo 'graph_vlabel queries' echo 'graph_info Outbound queries' - echo 'graph_category pdns' + echo 'graph_category dns' echo 'all.label all' echo 'all.min 0' diff --git a/plugins/network/dns/pdns_rec_qtypes b/plugins/network/dns/pdns/pdns_rec_qtypes similarity index 99% rename from plugins/network/dns/pdns_rec_qtypes rename to plugins/network/dns/pdns/pdns_rec_qtypes index 03744804..caf35378 100755 --- a/plugins/network/dns/pdns_rec_qtypes +++ b/plugins/network/dns/pdns/pdns_rec_qtypes @@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then echo 'graph_order a ns cname soa mr ptr hinfo mx txt rp afsdb sig key aaaa loc srv naptr kx cert a6 ds sshfp ipseckey rrsig nsec dnskey dhcid nsec3 nsec3param tlsa spf eui48 eui64 tsig mailb maila any dlv' echo 'graph_vlabel querytypes' echo 'graph_info Querytype breakdown' - echo 'graph_category pdns' + echo 'graph_category dns' echo 'a.label A queries' echo 'a.min 0' @@ -247,4 +247,4 @@ END { rec_control get-qtypelist | awk "$awkscript" -exit 0 \ No newline at end of file +exit 0 diff --git a/plugins/network/dns/pdns_rec_querylatency b/plugins/network/dns/pdns/pdns_rec_querylatency similarity index 96% rename from plugins/network/dns/pdns_rec_querylatency rename to plugins/network/dns/pdns/pdns_rec_querylatency index 1c3d1ed4..20b63973 100755 --- a/plugins/network/dns/pdns_rec_querylatency +++ b/plugins/network/dns/pdns/pdns_rec_querylatency @@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then echo 'graph_order latency' echo 'graph_vlabel ms' echo 'graph_info Question latency' - echo 'graph_category pdns' + echo 'graph_category dns' echo 'latency.label ms' echo 'latency.min 0' diff --git a/plugins/network/dns/pdns_rec_questions b/plugins/network/dns/pdns/pdns_rec_questions similarity index 97% rename from plugins/network/dns/pdns_rec_questions rename to plugins/network/dns/pdns/pdns_rec_questions index 2e38e67c..2a84ef63 100755 --- a/plugins/network/dns/pdns_rec_questions +++ b/plugins/network/dns/pdns/pdns_rec_questions @@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then echo 'graph_order all tcp' echo 'graph_vlabel queries' echo 'graph_info Number of questions asked' - echo 'graph_category pdns' + echo 'graph_category dns' echo 'all.label all' echo 'all.min 0' diff --git a/plugins/network/dns/pdns_rec_throttle b/plugins/network/dns/pdns/pdns_rec_throttle similarity index 96% rename from plugins/network/dns/pdns_rec_throttle rename to plugins/network/dns/pdns/pdns_rec_throttle index 8fbd66a9..d82ffc1f 100755 --- a/plugins/network/dns/pdns_rec_throttle +++ b/plugins/network/dns/pdns/pdns_rec_throttle @@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then echo 'graph_order throttled' echo 'graph_vlabel queries' echo 'graph_info Throttled queries' - echo 'graph_category pdns' + echo 'graph_category dns' echo 'throttled.label throttled' echo 'throttled.min 0' diff --git a/plugins/network/dns/pdns_rec_unauth b/plugins/network/dns/pdns/pdns_rec_unauth similarity index 97% rename from plugins/network/dns/pdns_rec_unauth rename to plugins/network/dns/pdns/pdns_rec_unauth index b7b82efa..2f3df151 100755 --- a/plugins/network/dns/pdns_rec_unauth +++ b/plugins/network/dns/pdns/pdns_rec_unauth @@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then echo 'graph_order tcp udp unexpected' echo 'graph_vlabel queries' echo 'graph_info Unauthorized requests' - echo 'graph_category pdns' + echo 'graph_category dns' echo 'tcp.label tcp' echo 'tcp.min 0' diff --git a/plugins/network/dns/pdns_rel b/plugins/network/dns/pdns/pdns_rel similarity index 97% rename from plugins/network/dns/pdns_rel rename to plugins/network/dns/pdns/pdns_rel index 9ab79c1a..15d8086f 100755 --- a/plugins/network/dns/pdns_rel +++ b/plugins/network/dns/pdns/pdns_rel @@ -21,7 +21,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Power DNS Packet Cache Performance' echo 'graph_args -l 0 --upper-limit 100 --base 1000' echo 'graph_vlabel %' - echo 'graph_category Power DNS' + echo 'graph_category dns' echo 'graph_info This graph shows the Power DNS packet cache performance on the machine.' echo 'packetcache_hitrate.label packet cache hitrate' echo 'packetcache_hitrate.type GAUGE'