diff --git a/plugins/network/bird b/plugins/bird/bird similarity index 99% rename from plugins/network/bird rename to plugins/bird/bird index 41d20273..b9c37926 100755 --- a/plugins/network/bird +++ b/plugins/bird/bird @@ -126,7 +126,7 @@ multigraph ${name}_routes graph_title $proto->{title} routes graph_args --base 1000 graph_vlabel routes -graph_category bird +graph_category network exported.label Exported routes exported.type GAUGE exported.info Exported routes @@ -146,7 +146,7 @@ multigraph ${name}_activity graph_title $proto->{title} activity graph_args --base 1000 graph_vlabel routes per second -graph_category bird +graph_category network import_updates_received.label Import updates received import_updates_received.type DERIVE import_updates_received.draw LINE1 diff --git a/plugins/chilli/chilli_sessions_ b/plugins/chilli/chilli_sessions_ index 75dbe3fd..1e73f349 100755 --- a/plugins/chilli/chilli_sessions_ +++ b/plugins/chilli/chilli_sessions_ @@ -86,7 +86,7 @@ case "$1" in config) echo "graph_title Chilli $INSTANCE sessions" echo "graph_args --base 1000 -l 0" - echo "graph_category chilli" + echo "graph_category wireless" echo "none.label NONE" echo "none.min 0" echo "none.draw AREA" diff --git a/plugins/geowebcache/geowebcache-bandwidth b/plugins/geowebcache/geowebcache-bandwidth index 689c99d9..c2a72e62 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 geowebcache\n"; + print "graph_category other\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 86577238..74cd6d34 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 geowebcache\n"; + print "graph_category other\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 17253e4c..2fa07765 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 geowebcache\n"; + print "graph_category other\n"; print "ratio.label percent\n"; print "ratio.type GAUGE\n"; print "ratio.max 100\n"; diff --git a/plugins/healthcheck/healthcheck_log b/plugins/healthcheck/healthcheck_log index 9e86dbe9..e9165b2f 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 healthcheck' + echo 'graph_category other' 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 7e5edc3d..5c674df8 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 healthcheck' + echo 'graph_category other' 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 4f4967a3..cf36e416 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 healthcheck' + echo 'graph_category other' echo 'graph_info This graph shows the site speed' for(( I = 1; I < $CHECKMAX; ++I )) diff --git a/plugins/jchkmail_counters_/jchkmail_counters_ b/plugins/jchkmail/jchkmail_counters_ similarity index 97% rename from plugins/jchkmail_counters_/jchkmail_counters_ rename to plugins/jchkmail/jchkmail_counters_ index 3302bed4..ef30fa96 100644 --- a/plugins/jchkmail_counters_/jchkmail_counters_ +++ b/plugins/jchkmail/jchkmail_counters_ @@ -575,7 +575,7 @@ ratiospamham01.info Unwanted messages == BEGIN config == activity-graph_title j-chkmail - Filter activity -activity-graph_category j-chkmail +activity-graph_category mail activity-graph_vlabel counts per second activity-graph_scale no activity+data conn msgs rcpt @@ -583,7 +583,7 @@ activity+type counters activity+enable yes greylisting-graph_title j-chkmail - Greylisting activity -greylisting-graph_category j-chkmail +greylisting-graph_category mail greylisting-graph_vlabel counts per second greylisting-graph_scale no greylisting+data greymsgs greyrcpt @@ -591,7 +591,7 @@ greylisting+type counters greylisting+enable yes statfilter-graph_title j-chkmail - Statistical classification -statfilter-graph_category j-chkmail +statfilter-graph_category mail statfilter-graph_vlabel counts per second statfilter-graph_scale no statfilter+data bayesham bayesspam @@ -599,7 +599,7 @@ statfilter+type counters statfilter+enable yes contentfilter-graph_title j-chkmail - Content Filtering -contentfilter-graph_category j-chkmail +contentfilter-graph_category mail contentfilter-graph_vlabel counts per second contentfilter-graph_scale no contentfilter+data bayesspam matching urlbl @@ -607,7 +607,7 @@ contentfilter+type counters contentfilter+enable yes behaviour-graph_title j-chkmail - Behaviour filtering - rejections -behaviour-graph_category j-chkmail +behaviour-graph_category mail behaviour-graph_vlabel counts per second behaviour-graph_scale no behaviour+data throttle badrcpt localuser badmx rcptrate @@ -615,7 +615,7 @@ behaviour+type counters behaviour+enable yes xfiles-graph_title j-chkmail - Suspected files filtering -xfiles-graph_category j-chkmail +xfiles-graph_category mail xfiles-graph_vlabel counts per second xfiles-graph_scale no xfiles+data files xfiles @@ -623,7 +623,7 @@ xfiles+type counters xfiles+enable yes volume-graph_title j-chkmail - Volume handled by the filter -volume-graph_category j-chkmail +volume-graph_category mail volume-graph_vlabel KBytes per second volume-graph_scale no volume+data kbytes @@ -631,7 +631,7 @@ volume+type counters volume+enable yes ratiospamham-graph_title j-chkmail - Statistical classification -ratiospamham-graph_category j-chkmail +ratiospamham-graph_category mail ratiospamham-graph_vlabel Ratio (%) ratiospamham-graph_scale yes ratiospamham-graph_args --lower-limit 0 --upper-limit 100 --rigid @@ -641,7 +641,7 @@ ratiospamham+state yes ratiospamham+enable yes greydb-graph_title j-chkmail - Greylisting Database Size -greydb-graph_category j-chkmail +greydb-graph_category mail greydb-graph_vlabel records greydb-graph_scale no greydb-graph_args --lower-limit 0 @@ -650,7 +650,7 @@ greydb+type dbcounters greydb+enable yes cdb-graph_title j-chkmail - Static databases -cdb-graph_category j-chkmail +cdb-graph_category mail cdb-graph_vlabel records cdb-graph_scale no cdb-graph_args --lower-limit 0 diff --git a/plugins/mythtv/dvb-signal b/plugins/mythtv/dvb-signal index d43e9c1c..aeaa2ebb 100755 --- a/plugins/mythtv/dvb-signal +++ b/plugins/mythtv/dvb-signal @@ -36,7 +36,7 @@ case $1 in echo "graph_title DVB signal strength" echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel Signal Strength %' - echo 'graph_category mythtv' + echo 'graph_category tv' echo 'graph_scale no' while [ -e /dev/dvb/adapter$Tuner/ ]; do Tuner=$[$Tuner+1] diff --git a/plugins/mythtv/mythtv_programs b/plugins/mythtv/mythtv_programs index 0bb796b2..826549a1 100755 --- a/plugins/mythtv/mythtv_programs +++ b/plugins/mythtv/mythtv_programs @@ -56,7 +56,7 @@ my $Channel=""; print "graph_scale off\n"; print "graph_title MythTV EPG per channel\n"; print "graph_args --base 1000 --upper-limit 12 --lower-limit 0 --rigid\n"; - print "graph_category MythTV\n"; + print "graph_category tv\n"; print "graph_vlabel EPG days\n"; @result=SQLQuery("SELECT `chanid` , `name` FROM `channel` WHERE `visible` = '1' order by `chanid` "); my $Ptr=0; diff --git a/plugins/mythtv/mythtv_status_ b/plugins/mythtv/mythtv_status_ index 78936f5a..16723f00 100755 --- a/plugins/mythtv/mythtv_status_ +++ b/plugins/mythtv/mythtv_status_ @@ -113,7 +113,7 @@ PrepSQLRead(); print "graph_scale off\n"; print "graph_info MythTV encoder information\n"; print "graph_title MythTV Encoders\n"; - print "graph_category MythTV\n"; + print "graph_category tv\n"; print "graph_vlabel Encoders\n"; @result=SQLQuery("SELECT `name` FROM `videosource`"); my $First=0; @@ -145,7 +145,7 @@ PrepSQLRead(); print "graph_info MythTV EPG information\n"; print "graph_scale off\n"; print "graph_title MythTV EPG days/Programs\n"; - print "graph_category MythTV\n"; + print "graph_category tv\n"; print "graph_vlabel Days\/Programs\n"; @result=SQLQuery("SELECT DISTINCT `sourceid` FROM `cardinput`"); @@ -167,7 +167,7 @@ PrepSQLRead(); print "graph_scale off\n"; print "graph_info MythTV job information\n"; print "graph_title MythTV Jobs\n"; - print "graph_category MythTV\n"; + print "graph_category tv\n"; print "graph_vlabel Jobs\n"; print "CommJobs.label Active commflag jobs\n"; print "TransJobs.label Active transcode jobs\n"; @@ -180,7 +180,7 @@ PrepSQLRead(); print "graph_scale off\n"; print "graph_info MythTV schedule information\n"; print "graph_title MythTV Schedule\n"; - print "graph_category MythTV\n"; + print "graph_category tv\n"; print "graph_vlabel Programs\n"; print "RecordingRecordings.label Programs that will be recorded\n"; print "RecordingRecordings.info Upcoming programs that will be recorded\n"; @@ -209,7 +209,7 @@ PrepSQLRead(); print "graph_scale off\n"; print "graph_info MythTV recorded information\n"; print "graph_title MythTV Recorded\n"; - print "graph_category MythTV\n"; + print "graph_category tv\n"; print "graph_vlabel Programs or Hours\n"; print "graph_order RecLiveTV RecHoursDelete RecHoursExpire RecHours Recorded Watched \n"; diff --git a/plugins/scalix/scalix_clients b/plugins/scalix/scalix_clients index a0c92d1a..a4bdfc88 100755 --- a/plugins/scalix/scalix_clients +++ b/plugins/scalix/scalix_clients @@ -13,7 +13,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Scalix client connections' echo 'graph_args --lower-limit 0' echo 'graph_vlabel number' - echo 'graph_category Scalix' + echo 'graph_category mail' echo 'swa.label Webmail connections' echo 'swa.draw AREA' echo 'imap.label IMAP connections' diff --git a/plugins/scalix/scalix_indexwork b/plugins/scalix/scalix_indexwork index e513780c..2b1a0a57 100755 --- a/plugins/scalix/scalix_indexwork +++ b/plugins/scalix/scalix_indexwork @@ -23,7 +23,7 @@ if($mode eq "config") { print "graph_title Scalix Index Work Queue\n"; print "graph_args -l 0\n"; print "graph_vlabel number\n"; - print "graph_category Scalix\n"; + print "graph_category mail\n"; print "graph_title Scalix Index Work Queue\n"; print "graph_vlabel Items\n"; print "items.label Items to be indexed\n"; diff --git a/plugins/scalix/scalix_processes b/plugins/scalix/scalix_processes index c96aaccf..6c39052e 100755 --- a/plugins/scalix/scalix_processes +++ b/plugins/scalix/scalix_processes @@ -11,7 +11,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Scalix processes' echo 'graph_args --lower-limit 0' echo 'graph_vlabel number' - echo 'graph_category Scalix' + echo 'graph_category mail' echo 'mimeb.label MIME Browser processes' echo 'indexb.label Index Browser processes' echo 'imap.label IMAP Server processes' diff --git a/plugins/scalix/scalix_queues b/plugins/scalix/scalix_queues index 00394b49..50ea7607 100755 --- a/plugins/scalix/scalix_queues +++ b/plugins/scalix/scalix_queues @@ -14,7 +14,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Scalix queues' echo 'graph_args --lower-limit 0' echo 'graph_vlabel number' - echo 'graph_category Scalix' + echo 'graph_category mail' echo 'archive.label Archive' echo 'bb.label Bulletin Board' diff --git a/plugins/voldemort/voldemort b/plugins/voldemort/voldemort index d10873b8..c11f9469 100644 --- a/plugins/voldemort/voldemort +++ b/plugins/voldemort/voldemort @@ -28,7 +28,7 @@ if ARGV[0] == "config" puts "multigraph voldemort_#{key.gsub(" ", "_")}" puts "graph_title #{key}" puts "graph_scale no" - puts "graph_category voldemort" + puts "graph_category search" puts "graph_vlabel #{keys[key]['vlabel']}" for data in keys[key]['values'] do puts "#{data}.type #{keys[key]['type']}"