+ add cpu alcatel isam mode

network/alcatel/isam/snmp/mode/components/sfp.pm

@@ -57,8 +57,8 @@ sub check {
     }
     
     my ($exit, $warn, $crit, $checked);
-    foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_sfpDiagEntry}})) {
-        next if ($oid !~ /^$mapping->{sfpDiagLOS}->{oid}\.(.*?)\.(.*?)$/);
+    foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$mapping->{sfpDiagLOS}->{oid}}})) {
+        $oid =~ /^$mapping->{sfpDiagLOS}->{oid}\.(.*?)\.(.*?)$/;
         my ($slot_id, $sfp_faceplate_num) = ($1, $2);
         
         my $result = $self->{snmp}->map_instance(mapping => $mapping_slot, results => 
@@ -77,7 +77,7 @@ sub check {
                                         short_msg => sprintf("sfp '%s' signal status is '%s'", $name, $result2->{sfpDiagLOS}));
         }
         
-        if ($result2->{sfpDiagSupplyVoltage} !~ /(\S+)\s+VDC/i) {
+        if ($result2->{sfpDiagSupplyVoltage} =~ /(\S+)\s+VDC/i) {
             my $value = $1;
             ($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'sfp.voltage', instance => $slot_id . '.' . $sfp_faceplate_num, value => $value);            
             if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
@@ -92,7 +92,7 @@ sub check {
                                       );
         }
         
-        if ($result2->{sfpDiagTemperature} !~ /(\S+)\s+degrees Celsius/i) {
+        if ($result2->{sfpDiagTemperature} =~ /(\S+)\s+degrees Celsius/i) {
             my $value = $1;
             ($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'sfp.temperature', instance => $slot_id . '.' . $sfp_faceplate_num, value => $value);            
             if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
@@ -107,7 +107,7 @@ sub check {
                                       );
         }
         
-        if ($result2->{sfpDiagTxPower} !~ /(\S+)\s+dBm/i) {
+        if ($result2->{sfpDiagTxPower} =~ /(\S+)\s+dBm/i) {
             my $value = $1;
             ($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'sfp.txpower', instance => $slot_id . '.' . $sfp_faceplate_num, value => $value);            
             if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
@@ -122,7 +122,7 @@ sub check {
                                       );
         }
         
-        if ($result2->{sfpDiagRxPower} !~ /(\S+)\s+dBm/i) {
+        if ($result2->{sfpDiagRxPower} =~ /(\S+)\s+dBm/i) {
             my $value = $1;
             ($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'sfp.rxpower', instance => $slot_id . '.' . $sfp_faceplate_num, value => $value);            
             if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
@@ -137,7 +137,7 @@ sub check {
                                       );
         }
         
-        if ($result2->{sfpDiagTxBiasCurrent} !~ /(\S+)\s+mA/i) {
+        if ($result2->{sfpDiagTxBiasCurrent} =~ /(\S+)\s+mA/i) {
             my $value = $1;
             ($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'sfp.current', instance => $slot_id . '.' . $sfp_faceplate_num, value => $value);            
             if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {

network/alcatel/isam/snmp/mode/cpu.pm

@@ -0,0 +1,116 @@
+#
+# Copyright 2017 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package network::alcatel::isam::snmp::mode::cpu;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'cpu', type => 1, cb_prefix_output => 'prefix_cpu_output', message_multiple => 'All CPU usages are ok' }
+    ];
+    
+    $self->{maps_counters}->{cpu} = [
+        { label => 'usage', set => {
+                key_values => [ { name => 'usage' }, { name => 'display' }, ],
+                output_template => 'Usage : %.2f %%',
+                perfdatas => [
+                    { label => 'cpu', value => 'usage_absolute', template => '%.2f',
+                      min => 0, max => 100, unit => '%', label_extra_instance => 1, instance_use => 'display_absolute' },
+                ],
+            }
+        },
+    ];
+}
+
+sub prefix_cpu_output {
+    my ($self, %options) = @_;
+    
+    return "CPU '" . $options{instance_value}->{display} . "' ";
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+                                { 
+                                });
+    
+    return $self;
+}
+
+my $oid_ = '';
+    my $oid_ = '';
+
+my $mapping = {
+    cpuLoadAverage                  => { oid => '.1.3.6.1.4.1.637.61.1.9.29.1.1.4' },
+    eqptSlotActualType              => { oid => '.1.3.6.1.4.1.637.61.1.23.3.1.3' },
+    eqptBoardInventorySerialNumber  => { oid => '.1.3.6.1.4.1.637.61.1.23.3.1.19' },
+};
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my $snmp_result = $options{snmp}->get_multiple_table(oids => [
+                                                            { oid => $mapping->{cpuLoadAverage}->{oid} },
+                                                            { oid => $mapping->{eqptSlotActualType}->{oid} },
+                                                            { oid => $mapping->{eqptBoardInventorySerialNumber}->{oid} },
+                                                          ], return_type => 1, nothing_quit => 1);
+    
+    $self->{cpu} = {};
+    foreach my $oid (keys %{$snmp_result}) {
+        next if ($oid !~ /^$mapping->{cpuLoadAverage}->{oid}\.(.*)$/);
+        my $instance = $1;
+        my $result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result, instance => $instance);
+        
+        my $name = $result->{eqptBoardInventorySerialNumber} . '_' . $result->{eqptSlotActualType};
+        $self->{cpu}->{$instance} = { display => $name, usage => $result->{cpuLoadAverage} };
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check CPU usages.
+
+=over 8
+
+=item B<--warning-usage>
+
+Threshold warning.
+
+=item B<--critical-usage>
+
+Threshold critical.
+
+=back
+
+=cut

network/alcatel/isam/snmp/plugin.pm

@@ -31,6 +31,7 @@ sub new {
 
     $self->{version} = '1.0';
     %{$self->{modes}} = (
+        'cpu'           => 'network::alcatel::isam::snmp::mode::cpu',
         'hardware'      => 'network::alcatel::isam::snmp::mode::hardware',
         'vlan-traffic'  => 'network::alcatel::isam::snmp::mode::vlantraffic',
     );