From db10581d14dd6b44e9b71ede32c42418a81ac5c7 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Thu, 13 Feb 2014 16:00:36 +0000 Subject: [PATCH 1/3] Add CPU #5151 --- .../dell/openmanage/mode/components/cpu.pm | 40 ++++++++++--------- .../server/dell/openmanage/mode/hardware.pm | 2 + 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/hardware/server/dell/openmanage/mode/components/cpu.pm b/hardware/server/dell/openmanage/mode/components/cpu.pm index cc751e614..c173a965a 100644 --- a/hardware/server/dell/openmanage/mode/components/cpu.pm +++ b/hardware/server/dell/openmanage/mode/components/cpu.pm @@ -74,37 +74,39 @@ sub check { $self->{components}->{cpu} = {name => 'CPUs', total => 0}; return if ($self->check_exclude('cpu')); - my $oid_cpuStatus = '.1.3.6.1.4.1.674.10892.1.1100.30.1.5.1'; - my $oid_cpuManufacturerName = '.1.3.6.1.4.1.674.10892.1.1100.30.1.8.1'; - my $oid_cpuStatusState = '.1.3.6.1.4.1.674.10892.1.1100.30.1.9.1'; - my $oid_cpuCurrentSpeed = '.1.3.6.1.4.1.674.10892.1.1100.30.1.12.1'; - my $oid_cpuBrandName = '.1.3.6.1.4.1.674.10892.1.1100.30.1.23.1'; - my $oid_cpuChassis = '.1.3.6.1.4.1.674.10892.1.1100.32.1.1.1'; - my $oid_cpuStatusReading = '.1.3.6.1.4.1.674.10892.1.1100.32.1.6.1'; + my $oid_cpuStatus = '.1.3.6.1.4.1.674.10892.1.1100.30.1.5'; + my $oid_cpuManufacturerName = '.1.3.6.1.4.1.674.10892.1.1100.30.1.8'; + my $oid_cpuStatusState = '.1.3.6.1.4.1.674.10892.1.1100.30.1.9'; + my $oid_cpuCurrentSpeed = '.1.3.6.1.4.1.674.10892.1.1100.30.1.12'; + my $oid_cpuBrandName = '.1.3.6.1.4.1.674.10892.1.1100.30.1.23'; + my $oid_cpuChassis = '.1.3.6.1.4.1.674.10892.1.1100.32.1.1'; + my $oid_cpuStatusReading = '.1.3.6.1.4.1.674.10892.1.1100.32.1.6'; my $result = $self->{snmp}->get_table(oid => $oid_cpuStatus); return if (scalar(keys %$result) <= 0); - my $result2 = $self->{snmp}->get_leef(oids => [$oid_cpuManufacturerName, $oid_cpuStatusState, $oid_cpuCurrentSpeed, $oid_cpuBrandName, $oid_cpuChassis, $oid_cpuStatusReading], - instances => [keys %$result], - instance_regexp => '(\.\d+)$'); + $self->{snmp}->load(oids => [$oid_cpuManufacturerName, $oid_cpuStatusState, $oid_cpuCurrentSpeed, $oid_cpuBrandName, $oid_cpuChassis, $oid_cpuStatusReading], + instances => [keys %$result], + instance_regexp => '(\d+\.\d+)$'); + my $result2 = $self->{snmp}->get_leef(); return if (scalar(keys %$result2) <= 0); foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) { - $key =~ /\.(\d+)$/; - my $cpu_Index = $1; + $key =~ /(\d+)\.(\d+)$/; + my ($chassis_Index, $cpu_Index) = ($1, $2); + my $instance = $chassis_Index . '.' . $cpu_Index; my $cpu_Status = $result->{$key}; - my $cpu_ManufacturerName = $result2->{$oid_cpuManufacturerName . '.' . $cpu_Index}; - my $cpu_StatusState = $result2->{$oid_cpuStatusState . '.' . $cpu_Index}; - my $cpu_CurrentSpeed = $result->{$oid_cpuCurrentSpeed . '.' . $cpu_Index}; - my $cpu_BrandName = $result2->{$oid_cpuBrandName . '.' . $cpu_Index}; - my $cpu_Chassis = $result2->{$oid_cpuChassis . '.' . $cpu_Index}; - my $cpu_StatusReading = $result2->{$oid_cpuStatusReading . '.' . $cpu_Index}; + my $cpu_ManufacturerName = $result2->{$oid_cpuManufacturerName . '.' . $instance}; + my $cpu_StatusState = $result2->{$oid_cpuStatusState . '.' . $instance}; + my $cpu_CurrentSpeed = $result2->{$oid_cpuCurrentSpeed . '.' . $instance}; + my $cpu_BrandName = $result2->{$oid_cpuBrandName . '.' . $instance}; + my $cpu_Chassis = $result2->{$oid_cpuChassis . '.' . $instance}; + my $cpu_StatusReading = $result2->{$oid_cpuStatusReading . '.' . $instance}; $self->{components}->{cpu}->{total}++; $self->{output}->output_add(long_msg => sprintf("cpu %d status is %s, state is %s, current speed is %d MHz [chassis: %d, Model: %s].", - $cpu_Index, ${$status{$cpu_Status}}[0], ${$statusState{$cpu_StatusState}}[0], + $cpu_Index, ${$status{$cpu_Status}}[0], $statusState{$cpu_StatusState}, $cpu_CurrentSpeed, $chassis_Index, $cpu_BrandName )); diff --git a/hardware/server/dell/openmanage/mode/hardware.pm b/hardware/server/dell/openmanage/mode/hardware.pm index feeeb6b37..03c143589 100644 --- a/hardware/server/dell/openmanage/mode/hardware.pm +++ b/hardware/server/dell/openmanage/mode/hardware.pm @@ -44,6 +44,7 @@ use hardware::server::dell::openmanage::mode::components::globalstatus; use hardware::server::dell::openmanage::mode::components::fan; use hardware::server::dell::openmanage::mode::components::psu; use hardware::server::dell::openmanage::mode::components::temperature; +use hardware::server::dell::openmanage::mode::components::cpu; sub new { my ($class, %options) = @_; @@ -76,6 +77,7 @@ sub run { hardware::server::dell::openmanage::mode::components::fan::check($self); hardware::server::dell::openmanage::mode::components::psu::check($self); hardware::server::dell::openmanage::mode::components::temperature::check($self); + hardware::server::dell::openmanage::mode::components::cpu::check($self); my $total_components = 0; my $display_by_component = ''; From 2b93fd2ad9453abdd4d28ab4a06cc69b49fbbc35 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Thu, 13 Feb 2014 16:02:30 +0000 Subject: [PATCH 2/3] Remove fan perfdata #5151 --- hardware/server/dell/openmanage/mode/components/fan.pm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hardware/server/dell/openmanage/mode/components/fan.pm b/hardware/server/dell/openmanage/mode/components/fan.pm index e1fd092b3..f216784b6 100644 --- a/hardware/server/dell/openmanage/mode/components/fan.pm +++ b/hardware/server/dell/openmanage/mode/components/fan.pm @@ -92,11 +92,6 @@ sub check { short_msg => sprintf("fan %d status is %s", $fan_Index, ${$status{$fan_Status}}[0])); } - - if (defined($fan_Reading)) { - $self->{output}->perfdata_add(label => "fan_" . $fan_Index . "_speed", unit => 'rpm', - value => $fan_Reading); - } } } From a4d9a335c0ff5dc2a47593098982e9d098457c32 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Fri, 14 Feb 2014 13:41:50 +0000 Subject: [PATCH 3/3] Add Cisco 2800 --- network/cisco/2800/plugin.pm | 69 ++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 network/cisco/2800/plugin.pm diff --git a/network/cisco/2800/plugin.pm b/network/cisco/2800/plugin.pm new file mode 100644 index 000000000..be03ff512 --- /dev/null +++ b/network/cisco/2800/plugin.pm @@ -0,0 +1,69 @@ +################################################################################ +# Copyright 2005-2013 MERETHIS +# Centreon is developped by : Julien Mathis and Romain Le Merlus under +# GPL Licence 2.0. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation ; either version 2 of the License. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, see . +# +# Linking this program statically or dynamically with other modules is making a +# combined work based on this program. Thus, the terms and conditions of the GNU +# General Public License cover the whole combination. +# +# As a special exception, the copyright holders of this program give MERETHIS +# permission to link this program with independent modules to produce an executable, +# regardless of the license terms of these independent modules, and to copy and +# distribute the resulting executable under terms of MERETHIS choice, provided that +# MERETHIS also meet, for each linked independent module, the terms and conditions +# of the license of that module. An independent module is a module which is not +# derived from this program. If you modify this program, you may extend this +# exception to your version of the program, but you are not obliged to do so. If you +# do not wish to do so, delete this exception statement from your version. +# +# For more information : contact@centreon.com +# Authors : Quentin Garnier +# +#################################################################################### + +package network::cisco::2800::plugin; + +use strict; +use warnings; +use base qw(centreon::plugins::script_snmp); + +sub new { + my ($class, %options) = @_; + my $self = $class->SUPER::new(package => __PACKAGE__, %options); + bless $self, $class; + # $options->{options} = options object + + $self->{version} = '1.0'; + %{$self->{modes}} = ( + 'cpu' => 'network::cisco::common::mode::cpu', + 'environment' => 'network::cisco::common::mode::environment', + 'list-interfaces' => 'snmp_standard::mode::listinterfaces', + 'memory' => 'network::cisco::common::mode::memory', + 'packet-errors' => 'snmp_standard::mode::packeterrors', + 'traffic' => 'snmp_standard::mode::traffic', + ); + + return $self; +} + +1; + +__END__ + +=head1 PLUGIN DESCRIPTION + +Check Cisco 3750 in SNMP. + +=cut