From c6594108c53e4e0f86d4c3db0c62e2c4df9f850d Mon Sep 17 00:00:00 2001 From: Colin Gagnaire Date: Thu, 25 Apr 2019 17:05:14 +0200 Subject: [PATCH] enh cisco meraki device usage, add list devices --- .../cloudcontroller/snmp/mode/deviceusage.pm | 29 +++- .../cloudcontroller/snmp/mode/listdevices.pm | 140 ++++++++++++++++++ .../meraki/cloudcontroller/snmp/plugin.pm | 5 +- 3 files changed, 168 insertions(+), 6 deletions(-) create mode 100644 centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/mode/listdevices.pm diff --git a/centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/mode/deviceusage.pm b/centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/mode/deviceusage.pm index 03f9f0f5b..1123e38c9 100644 --- a/centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/mode/deviceusage.pm +++ b/centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/mode/deviceusage.pm @@ -110,7 +110,7 @@ sub set_counters { my ($self, %options) = @_; $self->{maps_counters_type} = [ - { name => 'global', type => 0 }, + { name => 'global', type => 0, cb_init => 'skip_global' }, { name => 'device', type => 1, cb_prefix_output => 'prefix_device_output', message_multiple => 'All devices are ok' }, { name => 'interface', type => 1, cb_prefix_output => 'prefix_interface_output', message_multiple => 'All device interfaces are ok', skipped_code => { -10 => 1 } }, ]; @@ -177,6 +177,7 @@ sub new { "filter-name:s" => { name => 'filter_name' }, "filter-interface:s" => { name => 'filter_interface' }, "filter-network:s" => { name => 'filter_network' }, + "filter-product:s" => { name => 'filter_product' }, "warning-status:s" => { name => 'warning_status', default => '' }, "critical-status:s" => { name => 'critical_status', default => '%{status} =~ /offline/' }, "speed-in:s" => { name => 'speed_in' }, @@ -194,10 +195,17 @@ sub check_options { $self->change_macros(macros => ['warning_status', 'critical_status']); } +sub skip_global { + my ($self, %options) = @_; + + scalar(keys %{$self->{device}}) > 1 ? return(0) : return(1); +} + sub prefix_device_output { my ($self, %options) = @_; - return "Device '" . $options{instance_value}->{display} . "' [network: " . $options{instance_value}->{network} . "] "; + return "Device '" . $options{instance_value}->{display} . "' [network: " . $options{instance_value}->{network} . "]" . + " [product: " . $options{instance_value}->{product} . "] "; } sub prefix_interface_output { @@ -214,6 +222,7 @@ my $mapping = { devName => { oid => '.1.3.6.1.4.1.29671.1.1.4.1.2' }, devStatus => { oid => '.1.3.6.1.4.1.29671.1.1.4.1.3', map => \%map_status }, devClientCount => { oid => '.1.3.6.1.4.1.29671.1.1.4.1.5' }, + devProductCode => { oid => '.1.3.6.1.4.1.29671.1.1.4.1.9' }, devNetworkName => { oid => '.1.3.6.1.4.1.29671.1.1.4.1.11' }, }; my $mapping2 = { @@ -232,6 +241,7 @@ sub manage_selection { my $snmp_result = $options{snmp}->get_multiple_table(oids => [ { oid => $mapping->{devName}->{oid} }, { oid => $mapping2->{devInterfaceName}->{oid} }, + { oid => $mapping->{devProductCode}->{oid} }, { oid => $mapping->{devNetworkName}->{oid} } ], nothing_quit => 1); @@ -241,11 +251,17 @@ sub manage_selection { my $dev_name = $snmp_result->{$mapping->{devName}->{oid}}->{$oid}; my $network = defined($snmp_result->{$mapping->{devNetworkName}->{oid}}->{ $mapping->{devNetworkName}->{oid} . '.' . $instance }) ? $snmp_result->{$mapping->{devNetworkName}->{oid}}->{ $mapping->{devNetworkName}->{oid} . '.' . $instance } : 'n/a'; + my $product = $snmp_result->{$mapping->{devProductCode}->{oid}}->{ $mapping->{devProductCode}->{oid} . '.' . $instance }; if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' && $dev_name !~ /$self->{option_results}->{filter_name}/) { $self->{output}->output_add(long_msg => "skipping device '" . $dev_name . "': no matching filter.", debug => 1); next; } + if (defined($self->{option_results}->{filter_product}) && $self->{option_results}->{filter_product} ne '' && + $product !~ /$self->{option_results}->{filter_product}/) { + $self->{output}->output_add(long_msg => "skipping device '" . $dev_name . "': no matching filter.", debug => 1); + next; + } if (defined($self->{option_results}->{filter_network}) && $self->{option_results}->{filter_network} ne '' && $network !~ /$self->{option_results}->{filter_network}/) { $self->{output}->output_add(long_msg => "skipping device '" . $dev_name . "': no matching filter.", debug => 1); @@ -267,7 +283,7 @@ sub manage_selection { } $self->{global}->{total}++; - $self->{device}->{$instance} = { display => $dev_name, network => $network }; + $self->{device}->{$instance} = { display => $dev_name, network => $network, product => $product }; } if (scalar(keys %{$self->{interface}}) > 0) { @@ -297,7 +313,8 @@ sub manage_selection { $self->{cache_name} = "cisco_meraki_" . $self->{mode} . '_' . $options{snmp}->get_hostname() . '_' . $options{snmp}->get_port() . '_' . (defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all')) . '_' . (defined($self->{option_results}->{filter_name}) ? md5_hex($self->{option_results}->{filter_name}) : md5_hex('all')) . '_' . - (defined($self->{option_results}->{filter_interface}) ? md5_hex($self->{option_results}->{filter_interface}) : md5_hex('all')); + (defined($self->{option_results}->{filter_interface}) ? md5_hex($self->{option_results}->{filter_interface}) : md5_hex('all')) . '_' . + (defined($self->{option_results}->{filter_product}) ? md5_hex($self->{option_results}->{filter_product}) : md5_hex('all')); } 1; @@ -319,6 +336,10 @@ Example: --filter-counters='^clients$' Filter device name (can be a regexp). +=item B<--filter-product> + +Filter device product code (can be a regexp). + =item B<--filter-network> Filter by network name (can be a regexp). diff --git a/centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/mode/listdevices.pm b/centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/mode/listdevices.pm new file mode 100644 index 000000000..54b21b4af --- /dev/null +++ b/centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/mode/listdevices.pm @@ -0,0 +1,140 @@ +# +# Copyright 2019 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::cisco::meraki::cloudcontroller::snmp::mode::listdevices; + +use base qw(centreon::plugins::mode); + +use strict; +use warnings; + +my %map_status = ( + 0 => 'offline', + 1 => 'online', +); +my $mapping = { + devName => { oid => '.1.3.6.1.4.1.29671.1.1.4.1.2' }, + devStatus => { oid => '.1.3.6.1.4.1.29671.1.1.4.1.3', map => \%map_status }, + devProductCode => { oid => '.1.3.6.1.4.1.29671.1.1.4.1.9' }, + devNetworkName => { oid => '.1.3.6.1.4.1.29671.1.1.4.1.11' }, +}; + +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 => { + "filter-name:s" => { name => 'filter_name' }, + }); + return $self; +} + +sub check_options { + my ($self, %options) = @_; + $self->SUPER::init(%options); +} + +sub manage_selection { + my ($self, %options) = @_; + + my $snmp_result = $options{snmp}->get_multiple_table(oids => [ + { oid => $mapping->{devName}->{oid} }, + { oid => $mapping->{devStatus}->{oid} }, + { oid => $mapping->{devProductCode}->{oid} }, + { oid => $mapping->{devNetworkName}->{oid} } + ], return_type => 1, nothing_quit => 1); + + $self->{devices} = {}; + foreach my $oid (keys %{$snmp_result}) { + next if ($oid !~ /^$mapping->{devName}->{oid}\.(.*)$/); + my $instance = $1; + my $result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result, instance => $instance); + + if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' && + $result->{devName} !~ /$self->{option_results}->{filter_name}/) { + $self->{output}->output_add(long_msg => "skipping device '" . $result->{devName} . "': no matching filter.", debug => 1); + next; + } + + $self->{devices}->{$instance} = { + name => $result->{devName}, + status => $result->{devStatus}, + network => $result->{devNetworkName}, + product => $result->{devProductCode}, + }; + } +} + +sub run { + my ($self, %options) = @_; + + $self->manage_selection(%options); + foreach my $instance (sort keys %{$self->{devices}}) { + $self->{output}->output_add(long_msg => "[name = '" . $self->{devices}->{$instance}->{name} . "']" . + " [status = '" . $self->{devices}->{$instance}->{status} . "']" . + " [network = '" . $self->{devices}->{$instance}->{network} . "']" . + " [product = '" . $self->{devices}->{$instance}->{product} . "']"); + } + + $self->{output}->output_add(severity => 'OK', + short_msg => 'List devices:'); + $self->{output}->display(nolabel => 1, force_ignore_perfdata => 1, force_long_output => 1); + $self->{output}->exit(); +} + +sub disco_format { + my ($self, %options) = @_; + + $self->{output}->add_disco_format(elements => ['name', 'status', 'network', 'product']); +} + +sub disco_show { + my ($self, %options) = @_; + + $self->manage_selection(%options); + foreach my $instance (sort keys %{$self->{devices}}) { + $self->{output}->add_disco_entry( + name => $self->{devices}->{$instance}->{name}, + status => $self->{devices}->{$instance}->{status}, + network => $self->{devices}->{$instance}->{network}, + product => $self->{devices}->{$instance}->{product}, + ); + } +} + +1; + +__END__ + +=head1 MODE + +List devices. + +=over 8 + +=item B<--filter-name> + +Filter by device name (can be a regexp). + +=back + +=cut diff --git a/centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/plugin.pm b/centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/plugin.pm index a19d8be42..d387f9615 100644 --- a/centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/plugin.pm +++ b/centreon-plugins/network/cisco/meraki/cloudcontroller/snmp/plugin.pm @@ -31,8 +31,9 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( - 'device-usage' => 'network::cisco::meraki::cloudcontroller::snmp::mode::deviceusage', - ); + 'device-usage' => 'network::cisco::meraki::cloudcontroller::snmp::mode::deviceusage', + 'list-devices' => 'network::cisco::meraki::cloudcontroller::snmp::mode::listdevices', + ); return $self; }