diff --git a/plugins/backup/backup.sh b/plugins/backup/backup.sh index 492a9fed..15bb1b2f 100755 --- a/plugins/backup/backup.sh +++ b/plugins/backup/backup.sh @@ -11,6 +11,7 @@ case $1 in cat <<'EOM' graph_title Number of young files at backup directory graph_vlabel number +graph_category backup autobackup.label number autobackup.critical 1: EOM diff --git a/plugins/ceph/ceph-osd-info b/plugins/ceph/ceph-osd-info index d9c7c6eb..96933ce2 100755 --- a/plugins/ceph/ceph-osd-info +++ b/plugins/ceph/ceph-osd-info @@ -148,7 +148,7 @@ if (sys.argv.__len__()>1) and (sys.argv[1]=="config"): gr_simple=graph.replace("-","_").replace(":","_") gr_pretty=graph.replace("_"," ").title() gr=graph.replace("-","_").replace(":","_") - graphdefaults={"graph_title":gr_pretty,"graph_vlabel":gr_pretty,"graph_category":"osd"} + graphdefaults={"graph_title":gr_pretty,"graph_vlabel":gr_pretty,"graph_category":"fs"} graphsettings=dict(graphdefaults.items()+graphsettings.items()) print "multigraph %s" % (gr_simple) print "\n".join(["%s %s" % setting for setting in graphsettings.items()]) @@ -182,7 +182,3 @@ else: for osd in osds: print "multigraph %s.osd%s" % (gr,osd) print "osd%s_%s.value %s" % (osd,gr,data[osd][graph]) - -# for Munin Plugin Gallery -# graph_category fs - diff --git a/plugins/cpu/multicpu1sec b/plugins/cpu/multicpu1sec index a5dd9d94..c400c49a 100755 --- a/plugins/cpu/multicpu1sec +++ b/plugins/cpu/multicpu1sec @@ -14,7 +14,6 @@ plugin="${0##*/}" # name of plugin pidfile="$MUNIN_PLUGSTATE/munin.$plugin.pid" cache="$MUNIN_PLUGSTATE/munin.$plugin.value" graph="$plugin" -section="system:cpu" style="AREA" cpus=$(grep -c ^processor /proc/cpuinfo) @@ -52,7 +51,7 @@ run_config() { run_daemon cat << EOF graph_title $graph -graph_category $section +graph_category 1sec graph_vlabel average cpu use % graph_scale no graph_total All CPUs @@ -87,6 +86,3 @@ exit 0 # acquire which needs a different pid than watchdog, otherwise watchdog # could/will kill itself when expiring before the watched process is killed. # not a POSIX feature. - -# for Munin Plugin Gallery -# graph_category 1sec diff --git a/plugins/dvb/femon b/plugins/dvb/femon index eebd6661..b51a17fb 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 other') + print ('graph_category tv') print ('graph_info This graph shows femon output for your dvb-'+dvb_adapter[0]) print ('str.label Signal Strength') diff --git a/plugins/fr24/fr24 b/plugins/fr24/fr24 index ba7f29dc..67924623 100755 --- a/plugins/fr24/fr24 +++ b/plugins/fr24/fr24 @@ -39,7 +39,7 @@ case $1 in config) echo "graph_title Number of planes in sight graph_info Number of planes in sight with DVB-T receiver. -graph_category other +graph_category tv graph_vlabel Number of planes planes.label planes" exit 0;; diff --git a/plugins/geowebcache/geowebcache-bandwidth b/plugins/geowebcache/geowebcache-bandwidth index c2a72e62..d2f9c0ce 100755 --- a/plugins/geowebcache/geowebcache-bandwidth +++ b/plugins/geowebcache/geowebcache-bandwidth @@ -98,7 +98,7 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") { print "graph_title GeoWebCache bandwidth\n"; print "graph_args --base 1024\n"; print "graph_vlabel bit/s\n"; - print "graph_category other\n"; + print "graph_category loadbalancer\n"; print "graph_info Bandwidth graph is an average on the last 60 seconds\n"; print "bandw.draw LINE1\n"; print "bandw.label bandwidth bit/s\n"; diff --git a/plugins/geowebcache/geowebcache-blankitems b/plugins/geowebcache/geowebcache-blankitems index 74cd6d34..a3c80a2f 100755 --- a/plugins/geowebcache/geowebcache-blankitems +++ b/plugins/geowebcache/geowebcache-blankitems @@ -98,7 +98,7 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") { print "graph_title GeoWebCache Percent of blank requests\n"; print "graph_args --base 1000\n"; print "graph_vlabel %\n"; - print "graph_category other\n"; + print "graph_category loadbalancer\n"; print "graph_info Blankidth graph is an average on the last 60 seconds\n"; print "blank.draw LINE1\n"; print "blank.label % of blank KML/HTML\n"; diff --git a/plugins/geowebcache/geowebcache-cache-hits-ratio b/plugins/geowebcache/geowebcache-cache-hits-ratio index 2fa07765..270c846e 100755 --- a/plugins/geowebcache/geowebcache-cache-hits-ratio +++ b/plugins/geowebcache/geowebcache-cache-hits-ratio @@ -98,7 +98,7 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") { print "graph_title GeoWebCache cache hit ratio\n"; print "graph_args --base 1000\n"; print "graph_vlabel %\n"; - print "graph_category other\n"; + print "graph_category loadbalancer\n"; print "ratio.label percent\n"; print "ratio.type GAUGE\n"; print "ratio.max 100\n"; diff --git a/plugins/google/googlecode b/plugins/google/googlecode index 02d24f5a..fed13890 100755 --- a/plugins/google/googlecode +++ b/plugins/google/googlecode @@ -47,7 +47,7 @@ if [ "$1" = "config" ]; then echo "graph_title Number of downloads of $PROJECTNAME from Google Code " echo "graph_args --base 1000 --lower-limit 0" echo "graph_vlabel number of downloads" - echo "graph_category other" + echo "graph_category filetransfer" echo "graph_info This graph shows the number of downloads of $PROJECTNAME from Google Code." j=0 for (( i = 1 ; i < $Nfiles ; i=i+5 )) diff --git a/plugins/healthcheck/healthcheck_log b/plugins/healthcheck/healthcheck_log index 247527de..1d36c384 100755 --- a/plugins/healthcheck/healthcheck_log +++ b/plugins/healthcheck/healthcheck_log @@ -89,7 +89,7 @@ if [ "$1" = "config" ]; then echo "graph_args --base 1000 -l 0 --vertical-label match_count" echo 'graph_scale no' echo 'graph_vlabel match_count' - echo 'graph_category other' + echo 'graph_category munin' echo 'graph_info This graph shows the bad event count on log' for(( I = 1; I < $CHECKMAX; ++I )) diff --git a/plugins/healthcheck/healthcheck_process b/plugins/healthcheck/healthcheck_process index 5c674df8..2eaf40ec 100755 --- a/plugins/healthcheck/healthcheck_process +++ b/plugins/healthcheck/healthcheck_process @@ -52,7 +52,7 @@ if [ "$1" = "config" ]; then echo "graph_args --base 1000 -l 0 --vertical-label MB" echo 'graph_scale no' echo 'graph_vlabel process memory' - echo 'graph_category other' + echo 'graph_category munin' echo 'graph_info This graph shows the Memory used by process' for(( I = 1; I < $CHECKMAX; ++I )) diff --git a/plugins/healthcheck/healthcheck_url b/plugins/healthcheck/healthcheck_url index 77a0edea..6686f723 100755 --- a/plugins/healthcheck/healthcheck_url +++ b/plugins/healthcheck/healthcheck_url @@ -101,7 +101,7 @@ if [ "$1" = "config" ]; then echo "graph_args --base 1000 -l 0 --vertical-label second" echo 'graph_scale no' echo 'graph_vlabel second' - echo 'graph_category other' + echo 'graph_category munin' echo 'graph_info This graph shows the site speed' for(( I = 1; I < $CHECKMAX; ++I )) diff --git a/plugins/keystone/keystone_stats b/plugins/keystone/keystone_stats index bed779c8..4ce1d90c 100755 --- a/plugins/keystone/keystone_stats +++ b/plugins/keystone/keystone_stats @@ -30,7 +30,7 @@ def print_config(): print 'graph_title Keystone Stats' print 'graph_vlabel count' print 'graph_args --base 1000 --lower-limit 0' - print 'graph_category other' + print 'graph_category auth' print 'graph_scale no' print 'graph_info This graph shows stats about keystone: ' + (', ').join(stats) for field in stats: diff --git a/plugins/network/bandwidth-OVH-Network b/plugins/network/bandwidth-OVH-Network index e3bed44b..880c91e6 100755 --- a/plugins/network/bandwidth-OVH-Network +++ b/plugins/network/bandwidth-OVH-Network @@ -12,6 +12,7 @@ if [ "$1" = "config" ]; then echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel MB/s' echo 'graph_scale no' + echo 'graph_category network' echo "download.label download" exit 0 fi diff --git a/plugins/network/if b/plugins/network/if index 06af4154..d5086c85 100755 --- a/plugins/network/if +++ b/plugins/network/if @@ -120,7 +120,7 @@ my $graphs = { 'munin' => { - 'category' => 'wifi', + 'category' => 'wireless', 'args' => '--base 1000 -u 0', 'title' => ':if: signal and noise levels', 'vlabel' => 'dB', @@ -134,7 +134,7 @@ my $graphs = { 'munin' => { - 'category' => 'wifi', + 'category' => 'wireless', 'args' => '--base 1000', 'title' => ':if: link quality', 'vlabel' => '%', @@ -148,7 +148,7 @@ my $graphs = { 'munin' => { - 'category' => 'wifi', + 'category' => 'wireless', 'args' => '--base 1000', 'title' => ':if: errors', 'vlabel' => 'Errors RX (-) / TX (+)', diff --git a/plugins/network/interfaces_linux_multi b/plugins/network/interfaces_linux_multi index ad158600..2b75c82c 100755 --- a/plugins/network/interfaces_linux_multi +++ b/plugins/network/interfaces_linux_multi @@ -102,7 +102,6 @@ if (!defined $ENV{MUNIN_PLUGSTATE}) { sub pidfile() { "$ENV{MUNIN_PLUGSTATE}/munin.$plugin.pid" } sub cachefile() { "$ENV{MUNIN_PLUGSTATE}/munin.$plugin.cache" } -sub graph_section() { "system:network" } sub graph_name() { "interfaces" } #sub graph_title() { "interfaces" } #sub graph_title_all() { "Overall CPU usage" } @@ -327,7 +326,7 @@ sub show_config() } print <