From 0104c6d40a7507104130dcfe56643a95b27d89d0 Mon Sep 17 00:00:00 2001 From: dipohl Date: Thu, 23 Feb 2017 21:50:22 +0100 Subject: [PATCH] Reduce number of categories --- plugins/dvb/2wcomdsr_ | 14 +++++++------- plugins/dvb/femon | 2 +- plugins/rabbitmq/rabbitmq_connections | 2 +- plugins/rabbitmq/rabbitmq_consumers | 2 +- plugins/rabbitmq/rabbitmq_messages | 2 +- plugins/rabbitmq/rabbitmq_messages_unacknowledged | 2 +- plugins/rabbitmq/rabbitmq_messages_uncommitted | 2 +- plugins/rabbitmq/rabbitmq_queue_memory | 2 +- plugins/senderscore/senderscore | 2 +- plugins/spotweb/spotweb_average | 2 +- plugins/spotweb/spotweb_cat_average | 2 +- plugins/spotweb/spotweb_cat_total | 4 ++-- plugins/spotweb/spotweb_catsize_average | 2 +- plugins/spotweb/spotweb_total | 2 +- plugins/teamspeak/teamspeak_user | 4 ++-- plugins/teamspeak/ts3v2_ | 6 +++--- plugins/teamspeak/tsuser | 2 +- plugins/trafic_ro/trafic_ro_24h | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/plugins/dvb/2wcomdsr_ b/plugins/dvb/2wcomdsr_ index 5c73375a..86c43265 100644 --- a/plugins/dvb/2wcomdsr_ +++ b/plugins/dvb/2wcomdsr_ @@ -62,7 +62,7 @@ echo "host_name $hostname" echo "graph_args --base 1000" echo "graph_title Carrier/Noise Ratio" echo "graph_vlabel dB" -echo "graph_category dvb" +echo "graph_category radio" echo "graph_scale no" echo "graph_info Calculated carrier/noise ratio of the signal. To avoid data errors, the decoding of a received signal requires a minimum C/N ratio that depends on the FEC rate." echo "cpn.label C/N" @@ -74,7 +74,7 @@ echo "host_name $hostname" echo "graph_args --base 1000" echo "graph_title Carrier Frequency Offset" echo "graph_vlabel MHz" -echo "graph_category dvb" +echo "graph_category radio" echo "graph_scale no" echo "graph_info Incoming signals from the LNB are subject to frequency tolerances, thus check the 'CFO Error' under menu item 'Status>Tuner'. This value represents the margin by which the entered frequency deviates from the actual frequency. In order to maximize reception quality the CFO error should be minimized." echo "cfo.label CFO" @@ -86,7 +86,7 @@ echo "host_name $hostname" echo "graph_args --base 1000" echo "graph_title RF Signal Level" echo "graph_vlabel dBm" -echo "graph_category dvb" +echo "graph_category radio" echo "graph_scale no" echo "graph_info Input for the connection of the receiving LNB of the satellite antenna. Admissible RF signal input range is -82 to -10 dBm." echo "inp.label RF level" @@ -98,7 +98,7 @@ echo "host_name $hostname" echo "graph_args --base 1000" echo "graph_title Tuner system Status" echo "graph_vlabel 1=OK, 0=BAD" -echo "graph_category dvb" +echo "graph_category radio" echo "graph_scale no" echo "graph_info Tuner system status: 1 = 'OK' or 0 = 'BAD'. It is OK if all the following values are OK: AGC (Automatic Gain Control), CE (Carrier Frequency Offset Estimation), Symbol Timing, Carrier Locked, Viterbi error correction." echo "tnr.label Tuner status" @@ -110,7 +110,7 @@ echo "host_name $hostname" echo "graph_args --base 1000" echo "graph_title Warning LED" echo "graph_vlabel 0=OFF; >0=ON" -echo "graph_category dvb" +echo "graph_category radio" echo "graph_scale no" echo "graph_info Every monitoring function has a checkbox 'warning LED on' to select if the 'Warning' LED on the web interface and the front panel of the device is activated on alarms or not." echo "ld2.label Warning" @@ -122,7 +122,7 @@ echo "host_name $hostname" echo "graph_args --base 1000 --logarithmic" echo "graph_title BER Viterbi/LDPC" echo "graph_vlabel Bit Error Rate" -echo "graph_category dvb" +echo "graph_category radio" #echo "graph_scale no" echo "graph_info Detected bit error rate (BER) before the Viterbi error correction." echo "ber_vt.label Viterbi/LDPC BER" @@ -134,7 +134,7 @@ echo "host_name $hostname" echo "graph_args --base 1000 --logarithmic" echo "graph_title BER Reed Solomon/BCH" echo "graph_vlabel Bit Error Rate" -echo "graph_category dvb" +echo "graph_category radio" #echo "graph_scale no" echo "graph_info Detected bit error rate (BER) before the Reed Solomon error correction." echo "ber_rs.label RS/BCH BER" diff --git a/plugins/dvb/femon b/plugins/dvb/femon index 8d6ba206..35f7901d 100755 --- a/plugins/dvb/femon +++ b/plugins/dvb/femon @@ -93,7 +93,7 @@ def print_adapter_config(dvb_adapter) : print ('graph_title DVB Femon Sensors '+dvb_adapter[0]) print ('graph_args '+os.getenv('graph_args','--lower-limit 0 --upper-limit 100 --rigid')) print ('graph_vlabel Quality') - print ('graph_category DVB') + print ('graph_category other') print ('graph_info This graph shows femon output for your dvb-'+dvb_adapter[0]) print ('str.label Signal Strength') diff --git a/plugins/rabbitmq/rabbitmq_connections b/plugins/rabbitmq/rabbitmq_connections index b9eee25a..e0fc2a89 100755 --- a/plugins/rabbitmq/rabbitmq_connections +++ b/plugins/rabbitmq/rabbitmq_connections @@ -72,7 +72,7 @@ if [ "$1" = "config" ]; then # We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of # 420 milliload) #echo 'graph_scale no' - echo 'graph_category RabbitMQ' + echo 'graph_category chat' echo "connections.label Connections" echo "connections.warning $CONN_WARN" diff --git a/plugins/rabbitmq/rabbitmq_consumers b/plugins/rabbitmq/rabbitmq_consumers index bb46c493..5b079230 100755 --- a/plugins/rabbitmq/rabbitmq_consumers +++ b/plugins/rabbitmq/rabbitmq_consumers @@ -51,7 +51,7 @@ if [ "$1" = "config" ]; then # We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of # 420 milliload) #echo 'graph_scale no' - echo 'graph_category RabbitMQ' + echo 'graph_category chat' for queue in $QUEUES; do echo "$queue.label $queue" diff --git a/plugins/rabbitmq/rabbitmq_messages b/plugins/rabbitmq/rabbitmq_messages index 92595ed3..9d427015 100755 --- a/plugins/rabbitmq/rabbitmq_messages +++ b/plugins/rabbitmq/rabbitmq_messages @@ -51,7 +51,7 @@ if [ "$1" = "config" ]; then # We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of # 420 milliload) #echo 'graph_scale no' - echo 'graph_category RabbitMQ' + echo 'graph_category chat' for queue in $QUEUES; do echo "$queue.label $queue" diff --git a/plugins/rabbitmq/rabbitmq_messages_unacknowledged b/plugins/rabbitmq/rabbitmq_messages_unacknowledged index a1782d92..b9e300f9 100755 --- a/plugins/rabbitmq/rabbitmq_messages_unacknowledged +++ b/plugins/rabbitmq/rabbitmq_messages_unacknowledged @@ -51,7 +51,7 @@ if [ "$1" = "config" ]; then # We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of # 420 milliload) #echo 'graph_scale no' - echo 'graph_category RabbitMQ' + echo 'graph_category chat' for queue in $QUEUES; do echo "$queue.label $queue" diff --git a/plugins/rabbitmq/rabbitmq_messages_uncommitted b/plugins/rabbitmq/rabbitmq_messages_uncommitted index aed85513..dd682c85 100755 --- a/plugins/rabbitmq/rabbitmq_messages_uncommitted +++ b/plugins/rabbitmq/rabbitmq_messages_uncommitted @@ -51,7 +51,7 @@ if [ "$1" = "config" ]; then # We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of # 420 milliload) #echo 'graph_scale no' - echo 'graph_category RabbitMQ' + echo 'graph_category chat' for queue in $QUEUES; do echo "$queue.label $queue" diff --git a/plugins/rabbitmq/rabbitmq_queue_memory b/plugins/rabbitmq/rabbitmq_queue_memory index a6c752a7..b694f75f 100755 --- a/plugins/rabbitmq/rabbitmq_queue_memory +++ b/plugins/rabbitmq/rabbitmq_queue_memory @@ -51,7 +51,7 @@ if [ "$1" = "config" ]; then # We want Cur/Min/Avg/Max unscaled (i.e. 0.42 load instead of # 420 milliload) #echo 'graph_scale no' - echo 'graph_category RabbitMQ' + echo 'graph_category chat' for queue in $QUEUES; do echo "$queue.label $queue" diff --git a/plugins/senderscore/senderscore b/plugins/senderscore/senderscore index be0b29eb..8f5e319f 100644 --- a/plugins/senderscore/senderscore +++ b/plugins/senderscore/senderscore @@ -44,7 +44,7 @@ def print_config(): graph_title senderscore reputation graph_info This graph shows senderscore.org reputation metrics graphs_args --upper-limit 100 -u 100 -l 0 -graph_category senderscore +graph_category other graph_vlabel score graph_scale no diff --git a/plugins/spotweb/spotweb_average b/plugins/spotweb/spotweb_average index c8f293a9..b57d63cf 100755 --- a/plugins/spotweb/spotweb_average +++ b/plugins/spotweb/spotweb_average @@ -51,7 +51,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config') print <close; } -exit; \ No newline at end of file +exit; diff --git a/plugins/teamspeak/ts3v2_ b/plugins/teamspeak/ts3v2_ index 5c36eedd..be251358 100755 --- a/plugins/teamspeak/ts3v2_ +++ b/plugins/teamspeak/ts3v2_ @@ -127,7 +127,7 @@ if (exists $ARGV[0] and $ARGV[0] eq "autoconf") { print "graph_title Teamspeak Users ".$name."\n"; print "graph_vlabel Connected Teamspeak Users\n"; - print "graph_category Teamspeak\n"; + print "graph_category voip\n"; print "graph_info This graph shows the number of connected users on a Teamspeak3 server\n"; print "users.label Users\n"; print "users.info Connected users to ".$name."\n"; @@ -138,7 +138,7 @@ if (exists $ARGV[0] and $ARGV[0] eq "autoconf") { #overview mode print "graph_title Teamspeak Users Overview\n"; print "graph_vlabel Connected Teamspeak Users\n"; - print "graph_category Teamspeak\n"; + print "graph_category voip\n"; print "graph_info This graph shows the number of connected users on a Teamspeak3 server\n"; foreach (@num) { @@ -162,7 +162,7 @@ if (exists $ARGV[0] and $ARGV[0] eq "autoconf") { #transfer mode print "graph_title Teamspeak Transfer Overview\n"; print "graph_vlabel Teamspeak Transfer\n"; - print "graph_category Teamspeak\n"; + print "graph_category voip\n"; print "graph_info This graph shows the Teamspeak3 Transfer Overview\n"; print "transfer.label ~ Transfer per second\n"; print "transfer.info Transfer per second over 5 min\n"; diff --git a/plugins/teamspeak/tsuser b/plugins/teamspeak/tsuser index 0cb5b306..30ea2e07 100755 --- a/plugins/teamspeak/tsuser +++ b/plugins/teamspeak/tsuser @@ -45,7 +45,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_title Teamspeak User\n"; print "graph_vlabel Connected Teamspeak Users\n"; - print "graph_category Teamspeak\n"; + print "graph_category voip\n"; #print "graph_args --base 1000 -l 0\n"; print "graph_info This graph shows the number of connected users on a teamspeak2 server\n"; foreach my $server (@uports) diff --git a/plugins/trafic_ro/trafic_ro_24h b/plugins/trafic_ro/trafic_ro_24h index 9200fc5f..fe49fcf2 100755 --- a/plugins/trafic_ro/trafic_ro_24h +++ b/plugins/trafic_ro/trafic_ro_24h @@ -5,7 +5,7 @@ if [ "$1" = "config" ]; then echo graph_title $V 24h visitors for $RID echo 'graph_args --base 1000' echo 'graph_vlabel vizitatori_ultimele_24_ore' - echo 'graph_category Trafic_ro' + echo 'graph_category other' echo 'graph_info 24h visitors.' echo "24h_visitors.label $RID" echo "24h_visitors.info 24H visitors for $RID"