fix(pdu/apc/snmp): mode load - better management of some oids missing (#3358)

hardware/pdu/apc/snmp/mode/load.pm

@@ -24,92 +24,12 @@ use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
-use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold);
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold_ng);
 
 sub custom_status_output { 
     my ($self, %options) = @_;
 
-    my $msg = 'status : ' . $self->{result_values}->{status};
+    return 'status: ' . $self->{result_values}->{status};
-    return $msg;
-}
-
-sub custom_status_calc {
-    my ($self, %options) = @_;
-
-    $self->{result_values}->{status} = $options{new_datas}->{$self->{instance} . '_status'};
-    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
-    return 0;
-}
-
-sub set_counters {
-    my ($self, %options) = @_;
-
-    $self->{maps_counters_type} = [
-        { name => 'device', type => 1, cb_prefix_output => 'prefix_device_output', message_multiple => 'All devices are ok', skipped_code => { -10 => 1 } },
-        { name => 'bank', type => 1, cb_prefix_output => 'prefix_bank_output', message_multiple => 'All banks are ok', skipped_code => { -10 => 1 } },
-        { name => 'phase', type => 1, cb_prefix_output => 'prefix_phase_output', message_multiple => 'All phases are ok', skipped_code => { -10 => 1 } }
-    ];
-
-    $self->{maps_counters}->{bank} = [
-        { label => 'bank-status', threshold => 0, set => {
-                key_values => [ { name => 'status' }, { name => 'display' } ],
-                closure_custom_calc => $self->can('custom_status_calc'),
-                closure_custom_output => $self->can('custom_status_output'),
-                closure_custom_perfdata => sub { return 0; },
-                closure_custom_threshold_check => \&catalog_status_threshold,
-            }
-        },
-        { label => 'current', nlabel => 'bank.current.ampere', set => {
-                key_values => [ { name => 'current' }, { name => 'display' } ],
-                output_template => 'current : %s A',
-                perfdatas => [
-                    { label => 'current_bank',  template => '%s', value => 'current',
-                      unit => 'A', min => 0, label_extra_instance => 1, instance_use => 'display' },
-                ],
-            }
-        },
-    ];
-
-    $self->{maps_counters}->{phase} = [
-        { label => 'phase-status', threshold => 0, set => {
-                key_values => [ { name => 'status' }, { name => 'display' } ],
-                closure_custom_calc => $self->can('custom_status_calc'),
-                closure_custom_output => $self->can('custom_status_output'),
-                closure_custom_perfdata => sub { return 0; },
-                closure_custom_threshold_check => \&catalog_status_threshold,
-            }
-        },
-        { label => 'current', nlabel => 'phase.current.ampere', set => {
-                key_values => [ { name => 'current' }, { name => 'display' } ],
-                output_template => 'current : %s A',
-                perfdatas => [
-                    { label => 'current_phase',  template => '%s', value => 'current',
-                      unit => 'A', min => 0, label_extra_instance => 1, instance_use => 'display' },
-                ],
-            }
-        },
-        { label => 'power', nlabel => 'phase.power.watt', set => {
-                key_values => [ { name => 'power' }, { name => 'display' } ],
-                output_template => 'power : %s W',
-                perfdatas => [
-                    { label => 'power_phase',  template => '%s', value => 'power',
-                      unit => 'W', min => 0, label_extra_instance => 1, instance_use => 'display' },
-                ],
-            }
-        },
-    ];
-
-    $self->{maps_counters}->{device} = [
-        { label => 'power', nlabel => 'device.power.watt', set => {
-                key_values => [ { name => 'power' }, { name => 'display' } ],
-                output_template => 'power : %s W',
-                perfdatas => [
-                    { label => 'power_phase',  template => '%s', value => 'power',
-                      unit => 'W', min => 0, label_extra_instance => 1, instance_use => 'display' },
-                ],
-            }
-        },
-    ];
 }
 
 sub prefix_bank_output {
@@ -130,33 +50,91 @@ sub prefix_device_output {
     return "Device '" . $options{instance_value}->{display} . "' ";
 }
 
+sub set_counters {
+    my ($self, %options) = @_;
+
+    $self->{maps_counters_type} = [
+        { name => 'device', type => 1, cb_prefix_output => 'prefix_device_output', message_multiple => 'All devices are ok', skipped_code => { -10 => 1 } },
+        { name => 'bank', type => 1, cb_prefix_output => 'prefix_bank_output', message_multiple => 'All banks are ok', skipped_code => { -10 => 1 } },
+        { name => 'phase', type => 1, cb_prefix_output => 'prefix_phase_output', message_multiple => 'All phases are ok', skipped_code => { -10 => 1 } }
+    ];
+
+    $self->{maps_counters}->{bank} = [
+        {
+            label => 'bank-status',
+            type => 2,
+            warning_default => '%{status} =~ /low|nearOverload/i',
+            critical_default => '%{status} =~ /^overload/i',
+            set => {
+                key_values => [ { name => 'status' }, { name => 'display' } ],
+                closure_custom_output => $self->can('custom_status_output'),
+                closure_custom_perfdata => sub { return 0; },
+                closure_custom_threshold_check => \&catalog_status_threshold_ng
+            }
+        },
+        { label => 'current', nlabel => 'bank.current.ampere', set => {
+                key_values => [ { name => 'current' }, { name => 'display' } ],
+                output_template => 'current: %s A',
+                perfdatas => [
+                    { template => '%s', unit => 'A', min => 0, label_extra_instance => 1, instance_use => 'display' }
+                ]
+            }
+        }
+    ];
+
+    $self->{maps_counters}->{phase} = [
+        {
+            label => 'phase-status',
+            type => 2,
+            warning_default => '%{status} =~ /low|nearOverload/i',
+            critical_default => '%{status} =~ /^overload/i',
+            set => {
+                key_values => [ { name => 'status' }, { name => 'display' } ],
+                closure_custom_output => $self->can('custom_status_output'),
+                closure_custom_perfdata => sub { return 0; },
+                closure_custom_threshold_check => \&catalog_status_threshold_ng
+            }
+        },
+        { label => 'current', nlabel => 'phase.current.ampere', set => {
+                key_values => [ { name => 'current' }, { name => 'display' } ],
+                output_template => 'current: %s A',
+                perfdatas => [
+                    { template => '%s', unit => 'A', min => 0, label_extra_instance => 1, instance_use => 'display' }
+                ]
+            }
+        },
+        { label => 'power', nlabel => 'phase.power.watt', set => {
+                key_values => [ { name => 'power' }, { name => 'display' } ],
+                output_template => 'power: %s W',
+                perfdatas => [
+                    { template => '%s', unit => 'W', min => 0, label_extra_instance => 1, instance_use => 'display' }
+                ]
+            }
+        }
+    ];
+
+    $self->{maps_counters}->{device} = [
+        { label => 'power', nlabel => 'device.power.watt', set => {
+                key_values => [ { name => 'power' }, { name => 'display' } ],
+                output_template => 'power: %s W',
+                perfdatas => [
+                    { template => '%s', unit => 'W', min => 0, label_extra_instance => 1, instance_use => 'display' }
+                ]
+            }
+        }
+    ];
+}
+
 sub new {
     my ($class, %options) = @_;
     my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
     bless $self, $class;
     
-    $options{options}->add_options(arguments => {
+    $options{options}->add_options(arguments => {});
-        "unknown-bank-status:s"  => { name => 'unknown_bank_status', default => '' },
-        "warning-bank-status:s"  => { name => 'warning_bank_status', default => '%{status} =~ /low|nearOverload/i' },
-        "critical-bank-status:s" => { name => 'critical_bank_status', default => '%{status} =~ /^overload/i' },
-        "unknown-phase-status:s"  => { name => 'unknown_phase_status', default => '' },
-        "warning-phase-status:s"  => { name => 'warning_phase_status', default => '%{status} =~ /low|nearOverload/i' },
-        "critical-phase-status:s" => { name => 'critical_phase_status', default => '%{status} =~ /^overload/i' },
-    });
     
     return $self;
 }
 
-sub check_options {
-    my ($self, %options) = @_;
-    $self->SUPER::check_options(%options);
-
-    $self->change_macros(macros => [
-        'warning_bank_status', 'critical_bank_status', 'unknown_bank_status',
-        'warning_phase_status', 'critical_phase_status', 'unknown_phase_status',
-    ]);
-}
-
 my $map_rpdu_status = {
     1 => 'normal',
     2 => 'low',
@@ -173,7 +151,7 @@ sub check_rpdu {
         rPDULoadStatusLoad          => { oid => '.1.3.6.1.4.1.318.1.1.12.2.3.1.1.2' },
         rPDULoadStatusLoadState     => { oid => '.1.3.6.1.4.1.318.1.1.12.2.3.1.1.3', map => $map_rpdu_status },
         rPDULoadStatusPhaseNumber   => { oid => '.1.3.6.1.4.1.318.1.1.12.2.3.1.1.4' }, 
-        rPDULoadStatusBankNumber    => { oid => '.1.3.6.1.4.1.318.1.1.12.2.3.1.1.5' }, # Bank 0 = no bank (phase total)
+        rPDULoadStatusBankNumber    => { oid => '.1.3.6.1.4.1.318.1.1.12.2.3.1.1.5' } # Bank 0 = no bank (phase total)
     };
 
     my $oid_rPDULoadStatusEntry = '.1.3.6.1.4.1.318.1.1.12.2.3.1.1';
@@ -188,7 +166,7 @@ sub check_rpdu {
             $self->{phase}->{$result->{rPDULoadStatusPhaseNumber}} = {
                 display => $result->{rPDULoadStatusPhaseNumber},
                 status => $result->{rPDULoadStatusLoadState},
-                current => $result->{rPDULoadStatusLoad} / 10,
+                current => $result->{rPDULoadStatusLoad} / 10
             };
         } else {
             $self->{bank}->{$result->{rPDULoadStatusBankNumber}} = { display => $result->{rPDULoadStatusBankNumber}, current => 0 }
@@ -203,7 +181,7 @@ sub check_rpdu {
     $snmp_result = $options{snmp}->get_leef(oids => [$oid_rPDUIdentName, $oid_rPDUIdentDevicePowerWatts]);
     $self->{device}->{0} = {
         display => $snmp_result->{$oid_rPDUIdentName},
-        power => $snmp_result->{$oid_rPDUIdentDevicePowerWatts},
+        power => $snmp_result->{$oid_rPDUIdentDevicePowerWatts}
     };
 }
 
@@ -222,17 +200,17 @@ sub check_rpdu2 {
         rPDU2PhaseStatusNumber    => { oid => '.1.3.6.1.4.1.318.1.1.26.6.3.1.3' },
         rPDU2PhaseStatusLoadState => { oid => '.1.3.6.1.4.1.318.1.1.26.6.3.1.4', map => $map_rpdu2_status },
         rPDU2PhaseStatusCurrent   => { oid => '.1.3.6.1.4.1.318.1.1.26.6.3.1.5' }, 
-        rPDU2PhaseStatusPower       => { oid => '.1.3.6.1.4.1.318.1.1.26.6.3.1.7' },
+        rPDU2PhaseStatusPower     => { oid => '.1.3.6.1.4.1.318.1.1.26.6.3.1.7' }
     };
     my $mapping_bank = {
         rPDU2BankStatusModule     => { oid => '.1.3.6.1.4.1.318.1.1.26.8.3.1.2' },
         rPDU2BankStatusNumber     => { oid => '.1.3.6.1.4.1.318.1.1.26.8.3.1.3' },
         rPDU2BankStatusLoadState  => { oid => '.1.3.6.1.4.1.318.1.1.26.8.3.1.4', map => $map_rpdu2_status },
-        rPDU2BankStatusCurrent      => { oid => '.1.3.6.1.4.1.318.1.1.26.8.3.1.5' }, 
+        rPDU2BankStatusCurrent    => { oid => '.1.3.6.1.4.1.318.1.1.26.8.3.1.5' }
     };
     my $mapping_device = {
         rPDU2DeviceStatusName     => { oid => '.1.3.6.1.4.1.318.1.1.26.4.3.1.3' },
-        rPDU2DeviceStatusPower      => { oid => '.1.3.6.1.4.1.318.1.1.26.4.3.1.5' }, 
+        rPDU2DeviceStatusPower    => { oid => '.1.3.6.1.4.1.318.1.1.26.4.3.1.5' }
     };
 
     my $oid_rPDU2DeviceStatusEntry = '.1.3.6.1.4.1.318.1.1.26.4.3.1';
@@ -241,7 +219,7 @@ sub check_rpdu2 {
     my $snmp_result = $options{snmp}->get_multiple_table(oids => [
         { oid => $oid_rPDU2PhaseStatusEntry, end => $mapping_phase->{rPDU2PhaseStatusPower}->{oid} },
         { oid => $oid_rPDU2BankStatusEntry, end => $mapping_bank->{rPDU2BankStatusCurrent}->{oid} },
-        { oid => $oid_rPDU2DeviceStatusEntry, end => $mapping_device->{rPDU2DeviceStatusPower}->{oid} },
+        { oid => $oid_rPDU2DeviceStatusEntry, end => $mapping_device->{rPDU2DeviceStatusPower}->{oid} }
     ]);
 
     foreach my $oid (keys %{$snmp_result->{$oid_rPDU2PhaseStatusEntry}}) {
@@ -254,7 +232,7 @@ sub check_rpdu2 {
             display => $name,
             status => $result->{rPDU2PhaseStatusLoadState},
             current => $result->{rPDU2PhaseStatusCurrent} / 10,
-            power => $result->{rPDU2PhaseStatusPower} * 10, # hundreth of kW. So * 10 for watt
+            power => defined($result->{rPDU2PhaseStatusPower}) ? $result->{rPDU2PhaseStatusPower} * 10 : undef # hundreth of kW. So * 10 for watt
         }
     }
 
@@ -267,18 +245,18 @@ sub check_rpdu2 {
         $self->{bank}->{$name} = {
             display => $name,
             status => $result->{rPDU2BankStatusLoadState},
-            current => $result->{rPDU2BankStatusCurrent} / 10,
+            current => $result->{rPDU2BankStatusCurrent} / 10
         }
     }
 
     foreach my $oid (keys %{$snmp_result->{$oid_rPDU2DeviceStatusEntry}}) {
-        next if ($oid !~ /^$mapping_device->{rPDU2DeviceStatusPower}->{oid}\.(.*)$/);
+        next if ($oid !~ /^$mapping_device->{rPDU2DeviceStatusName}->{oid}\.(.*)$/);
         my $instance = $1;
         my $result = $options{snmp}->map_instance(mapping => $mapping_device, results => $snmp_result->{$oid_rPDU2DeviceStatusEntry}, instance => $instance);
 
         $self->{device}->{$result->{rPDU2DeviceStatusName}} = {
             display => $result->{rPDU2DeviceStatusName},
-            power => $result->{rPDU2DeviceStatusPower} * 10,
+            power => defined($result->{rPDU2DeviceStatusPower}) ? $result->{rPDU2DeviceStatusPower} * 10 : undef
         }
     }
 }