diff --git a/plugins/bsd/freebsd_hdd_power_state b/plugins/bsd/freebsd_hdd_power_state index 538846a4..0ef69c69 100755 --- a/plugins/bsd/freebsd_hdd_power_state +++ b/plugins/bsd/freebsd_hdd_power_state @@ -50,7 +50,7 @@ graph_title HDD power state graph_vlabel Power state graph_args --upper-limit 1 -l 0 graph_scale no -graph_category disk +graph_category sensors graph_info The power state of the hard disk drives on the system (1 is spun up, 0 is idle/standby). EOM echo $DEVICES | awk 'BEGIN{OFS=""} { for (i = 0; i++ < NF;) print "power", i, ".label ", $i }' diff --git a/plugins/openwrt/snmp__memory_openwrt b/plugins/openwrt/snmp__memory_openwrt index 736af06a..107a92ad 100755 --- a/plugins/openwrt/snmp__memory_openwrt +++ b/plugins/openwrt/snmp__memory_openwrt @@ -73,7 +73,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") print "graph_title Memory usage graph_args --base 1000 -l 0 graph_vlabel kB -graph_category system +graph_category memory graph_info This graph shows total and used memory on the host. memsize.label total memused.label used diff --git a/plugins/snmp/snmp__cpu_usage b/plugins/snmp/snmp__cpu_usage index 80b603b6..00aa86f2 100755 --- a/plugins/snmp/snmp__cpu_usage +++ b/plugins/snmp/snmp__cpu_usage @@ -140,7 +140,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") print "graph_title CPU Usage on $host\n"; print "graph_args --base 1000 --lower-limit 0\n"; print "graph_vlabel Percentage on one minute\n"; - print "graph_category system\n"; + print "graph_category cpu\n"; print "graph_info This graph shows the CPU usage on one minute\n"; my $firstCounter = 1; diff --git a/plugins/snmp/snmp__fn/snmp__fn b/plugins/snmp/snmp__fn/snmp__fn index 1216e021..e6122725 100755 --- a/plugins/snmp/snmp__fn/snmp__fn +++ b/plugins/snmp/snmp__fn/snmp__fn @@ -114,7 +114,7 @@ config() echo "multigraph fn_cpu" echo "host_name $SNMPCLIENT" echo "graph_title $UNIT - CPU usage" - echo 'graph_category system' + echo 'graph_category fw' echo 'graph_vlabel %' echo 'graph_info This graph shows current CPU usage.' echo 'graph_args --base 1000 -r --lower-limit 0 --upper-limit 100' @@ -125,7 +125,7 @@ config() echo "multigraph fn_memory" echo "host_name $SNMPCLIENT" echo "graph_title $UNIT - Memory usage" - echo 'graph_category system' + echo 'graph_category fw' echo 'graph_vlabel %' echo 'graph_info This graph shows current memory usage.' echo 'graph_args --base 1000 -r --lower-limit 0 --upper-limit 100' @@ -136,7 +136,7 @@ config() echo "multigraph fn_sessions" echo "host_name $SNMPCLIENT" echo "graph_title $UNIT - Sessions" - echo 'graph_category Other' + echo 'graph_category fw' echo 'graph_vlabel Active Sessions' echo 'graph_info Active session count on the Fortigate firewall' echo 'fortisessions.label Sessions' @@ -146,7 +146,7 @@ config() echo "multigraph fn_vpnsessions" echo "host_name $SNMPCLIENT" echo "graph_title $UNIT - SSLvpn Sessions" - echo 'graph_category Other' + echo 'graph_category fw' echo 'graph_vlabel Sessions/Users' echo 'graph_info Loged in users with SSLvpn (WebSession or Tunnel-Mode)' echo 'fortiuser.label Users' diff --git a/plugins/solaris/solaris-memstat b/plugins/solaris/solaris-memstat index ba818ec9..13e30d1c 100755 --- a/plugins/solaris/solaris-memstat +++ b/plugins/solaris/solaris-memstat @@ -52,7 +52,7 @@ if [ "$1" = "config" ]; then echo ' graph_args --base 1024 -l 0 --vertical-label Bytes graph_title Memory usage -graph_category system +graph_category memory graph_info This graph shows system memory use. graph_order kernel anon exec cacheused zfs cachefree free diff --git a/plugins/synology/snmp__synology b/plugins/synology/snmp__synology index 20ec1f80..00f98d95 100755 --- a/plugins/synology/snmp__synology +++ b/plugins/synology/snmp__synology @@ -121,7 +121,7 @@ host_name {hostname} graph_title HDD temperatures on {hostname} graph_vlabel Temperature in °C graph_args --base 1000 -graph_category system +graph_category sensors graph_info HDD temperatures on {hostname}""".format(hostname=self.hostname) for id, name, model, temp in self._get_disks(): @@ -136,7 +136,7 @@ host_name {hostname} graph_title System temperatures of {hostname} graph_vlabel Temperature in °C graph_args --base 1000 -graph_category system +graph_category sensors graph_info System temperature of {hostname} sys_temp.info System temperature sys_temp.label Temperature diff --git a/plugins/system/ibmfan b/plugins/system/ibmfan index aa65f7e0..95d147a2 100755 --- a/plugins/system/ibmfan +++ b/plugins/system/ibmfan @@ -32,7 +32,7 @@ if [ "$1" = "config" ]; then echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel speed' echo 'graph_scale no' - echo 'graph_category system' + echo 'graph_category sensors' echo 'graph_info This graph shows the speed of the system fan.' echo 'fan.label speed' echo 'fan.info The current speed of the system fan.' diff --git a/plugins/ups/snmp__ipoman_ b/plugins/ups/snmp__ipoman_ index 322909d0..9524460b 100755 --- a/plugins/ups/snmp__ipoman_ +++ b/plugins/ups/snmp__ipoman_ @@ -217,7 +217,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") { print "graph_title Inlet $socketnumber voltage/frequency\n"; print "graph_args --base 1000 -l 0\n"; - print "graph_category system\n"; + print "graph_category sensors\n"; print "graph_info This graph shows the tension and frequency to inlet $socketnumber on the Power Distribution Unit\n"; print "voltage.label Tension (V)\n"; @@ -233,7 +233,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") { print "graph_title Inlet $socketnumber current\n"; print "graph_args --base 1000 -l 0\n"; - print "graph_category system\n"; + print "graph_category sensors\n"; print "graph_info This graph shows the delivered current to inlet $socketnumber on the Power Distribution Unit\n"; print "current.label Current (A)\n"; @@ -245,7 +245,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") { print "graph_title Inlet $socketnumber power\n"; print "graph_args --base 1000 -l 0\n"; - print "graph_category system\n"; + print "graph_category sensors\n"; print "graph_info This graph shows the delivered apparent and real power to inlet $socketnumber of the Power Distribution Unit\n"; print "apparentpower.label Apparent power (kVA)\n"; @@ -262,7 +262,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") { print "graph_title Outlet $socketnumber current\n"; print "graph_args --base 1000 -l 0\n"; - print "graph_category system\n"; + print "graph_category sensors\n"; print "graph_info This graph shows the delivered current to outlet $socketnumber of the Power Distribution Unit\n"; print "current.label Delivered current (A)\n"; @@ -273,7 +273,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") { print "graph_title Outlet $socketnumber power\n"; print "graph_args --base 1000 -l 0\n"; - print "graph_category system\n"; + print "graph_category sensors\n"; print "graph_info This graph shows the delivered apparent and real power to outlet $socketnumber of the Power Distribution Unit\n"; print "apparentpower.label Apparent power (kVA)\n";