Merge pull request #816 from dipohl/master

Category Tree: Reduce number of categories

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

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

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"

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"

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"

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"

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) {

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";

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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
+exit 0

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'

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'

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'

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'

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'