From eaf6c2d7ce617b3a9fa6a002ac01c95bdf48e79b Mon Sep 17 00:00:00 2001 From: dipohl Date: Thu, 23 Feb 2017 15:31:40 +0100 Subject: [PATCH] Category Tree: Reduce number of categories mogilefs -> fs (mogilefs) moodle -> cms (moodle) openvz -> virtualization (openvz) wowza -> streaming (wowza) varnish -> webserver (varnish) xbnbt -> torrent (xbnbt) --- plugins/mogilefs/mogilefsd_activity | 2 +- plugins/mogilefs/mogilefsd_queries | 2 +- plugins/moodle/moodle_files | 8 ++++---- plugins/moodle/moodle_logs | 2 +- plugins/moodle/moodle_modules_total | 2 +- plugins/moodle/moodle_users_online | 2 +- plugins/moodle/moodle_users_total | 2 +- plugins/openvz/openvz-load-avg | 2 +- plugins/openvz/openvz_ | 2 +- plugins/openvz/openvzcpu | 2 +- plugins/ssl/ssl_ | 2 +- plugins/ubuntu/ubuntu-mirrors | 2 +- .../README.md => varnish/README-varnish4.md} | 0 plugins/varnish/varnish2_ | 2 +- plugins/{varnish4 => varnish}/varnish4_ | 2 +- plugins/varnish/varnish_devicedetect | 2 +- plugins/wowza/wowza-media-server | 16 ++++++++-------- plugins/wuala/wuala_stats | 2 +- plugins/xbnbt/xbnbt_peers | 2 +- 19 files changed, 28 insertions(+), 28 deletions(-) rename plugins/{varnish4/README.md => varnish/README-varnish4.md} (100%) rename plugins/{varnish4 => varnish}/varnish4_ (99%) diff --git a/plugins/mogilefs/mogilefsd_activity b/plugins/mogilefs/mogilefsd_activity index 217b3f9c..a53edce6 100755 --- a/plugins/mogilefs/mogilefsd_activity +++ b/plugins/mogilefs/mogilefsd_activity @@ -126,7 +126,7 @@ if($ARGV[0] and $ARGV[0] eq "config") { print "graph_title MogileFS tracker activity\n"; print "graph_vlabel processes\n"; print "graph_args -l 0\n"; - print "graph_category MogileFS\n"; + print "graph_category fs\n"; print "bored_queryworkers.label bored_queryworkers\n"; print "bored_queryworkers.draw AREA\n"; print "processing_queries.label processing_queries\n"; diff --git a/plugins/mogilefs/mogilefsd_queries b/plugins/mogilefs/mogilefsd_queries index 6186e74a..ac433ac0 100755 --- a/plugins/mogilefs/mogilefsd_queries +++ b/plugins/mogilefs/mogilefsd_queries @@ -126,7 +126,7 @@ if($ARGV[0] and $ARGV[0] eq "config") { print "graph_title MogileFS tracker queries\n"; print "graph_vlabel queries/sec\n"; print "graph_args -l 0\n"; - print "graph_category MogileFS\n"; + print "graph_category fs\n"; print "queries.label queries\n"; print "queries.type DERIVE\n"; print "queries.draw AREA\n"; diff --git a/plugins/moodle/moodle_files b/plugins/moodle/moodle_files index 13a9a31e..f66eee5b 100644 --- a/plugins/moodle/moodle_files +++ b/plugins/moodle/moodle_files @@ -64,7 +64,7 @@ if (count($argv) === 2 && $argv[1] === 'config') { echo "graph_title Moodle Files Number\n"; echo "graph_args --base 1000 --lower-limit 0\n"; echo "graph_vlabel files\n"; - echo "graph_category Moodle\n"; + echo "graph_category cms\n"; echo "graph_scale no\n"; echo "graph_total total\n"; echo "graph_info Displays the total number of moodle users files and repartition by type\n"; @@ -80,7 +80,7 @@ if (count($argv) === 2 && $argv[1] === 'config') { echo "graph_title Moodle Files Size\n"; echo "graph_args --base 1024 --lower-limit 0\n"; echo "graph_vlabel size\n"; - echo "graph_category Moodle\n"; + echo "graph_category cms\n"; echo "graph_total total\n"; echo "graph_info Displays the total size of moodle users files and repartition by type\n"; @@ -98,7 +98,7 @@ echo "multigraph file_number\n"; echo "graph_title Moodle Files Number\n"; echo "graph_args --base 1000 --lower-limit 0\n"; echo "graph_vlabel files\n"; -echo "graph_category Moodle\n"; +echo "graph_category cms\n"; echo "graph_scale no\n"; echo "graph_total total\n"; echo "graph_info Displays the total number of moodle users files and repartition by type\n"; @@ -117,7 +117,7 @@ echo "multigraph file_size\n"; echo "graph_title Moodle Files Size\n"; echo "graph_args --base 1024 --lower-limit 0\n"; echo "graph_vlabel size\n"; -echo "graph_category Moodle\n"; +echo "graph_category cms\n"; echo "graph_total total\n"; echo "graph_info Displays the total size of moodle users files and repartition by type\n"; diff --git a/plugins/moodle/moodle_logs b/plugins/moodle/moodle_logs index f6e0a2e8..79025d6b 100644 --- a/plugins/moodle/moodle_logs +++ b/plugins/moodle/moodle_logs @@ -41,7 +41,7 @@ if (count($argv) === 2 && $argv[1] === 'config') { echo "graph_title Moodle Logs\n"; echo "graph_args --base 1000 --lower-limit 0\n"; echo "graph_vlabel logs\n"; - echo "graph_category Moodle\n"; + echo "graph_category cms\n"; echo "graph_scale no\n"; echo "graph_info Displays the number of new logs written\n"; echo "logs.label logs\n"; diff --git a/plugins/moodle/moodle_modules_total b/plugins/moodle/moodle_modules_total index 3f054494..94087b58 100644 --- a/plugins/moodle/moodle_modules_total +++ b/plugins/moodle/moodle_modules_total @@ -51,7 +51,7 @@ if (count($argv) === 2 && $argv[1] === 'config') { echo "graph_title Moodle Modules\n"; echo "graph_args --base 1000 --lower-limit 0\n"; echo "graph_vlabel modules\n"; - echo "graph_category Moodle\n"; + echo "graph_category cms\n"; echo "graph_scale no\n"; echo "graph_info Displays the sum of module, as well as module instance number by type, in your Moodle site\n"; echo "graph_total total\n"; diff --git a/plugins/moodle/moodle_users_online b/plugins/moodle/moodle_users_online index bac9ff1f..9a9e4467 100644 --- a/plugins/moodle/moodle_users_online +++ b/plugins/moodle/moodle_users_online @@ -39,7 +39,7 @@ if (count($argv) === 2 && $argv[1] === 'config') { echo "graph_title Moodle Online Users\n"; echo "graph_args --base 1000 --lower-limit 0\n"; echo "graph_vlabel users\n"; - echo "graph_category Moodle\n"; + echo "graph_category cms\n"; echo "graph_scale no\n"; echo "graph_info Displays the sum of online users in your Moodle site\n"; echo "users_online.label online users\n"; diff --git a/plugins/moodle/moodle_users_total b/plugins/moodle/moodle_users_total index 166036f3..bc37f8e8 100644 --- a/plugins/moodle/moodle_users_total +++ b/plugins/moodle/moodle_users_total @@ -37,7 +37,7 @@ if (count($argv) === 2 && $argv[1] === 'config') { echo "graph_title Moodle Total Users\n"; echo "graph_args --base 1000 --lower-limit 0\n"; echo "graph_vlabel users\n"; - echo "graph_category Moodle\n"; + echo "graph_category cms\n"; echo "graph_scale no\n"; echo "graph_info Displays the sum of users, as well as active, suspended and deleted accounts, in your Moodle site\n"; echo "graph_total total\n"; diff --git a/plugins/openvz/openvz-load-avg b/plugins/openvz/openvz-load-avg index 42c6deb8..77dbcb42 100755 --- a/plugins/openvz/openvz-load-avg +++ b/plugins/openvz/openvz-load-avg @@ -57,7 +57,7 @@ if ( $arg eq "autoconf" ) { print "graph_scale no\n"; print "graph_vlabel load average\n"; print "graph_info Shows 5-minute load average per VE\n"; - print "graph_category OpenVZ\n"; + print "graph_category virtualization\n"; # Dynamic config my @result=`/usr/sbin/vzlist -H -a -s veid -o veid,name`; diff --git a/plugins/openvz/openvz_ b/plugins/openvz/openvz_ index 3bd2b13f..cf1484b5 100755 --- a/plugins/openvz/openvz_ +++ b/plugins/openvz/openvz_ @@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then echo "graph_args --base 1000 -l 0" echo "graph_scale yes" echo "graph_vlabel $ATTRIBUTE Value" - echo "graph_category openvz" + echo "graph_category virtualization" echo "graph_info This graph shows OpenVZ: $ATTRIBUTE" vzlist -a -H --no-trim -o hostname | awk '{gsub(/\./,"_",$1) print("'$ATTRIBUTE'"$1".label "$1"\n" \ diff --git a/plugins/openvz/openvzcpu b/plugins/openvz/openvzcpu index 1806de6d..66b3d71a 100755 --- a/plugins/openvz/openvzcpu +++ b/plugins/openvz/openvzcpu @@ -224,7 +224,7 @@ graph_title OpenVZ container CPU usage graph_vlabel CPU cores used ($cores available) graph_scale no graph_info This graph shows how CPU time is spent. -graph_category openvz +graph_category virtualization graph_period second STDCONFIG if (0) { diff --git a/plugins/ssl/ssl_ b/plugins/ssl/ssl_ index a4967efe..1f666b07 100755 --- a/plugins/ssl/ssl_ +++ b/plugins/ssl/ssl_ @@ -41,7 +41,7 @@ case $1 in echo "graph_title $SITE SSL Certificate Expire" echo 'graph_args --base 1000' echo 'graph_vlabel days left' - echo 'graph_category ssl' + echo 'graph_category security' echo "graph_info This graph shows the days left for the certificate being served by $SITE" echo 'expire.label days' print_warning expire diff --git a/plugins/ubuntu/ubuntu-mirrors b/plugins/ubuntu/ubuntu-mirrors index 9e5efea1..b9897280 100755 --- a/plugins/ubuntu/ubuntu-mirrors +++ b/plugins/ubuntu/ubuntu-mirrors @@ -88,7 +88,7 @@ try break; case 'config': echo "graph_title Ubuntu Mirrors in ".COUNTRY."\n"; - echo "graph_category Ubuntu\n"; + echo "graph_category other\n"; echo "graph_args --base 1000 -l 0\n"; echo "graph_scale no\n"; echo "graph_vlabel Bandwidth / Mirrors\n"; diff --git a/plugins/varnish4/README.md b/plugins/varnish/README-varnish4.md similarity index 100% rename from plugins/varnish4/README.md rename to plugins/varnish/README-varnish4.md diff --git a/plugins/varnish/varnish2_ b/plugins/varnish/varnish2_ index 65a96d09..0d3ec1b3 100755 --- a/plugins/varnish/varnish2_ +++ b/plugins/varnish/varnish2_ @@ -50,7 +50,7 @@ if ($config) { print "graph_title Varnish $grepfor usage\n"; print "graph_args --base 1000\n"; print "graph_vlabel Activity / \${graph_period}\n"; - print "graph_category Varnish\n"; + print "graph_category webserver\n"; } $i = 0; diff --git a/plugins/varnish4/varnish4_ b/plugins/varnish/varnish4_ similarity index 99% rename from plugins/varnish4/varnish4_ rename to plugins/varnish/varnish4_ index fa400c1d..f4d01e2a 100644 --- a/plugins/varnish4/varnish4_ +++ b/plugins/varnish/varnish4_ @@ -1076,7 +1076,7 @@ sub get_config } my %values = %{$ASPECTS{$graph}{'values'}}; - print "graph_category Varnish\n"; + print "graph_category webserver\n"; foreach my $field (@graph_parameters) { print_if_exist(\%ASPECTS,$graph,$field,"graph_$field"); } diff --git a/plugins/varnish/varnish_devicedetect b/plugins/varnish/varnish_devicedetect index 52e1bbcb..ddcbb808 100755 --- a/plugins/varnish/varnish_devicedetect +++ b/plugins/varnish/varnish_devicedetect @@ -63,7 +63,7 @@ export devices print_config() { printf "graph_title Varnish device detection\n" printf "graph_vlabel percent\n" - printf "graph_category varnish\n" + printf "graph_category webserver\n" printf "graph_args --rigid --lower-limit 0 --upper-limit 100\n" for device in $devices; do diff --git a/plugins/wowza/wowza-media-server b/plugins/wowza/wowza-media-server index d732687d..2cbb73cf 100755 --- a/plugins/wowza/wowza-media-server +++ b/plugins/wowza/wowza-media-server @@ -137,7 +137,7 @@ try: print ("graph_title Wowza clients listening duration") print ("graph_args --base 1000 -l 0") print ("graph_scale no") - print ("graph_category Wowza") + print ("graph_category streaming") print ("graph_vlabel minutes") print ("avg.label average listening duration") print ("mdn.label median listening duration") @@ -146,7 +146,7 @@ try: print ("graph_title Wowza listeners count by vhosts") print ("graph_args --base 1000 -l 0") print ("graph_scale no") - print ("graph_category Wowza") + print ("graph_category streaming") print ("graph_vlabel listeners") is_first = True for vh in vhosts: @@ -162,7 +162,7 @@ try: print ("graph_title Wowza clients listening duration by vhosts") print ("graph_args --base 1000 -l 0") print ("graph_scale no") - print ("graph_category Wowza") + print ("graph_category streaming") print ("graph_vlabel minutes") for vh in vhosts: vname = vh["Name"].strip("/").replace(".","_").replace("-","_") @@ -173,7 +173,7 @@ try: print ("graph_title Wowza vhosts uptime") print ("graph_args --base 1000 -l 0") print ("graph_scale no") - print ("graph_category Wowza") + print ("graph_category streaming") print ("graph_vlabel hours") for vh in vhosts: vname = vh["Name"].strip("/").replace(".","_").replace("-","_") @@ -183,7 +183,7 @@ try: print ("graph_title Wowza listeners count by apps") print ("graph_args --base 1000 -l 0") print ("graph_scale no") - print ("graph_category Wowza") + print ("graph_category streaming") print ("graph_vlabel listeners") is_first = True for vh in vhosts: @@ -201,7 +201,7 @@ try: print ("graph_title Wowza clients listening duration by apps") print ("graph_args --base 1000 -l 0") print ("graph_scale no") - print ("graph_category Wowza") + print ("graph_category streaming") print ("graph_vlabel minutes") for vh in vhosts: vname = vh["Name"].strip("/").replace(".","_").replace("-","_") @@ -214,7 +214,7 @@ try: print ("graph_title Wowza apps uptime") print ("graph_args --base 1000 -l 0") print ("graph_scale no") - print ("graph_category Wowza") + print ("graph_category streaming") print ("graph_vlabel hours") for vh in vhosts: vname = vh["Name"].strip("/").replace(".","_").replace("-","_") @@ -226,7 +226,7 @@ try: print ("graph_title Wowza listeners count") print ("graph_args --base 1000 -l 0") print ("graph_scale no") - print ("graph_category Wowza") + print ("graph_category streaming") print ("graph_vlabel listeners") print ("wowza_listeners.label Total Listeners") print ("wowza_listeners.draw AREA") diff --git a/plugins/wuala/wuala_stats b/plugins/wuala/wuala_stats index 2cbe37bd..4989246a 100755 --- a/plugins/wuala/wuala_stats +++ b/plugins/wuala/wuala_stats @@ -42,7 +42,7 @@ if ($ARGV[0] and $ARGV[0] eq "autoconf") if($0 =~ /.*_uptime/) { print "graph_args -l0 --vertical-label %\n"; print "graph_title Wuala Uptime\n"; - print "graph_category wuala\n"; + print "graph_category backup\n"; print "graph_info This graph shows the Wua.la uptime\n"; print "uptime.label Uptime\n"; print "uptime.draw LINE2\n"; diff --git a/plugins/xbnbt/xbnbt_peers b/plugins/xbnbt/xbnbt_peers index ff41e940..657bbb06 100755 --- a/plugins/xbnbt/xbnbt_peers +++ b/plugins/xbnbt/xbnbt_peers @@ -51,7 +51,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_title xbnbt peers\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel peers\n"; - print "graph_category xbnbt\n"; + print "graph_category torrent\n"; print "peers.label peers\n"; print "seeds.label seeds\n"; print "leechers.label leechers\n";