From 8973249c6c9f0fa67b092267c9723ff004c4af1d Mon Sep 17 00:00:00 2001
From: Quentin Garnier <qgarnier@merethis.com>
Date: Fri, 13 Mar 2015 11:42:20 +1100
Subject: [PATCH] Fix sensorgateway check

---
 .../sensorgateway/snmp/mode/components/sensors.pm      | 10 +++++-----
 .../serverscheck/sensorgateway/snmp/mode/sensors.pm    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hardware/sensors/serverscheck/sensorgateway/snmp/mode/components/sensors.pm b/hardware/sensors/serverscheck/sensorgateway/snmp/mode/components/sensors.pm
index bb2c0a5bc..5d511b69a 100644
--- a/hardware/sensors/serverscheck/sensorgateway/snmp/mode/components/sensors.pm
+++ b/hardware/sensors/serverscheck/sensorgateway/snmp/mode/components/sensors.pm
@@ -45,7 +45,7 @@ my $list_oids = {
     3 => 9,
     4 => 13,
     5 => 17,
-}
+};
 
 sub load {
     my (%options) = @_;
@@ -60,7 +60,7 @@ sub check {
     $self->{components}->{sensors} = {name => 'sensors', total => 0, skip => 0};
     return if ($self->check_exclude(section => 'sensors'));
 
-    foreach my $i (keys %{$list_oids}) {
+    foreach my $i (sort keys %{$list_oids}) {
         if (!defined($self->{results}->{$oid_control}->{'.1.3.6.1.4.1.17095.3.' . ($list_oids->{$i} + 1) . '.0'}) || 
             $self->{results}->{$oid_control}->{'.1.3.6.1.4.1.17095.3.' . ($list_oids->{$i} + 1) . '.0'} !~ /([0-9\.]+)/) {
             $self->{output}->output_add(long_msg => sprintf("skip sensor '%s': no values", 
@@ -68,15 +68,15 @@ sub check {
             next;
         }
         
-        my $name = $self->{results}->{$oid_control}->{'.1.3.6.1.4.1.17095.3.' . ($list_oids->{$i}) . '.0'}
+        my $name = $self->{results}->{$oid_control}->{'.1.3.6.1.4.1.17095.3.' . ($list_oids->{$i}) . '.0'};
         my $value = $self->{results}->{$oid_control}->{'.1.3.6.1.4.1.17095.3.' . ($list_oids->{$i} + 1) . '.0'};
         
-        next if ($self->check_exclude(section => 'sensors', instance => $temp));
+        next if ($self->check_exclude(section => 'sensors', instance => $name));
         $self->{components}->{sensors}->{total}++;
         
         $self->{output}->output_add(long_msg => sprintf("sensor '%s' value is %s.", 
                                                         $name, $value));
-        my ($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'sensor', instance => $name, value => $value);
+        my ($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'sensors', instance => $name, value => $value);
         if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
             $self->{output}->output_add(severity => $exit,
                                         short_msg => sprintf("sensor '%s' value is %s", 
diff --git a/hardware/sensors/serverscheck/sensorgateway/snmp/mode/sensors.pm b/hardware/sensors/serverscheck/sensorgateway/snmp/mode/sensors.pm
index 50769b16d..3730f89fa 100644
--- a/hardware/sensors/serverscheck/sensorgateway/snmp/mode/sensors.pm
+++ b/hardware/sensors/serverscheck/sensorgateway/snmp/mode/sensors.pm
@@ -273,12 +273,12 @@ Example: --threshold-overload='output,CRITICAL,^(?!(off)$)'
 =item B<--warning>
 
 Set warning threshold for temperatures and humidity (syntax: type,regexp,treshold)
-Example: --warning='sensors,.*,30' --warning='sensors,.*,90'
+Example: --warning='sensors,Int. Temp,30' --warning='sensors,Fuel Level,50:'
 
 =item B<--critical>
 
 Set critical threshold for temperature and humidity (syntax: type,regexp,treshold)
-Example: --critical='sensors,.*,40'
+Example: --warning='sensors,Int. Temp,35' --warning='sensors,Fuel Level,40:'
 
 =back