diff --git a/plugins/snmp/snmp__brocade_temp_module_ b/plugins/brocade/snmp__brocade_temp_module_ similarity index 99% rename from plugins/snmp/snmp__brocade_temp_module_ rename to plugins/brocade/snmp__brocade_temp_module_ index 9f2954e2..074e5361 100755 --- a/plugins/snmp/snmp__brocade_temp_module_ +++ b/plugins/brocade/snmp__brocade_temp_module_ @@ -68,7 +68,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") { print "graph_title Module $module graph_args --base 1000 --lower-limit 0 graph_vlabel °C -graph_category system +graph_category sensors graph_scale no\n"; my $descr = undef; diff --git a/plugins/processes/cpuload_ b/plugins/cpu/cpuload_ similarity index 100% rename from plugins/processes/cpuload_ rename to plugins/cpu/cpuload_ diff --git a/plugins/processes/cpuutil b/plugins/cpu/cpuutil similarity index 100% rename from plugins/processes/cpuutil rename to plugins/cpu/cpuutil diff --git a/plugins/processes/multicpu b/plugins/cpu/multicpu similarity index 100% rename from plugins/processes/multicpu rename to plugins/cpu/multicpu diff --git a/plugins/processes/process_count b/plugins/cpu/process_count similarity index 100% rename from plugins/processes/process_count rename to plugins/cpu/process_count diff --git a/plugins/processes/process_cpushare b/plugins/cpu/process_cpushare similarity index 100% rename from plugins/processes/process_cpushare rename to plugins/cpu/process_cpushare diff --git a/plugins/system/load_extended b/plugins/load/load_extended similarity index 100% rename from plugins/system/load_extended rename to plugins/load/load_extended diff --git a/plugins/processes/memory_by_process b/plugins/memory/memory_by_process similarity index 98% rename from plugins/processes/memory_by_process rename to plugins/memory/memory_by_process index 75017bda..54d07a83 100755 --- a/plugins/processes/memory_by_process +++ b/plugins/memory/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 memory' + echo 'graph_category processes' echo "graph_info Shows contribution of each process to VM size" ps auxww | perl -e ' diff --git a/plugins/processes/multimemory b/plugins/memory/multimemory similarity index 98% rename from plugins/processes/multimemory rename to plugins/memory/multimemory index 6bc5a5e9..1227e7fb 100755 --- a/plugins/processes/multimemory +++ b/plugins/memory/multimemory @@ -77,7 +77,7 @@ fi if [ "$1" = "config" ]; then echo graph_title Total memory usage - echo 'graph_category memory' + echo 'graph_category processes' 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/memory/proc_mem similarity index 95% rename from plugins/processes/proc_mem rename to plugins/memory/proc_mem index 2712b1ab..899d4b69 100755 --- a/plugins/processes/proc_mem +++ b/plugins/memory/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 memory' + echo 'graph_category processes' echo 'graph_info This graph shows the memory usage of several processes' for proc in $processes; do diff --git a/plugins/snmp/snmp_zyxel_usg__cpu b/plugins/router/snmp_zyxel_usg__cpu similarity index 99% rename from plugins/snmp/snmp_zyxel_usg__cpu rename to plugins/router/snmp_zyxel_usg__cpu index 81d7ec7c..71d1d628 100755 --- a/plugins/snmp/snmp_zyxel_usg__cpu +++ b/plugins/router/snmp_zyxel_usg__cpu @@ -81,7 +81,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") die "Croaking: " . $session->error(); } print "graph_title CPU usage\n"; - print "graph_category system\n"; + print "graph_category cpu\n"; print "graph_args --base 1000 -r --lower-limit 0 --upper-limit 100\n"; print "graph_vlabel %\n"; print "graph_scale no\n"; diff --git a/plugins/snmp/snmp_zyxel_usg__ram b/plugins/router/snmp_zyxel_usg__ram similarity index 98% rename from plugins/snmp/snmp_zyxel_usg__ram rename to plugins/router/snmp_zyxel_usg__ram index f0bcd28f..c3dc1c7a 100755 --- a/plugins/snmp/snmp_zyxel_usg__ram +++ b/plugins/router/snmp_zyxel_usg__ram @@ -78,7 +78,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") die "Croaking: " . $session->error(); } print "graph_title RAM usage\n"; - print "graph_category system\n"; + print "graph_category memory\n"; print "graph_args --base 1000 -r --lower-limit 0 --upper-limit 100\n"; print "graph_vlabel %\n"; print "graph_scale no\n"; diff --git a/plugins/snmp/snmp_zyxel_usg__sessions b/plugins/router/snmp_zyxel_usg__sessions similarity index 100% rename from plugins/snmp/snmp_zyxel_usg__sessions rename to plugins/router/snmp_zyxel_usg__sessions diff --git a/plugins/snmp/snmp_zyxel_zywall__cpu b/plugins/router/snmp_zyxel_zywall__cpu similarity index 98% rename from plugins/snmp/snmp_zyxel_zywall__cpu rename to plugins/router/snmp_zyxel_zywall__cpu index 86813c44..0d00e3ed 100755 --- a/plugins/snmp/snmp_zyxel_zywall__cpu +++ b/plugins/router/snmp_zyxel_zywall__cpu @@ -78,7 +78,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") die "Croaking: " . $session->error(); } print "graph_title CPU usage\n"; - print "graph_category system\n"; + print "graph_category cpu\n"; print "graph_args --base 1000 -r --lower-limit 0 --upper-limit 100\n"; print "graph_vlabel %\n"; print "graph_scale no\n"; diff --git a/plugins/snmp/snmp_zyxel_zywall__flash b/plugins/router/snmp_zyxel_zywall__flash similarity index 100% rename from plugins/snmp/snmp_zyxel_zywall__flash rename to plugins/router/snmp_zyxel_zywall__flash diff --git a/plugins/snmp/snmp_zyxel_zywall__ram b/plugins/router/snmp_zyxel_zywall__ram similarity index 98% rename from plugins/snmp/snmp_zyxel_zywall__ram rename to plugins/router/snmp_zyxel_zywall__ram index aa501ecd..fb27ad89 100755 --- a/plugins/snmp/snmp_zyxel_zywall__ram +++ b/plugins/router/snmp_zyxel_zywall__ram @@ -78,7 +78,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") die "Croaking: " . $session->error(); } print "graph_title RAM usage\n"; - print "graph_category system\n"; + print "graph_category memory\n"; print "graph_args --base 1000 -r --lower-limit 0 --upper-limit 100\n"; print "graph_vlabel %\n"; print "graph_scale no\n"; diff --git a/plugins/snmp/snmp_zyxel_zywall__sessions b/plugins/router/snmp_zyxel_zywall__sessions similarity index 100% rename from plugins/snmp/snmp_zyxel_zywall__sessions rename to plugins/router/snmp_zyxel_zywall__sessions diff --git a/plugins/system/swapspace-info b/plugins/swap/swapspace-info similarity index 99% rename from plugins/system/swapspace-info rename to plugins/swap/swapspace-info index afa6e6cd..766afc36 100755 --- a/plugins/system/swapspace-info +++ b/plugins/swap/swapspace-info @@ -144,7 +144,7 @@ sub config print "graph_args --base 1024 -l 0 \n"; print "graph_vlabel Bytes\n"; print "graph_title Swapspace usage\n"; - print "graph_category system\n"; + print "graph_category memory\n"; print "graph_info This graph shows what the machine uses Swapspace for.\n"; print "graph_order "; diff --git a/plugins/system/irq b/plugins/system/irq index 03017dc9..0e4a3da5 100755 --- a/plugins/system/irq +++ b/plugins/system/irq @@ -3,7 +3,7 @@ =head1 NAME -irq - Plugin to monitor inerrupts. +irq - Plugin to monitor interrupts. =head1 APPLICABLE SYSTEMS diff --git a/plugins/system/pagefaults_by_process b/plugins/system/pagefaults_by_process index 379f510e..9396d42c 100755 --- a/plugins/system/pagefaults_by_process +++ b/plugins/system/pagefaults_by_process @@ -80,7 +80,7 @@ if (@ARGV and $ARGV[0] eq "config") graph_title Page faults by Process graph_args --base 1000 graph_vlabel major page faults -graph_category system +graph_category processes graph_info Shows number of major page faults caused by each process name END diff --git a/plugins/system/total_by_process_ b/plugins/system/total_by_process_ index a2da8fc0..af4b4003 100755 --- a/plugins/system/total_by_process_ +++ b/plugins/system/total_by_process_ @@ -90,7 +90,7 @@ if (@ARGV and $ARGV[1] == "config") { print <