diff --git a/plugins/amule/amule_queue b/plugins/amule/amule_queue index 052b8903..649280bb 100755 --- a/plugins/amule/amule_queue +++ b/plugins/amule/amule_queue @@ -47,7 +47,7 @@ if [ "$1" = "config" ]; then echo 'graph_info Plugin available at http://linux.andreagozzi.com/content/munin_stuff.php' echo 'graph_args -l 0 --base 1000' echo 'graph_vlabel no of clients' - echo 'graph_category amule' + echo 'graph_category filetransfer' echo 'queue.label download clients' exit 0 fi; diff --git a/plugins/amule/amule_shares b/plugins/amule/amule_shares index 1fa7d92d..0b569cf0 100755 --- a/plugins/amule/amule_shares +++ b/plugins/amule/amule_shares @@ -47,7 +47,7 @@ if [ "$1" = "config" ]; then echo 'graph_info Plugin available at http://linux.andreagozzi.com/content/munin_stuff.php' echo 'graph_args -l 0 --base 1000' echo 'graph_vlabel no of shares' - echo 'graph_category amule' + echo 'graph_category filetransfer' echo 'shares.label shared files' echo 'shares.draw AREA' exit 0 diff --git a/plugins/amule/amule_transfers b/plugins/amule/amule_transfers index 4b243612..cae83ab0 100755 --- a/plugins/amule/amule_transfers +++ b/plugins/amule/amule_transfers @@ -53,7 +53,7 @@ if [ "$1" = "config" ]; then echo 'upload.max 50000' echo 'upload.min 0' echo 'graph_vlabel bytes per ${graph_period}' - echo 'graph_category amule' + echo 'graph_category filetransfer' echo 'upload.label upload speed' echo 'download.label download speed' exit 0 diff --git a/plugins/amule/amule_uptime b/plugins/amule/amule_uptime index 993a550e..9931a1ea 100755 --- a/plugins/amule/amule_uptime +++ b/plugins/amule/amule_uptime @@ -47,7 +47,7 @@ if [ "$1" = "config" ]; then echo 'graph_info Plugin available at http://linux.andreagozzi.com/content/munin_stuff.php' echo 'graph_args -l 0 --base 1000' echo 'graph_vlabel uptime in hours' - echo 'graph_category amule' + echo 'graph_category filetransfer' echo 'uptime.label uptime' echo 'uptime.draw AREA' exit 0 diff --git a/plugins/system/deborphan b/plugins/debian/deborphan similarity index 100% rename from plugins/system/deborphan rename to plugins/debian/deborphan diff --git a/plugins/system/debsecan b/plugins/debian/debsecan similarity index 99% rename from plugins/system/debsecan rename to plugins/debian/debsecan index e52ac2f1..66bb0b4e 100755 --- a/plugins/system/debsecan +++ b/plugins/debian/debsecan @@ -64,7 +64,7 @@ if [ "$1" = "config" ] ; then graph_title DebSecan : vulnerabilities for ${SUITE} graph_args -l 0 --base 1000 graph_vlabel number of CVE -graph_category system +graph_category security graph_period second graph_info This graph show the number of known vulnerabilities present on your system. Use debsecan to see details. remote.label remote diff --git a/plugins/hp/hp_temp b/plugins/disk/hp_temp similarity index 100% rename from plugins/hp/hp_temp rename to plugins/disk/hp_temp diff --git a/plugins/hp/hpasmcli2_ b/plugins/disk/hpasmcli2_ similarity index 100% rename from plugins/hp/hpasmcli2_ rename to plugins/disk/hpasmcli2_ diff --git a/plugins/snmp/snmp__areca_ b/plugins/disk/snmp__areca_ similarity index 100% rename from plugins/snmp/snmp__areca_ rename to plugins/disk/snmp__areca_ diff --git a/plugins/hp/snmp__hp_temp b/plugins/disk/snmp__hp_temp similarity index 100% rename from plugins/hp/snmp__hp_temp rename to plugins/disk/snmp__hp_temp diff --git a/plugins/chassis/dell_fans b/plugins/fan/dell_fans similarity index 100% rename from plugins/chassis/dell_fans rename to plugins/fan/dell_fans diff --git a/plugins/system/ibmfan b/plugins/fan/ibmfan similarity index 100% rename from plugins/system/ibmfan rename to plugins/fan/ibmfan diff --git a/plugins/currentcost/currentcost b/plugins/power/currentcost similarity index 100% rename from plugins/currentcost/currentcost rename to plugins/power/currentcost diff --git a/plugins/snmp/snmp__apc_pdu b/plugins/power/snmp__apc_pdu similarity index 100% rename from plugins/snmp/snmp__apc_pdu rename to plugins/power/snmp__apc_pdu diff --git a/plugins/system/memory_by_process b/plugins/processes/memory_by_process similarity index 98% rename from plugins/system/memory_by_process rename to plugins/processes/memory_by_process index 6af7dad4..75017bda 100755 --- a/plugins/system/memory_by_process +++ b/plugins/processes/memory_by_process @@ -21,7 +21,7 @@ if [ "$1" = "config" ]; then echo "graph_title VM by Process" echo 'graph_args --base 1024k' echo 'graph_vlabel VM size' - echo 'graph_category system' + echo 'graph_category memory' echo "graph_info Shows contribution of each process to VM size" ps auxww | perl -e ' diff --git a/plugins/processes/multimemory b/plugins/processes/multimemory index 1227e7fb..6bc5a5e9 100755 --- a/plugins/processes/multimemory +++ b/plugins/processes/multimemory @@ -77,7 +77,7 @@ fi if [ "$1" = "config" ]; then echo graph_title Total memory usage - echo 'graph_category processes' + echo 'graph_category memory' echo 'graph_args --base 1024 --vertical-label memory -l 0' for name in $names; do fieldname=$(clean_fieldname $name) diff --git a/plugins/processes/proc_mem b/plugins/processes/proc_mem index 899d4b69..2712b1ab 100755 --- a/plugins/processes/proc_mem +++ b/plugins/processes/proc_mem @@ -22,7 +22,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Memory usage by process' echo 'graph_args --base 1024 -l 0' echo 'graph_vlabel Bytes' - echo 'graph_category processes' + echo 'graph_category memory' echo 'graph_info This graph shows the memory usage of several processes' for proc in $processes; do diff --git a/plugins/processes/proc_mem_by_user b/plugins/processes/proc_mem_by_user index 567e386f..6b1026f8 100755 --- a/plugins/processes/proc_mem_by_user +++ b/plugins/processes/proc_mem_by_user @@ -37,7 +37,7 @@ if [ "$1" = config ]; then graph_title Memory usage by process by user graph_args --base 1024 -l 0 graph_vlabel Bytes -graph_category processes +graph_category memory graph_info This graph shows the memory usage of several processes of one user graph_order $(echo "$users"|sed 's/\broot\b/__root/g') EOF diff --git a/plugins/modem/cisco-epc3010_ b/plugins/router/cisco-epc3010_ similarity index 100% rename from plugins/modem/cisco-epc3010_ rename to plugins/router/cisco-epc3010_ diff --git a/plugins/rtorrent/rtom_allsessions_mem b/plugins/rtorrent/rtom_allsessions_mem index 1885a62b..4c0bcf2c 100755 --- a/plugins/rtorrent/rtom_allsessions_mem +++ b/plugins/rtorrent/rtom_allsessions_mem @@ -53,7 +53,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_title rTorrent memory usage\n"; print "graph_args --base 1024 --lower-limit 0\n"; print "graph_vlabel Bytes\n"; - print "graph_category torrent ".${category}."\n"; + print "graph_category filetransfer".${category}."\n"; print "mem.label Memory usage\n"; print "mem.info Memory usage of rTorrent\n"; print "mem.type GAUGE\n"; diff --git a/plugins/rtorrent/rtom_allsessions_peers b/plugins/rtorrent/rtom_allsessions_peers index ef32c539..08e7969e 100755 --- a/plugins/rtorrent/rtom_allsessions_peers +++ b/plugins/rtorrent/rtom_allsessions_peers @@ -51,7 +51,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_title rTorrent peer statistics\n"; print "graph_args --base 1000 --lower-limit 0\n"; print "graph_vlabel peers\n"; - print "graph_category torrent ".${category}."\n"; + print "graph_category filetransfer".${category}."\n"; print "outgoing.label outgoing\n"; print "outgoing.draw AREA\n"; print "outgoing.info number of outgoing connections\n"; diff --git a/plugins/rtorrent/rtom_allsessions_spdd b/plugins/rtorrent/rtom_allsessions_spdd index c917bccc..0f2becfe 100755 --- a/plugins/rtorrent/rtom_allsessions_spdd +++ b/plugins/rtorrent/rtom_allsessions_spdd @@ -65,7 +65,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_title rTorrent speeds\n"; print "graph_args --base 1024\n"; print "graph_vlabel Bytes per \${graph_period}\n"; - print "graph_category torrent ".${category}."\n"; + print "graph_category filetransfer".${category}."\n"; print "down.label Download B/s\n"; print "down.info Download speed in Bytes per seconds\n"; print "down.type DERIVE\n"; diff --git a/plugins/rtorrent/rtom_allsessions_vol b/plugins/rtorrent/rtom_allsessions_vol index 3fafa7d3..c34d46e0 100755 --- a/plugins/rtorrent/rtom_allsessions_vol +++ b/plugins/rtorrent/rtom_allsessions_vol @@ -52,7 +52,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_args --base 1000 -r --lower-limit 0\n"; print "graph_title rTorrent volume\n"; print "graph_vlabel active torrents\n"; - print "graph_category torrent ".${category}."\n"; + print "graph_category filetransfer".${category}."\n"; print "complete.label complete\n"; print "complete.draw AREA\n"; print "complete.info complete torrents\n"; diff --git a/plugins/rtorrent/rtom_mem b/plugins/rtorrent/rtom_mem index fb393c0b..5fa3f143 100755 --- a/plugins/rtorrent/rtom_mem +++ b/plugins/rtorrent/rtom_mem @@ -53,7 +53,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_title rTorrent memory usage\n"; print "graph_args --base 1024 --lower-limit 0\n"; print "graph_vlabel Bytes\n"; - print "graph_category torrent ".${category}."\n"; + print "graph_category filetransfer".${category}."\n"; print "mem.label Memory usage\n"; print "mem.info Memory osage of rTorrent\n"; print "mem.type GAUGE\n"; diff --git a/plugins/rtorrent/rtom_peers b/plugins/rtorrent/rtom_peers index ae71ea2e..4346122b 100755 --- a/plugins/rtorrent/rtom_peers +++ b/plugins/rtorrent/rtom_peers @@ -53,7 +53,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_title rTorrent peer statistics\n"; print "graph_args --base 1000 --lower-limit 0\n"; print "graph_vlabel peers\n"; - print "graph_category torrent ".${category}."\n"; + print "graph_category filetransfer".${category}."\n"; print "outgoing.label outgoing\n"; print "outgoing.draw AREA\n"; print "outgoing.info number of outgoing connections\n"; diff --git a/plugins/rtorrent/rtom_spdd b/plugins/rtorrent/rtom_spdd index 3c23ca7d..b8b18188 100755 --- a/plugins/rtorrent/rtom_spdd +++ b/plugins/rtorrent/rtom_spdd @@ -68,7 +68,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_title rTorrent speeds\n"; print "graph_args --base 1024\n"; print "graph_vlabel Bytes per \${graph_period}\n"; - print "graph_category torrent ".${category}."\n"; + print "graph_category filetransfer".${category}."\n"; print "down.label Download B/s\n"; print "down.info Download speed in Bytes per seconds\n"; print "down.type DERIVE\n"; diff --git a/plugins/rtorrent/rtom_vol b/plugins/rtorrent/rtom_vol index c067231b..f3b8eab6 100755 --- a/plugins/rtorrent/rtom_vol +++ b/plugins/rtorrent/rtom_vol @@ -54,7 +54,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) { print "graph_args --base 1000 -r --lower-limit 0\n"; print "graph_title rTorrent volume\n"; print "graph_vlabel active torrents\n"; - print "graph_category torrent ".${category}."\n"; + print "graph_category filetransfer".${category}."\n"; print "complete.label complete\n"; print "complete.draw AREA\n"; print "complete.info complete torrents\n"; diff --git a/plugins/backup/fresh-backups b/plugins/system/fresh-backups similarity index 98% rename from plugins/backup/fresh-backups rename to plugins/system/fresh-backups index 5e54cabf..e1215458 100755 --- a/plugins/backup/fresh-backups +++ b/plugins/system/fresh-backups @@ -68,7 +68,7 @@ case $1 in graph_title Fresh (<=${LIFETIME}d) backups archives in ${BACKUP_DIR} graph_vlabel number graph_args -l 0 -graph_category system +graph_category backup freshcount.label number freshcount.critical ${CRIT}: freshcount.warning ${WARN}: diff --git a/plugins/system/membyuser b/plugins/system/membyuser index 9b869cca..25b8b3fb 100755 --- a/plugins/system/membyuser +++ b/plugins/system/membyuser @@ -19,7 +19,7 @@ fi if [ "$1" = "config" ]; then echo "graph_args --base 1000 -r --lower-limit 0" echo "graph_title Memory usage, by user" - echo "graph_category system" + echo "graph_category memory" echo "graph_info This graph shows memory usage, for monitored users." echo "graph_vlabel KB" echo "graph_scale no" diff --git a/plugins/esx/esxi__sensors b/plugins/vmware/esxi__sensors similarity index 100% rename from plugins/esx/esxi__sensors rename to plugins/vmware/esxi__sensors