From e777037d0699756221bb0ecf549073bf0e5cd1f0 Mon Sep 17 00:00:00 2001
From: dipohl <contact@dipohl.de>
Date: Fri, 24 Feb 2017 19:50:15 +0100
Subject: [PATCH] Plugin-Gallery: Get better 2nd level headings Review of
 category processes, system, snmp

---
 plugins/{snmp => brocade}/snmp__brocade_temp_module_ | 2 +-
 plugins/{processes => cpu}/cpuload_                  | 0
 plugins/{processes => cpu}/cpuutil                   | 0
 plugins/{processes => cpu}/multicpu                  | 0
 plugins/{processes => cpu}/process_count             | 0
 plugins/{processes => cpu}/process_cpushare          | 0
 plugins/{system => load}/load_extended               | 0
 plugins/{processes => memory}/memory_by_process      | 2 +-
 plugins/{processes => memory}/multimemory            | 2 +-
 plugins/{processes => memory}/proc_mem               | 2 +-
 plugins/{snmp => router}/snmp_zyxel_usg__cpu         | 2 +-
 plugins/{snmp => router}/snmp_zyxel_usg__ram         | 2 +-
 plugins/{snmp => router}/snmp_zyxel_usg__sessions    | 0
 plugins/{snmp => router}/snmp_zyxel_zywall__cpu      | 2 +-
 plugins/{snmp => router}/snmp_zyxel_zywall__flash    | 0
 plugins/{snmp => router}/snmp_zyxel_zywall__ram      | 2 +-
 plugins/{snmp => router}/snmp_zyxel_zywall__sessions | 0
 plugins/{system => swap}/swapspace-info              | 2 +-
 plugins/system/irq                                   | 2 +-
 plugins/system/pagefaults_by_process                 | 2 +-
 plugins/system/total_by_process_                     | 2 +-
 plugins/{network => }/transmission_ratios/tr_ratios  | 2 +-
 plugins/{system => user}/cpubyuser                   | 2 +-
 plugins/{processes => user}/multipsu                 | 0
 plugins/{processes => user}/proc_mem_by_user         | 0
 plugins/{processes => vserver}/vserver_procs         | 0
 plugins/xbnbt/xbnbt_peers                            | 2 +-
 27 files changed, 15 insertions(+), 15 deletions(-)
 rename plugins/{snmp => brocade}/snmp__brocade_temp_module_ (99%)
 rename plugins/{processes => cpu}/cpuload_ (100%)
 rename plugins/{processes => cpu}/cpuutil (100%)
 rename plugins/{processes => cpu}/multicpu (100%)
 rename plugins/{processes => cpu}/process_count (100%)
 rename plugins/{processes => cpu}/process_cpushare (100%)
 rename plugins/{system => load}/load_extended (100%)
 rename plugins/{processes => memory}/memory_by_process (98%)
 rename plugins/{processes => memory}/multimemory (98%)
 rename plugins/{processes => memory}/proc_mem (95%)
 rename plugins/{snmp => router}/snmp_zyxel_usg__cpu (99%)
 rename plugins/{snmp => router}/snmp_zyxel_usg__ram (98%)
 rename plugins/{snmp => router}/snmp_zyxel_usg__sessions (100%)
 rename plugins/{snmp => router}/snmp_zyxel_zywall__cpu (98%)
 rename plugins/{snmp => router}/snmp_zyxel_zywall__flash (100%)
 rename plugins/{snmp => router}/snmp_zyxel_zywall__ram (98%)
 rename plugins/{snmp => router}/snmp_zyxel_zywall__sessions (100%)
 rename plugins/{system => swap}/swapspace-info (99%)
 rename plugins/{network => }/transmission_ratios/tr_ratios (98%)
 rename plugins/{system => user}/cpubyuser (99%)
 rename plugins/{processes => user}/multipsu (100%)
 rename plugins/{processes => user}/proc_mem_by_user (100%)
 rename plugins/{processes => vserver}/vserver_procs (100%)

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 <<END;
 graph_title $fieldname by Process
-graph_category system
+graph_category processes
 graph_info Shows total of $fieldname (reported by ps) for each process name
 graph_vlabel $fieldname (from ps)
 END
diff --git a/plugins/network/transmission_ratios/tr_ratios b/plugins/transmission_ratios/tr_ratios
similarity index 98%
rename from plugins/network/transmission_ratios/tr_ratios
rename to plugins/transmission_ratios/tr_ratios
index b2be2160..d9219a6d 100755
--- a/plugins/network/transmission_ratios/tr_ratios
+++ b/plugins/transmission_ratios/tr_ratios
@@ -82,7 +82,7 @@ fi
 if [ "$1" = "config" ]; then
         echo "graph_title Transmission seed ratios"
 	echo "graph_vlabel Seed ratio %"
-	echo "graph_category torrent"
+	echo "graph_category filetransfer"
 	echo "graph_info This plugin shows your transmission ratios per torrent"
 	request_transmission_stats | awk '{print $1 ".label " $3 }' | iconv -f utf-8 -t ascii//translit
         exit 0
diff --git a/plugins/system/cpubyuser b/plugins/user/cpubyuser
similarity index 99%
rename from plugins/system/cpubyuser
rename to plugins/user/cpubyuser
index 77d599f5..eb3edd70 100755
--- a/plugins/system/cpubyuser
+++ b/plugins/user/cpubyuser
@@ -55,7 +55,7 @@ fi
 if [ "$1" = "config" ]; then
 	echo "graph_args --base 1000 -r --lower-limit 0"
 	echo "graph_title CPU usage, by user"
-	echo "graph_category system"
+	echo "graph_category cpu"
 	echo "graph_info This graph shows CPU usage, for monitored users."
 	echo "graph_vlabel %"
 	echo "graph_scale no"
diff --git a/plugins/processes/multipsu b/plugins/user/multipsu
similarity index 100%
rename from plugins/processes/multipsu
rename to plugins/user/multipsu
diff --git a/plugins/processes/proc_mem_by_user b/plugins/user/proc_mem_by_user
similarity index 100%
rename from plugins/processes/proc_mem_by_user
rename to plugins/user/proc_mem_by_user
diff --git a/plugins/processes/vserver_procs b/plugins/vserver/vserver_procs
similarity index 100%
rename from plugins/processes/vserver_procs
rename to plugins/vserver/vserver_procs
diff --git a/plugins/xbnbt/xbnbt_peers b/plugins/xbnbt/xbnbt_peers
index 657bbb06..e506112b 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 torrent\n";
+    print "graph_category filetransfer\n";
     print "peers.label peers\n";
     print "seeds.label seeds\n";
     print "leechers.label leechers\n";