From bcd36981c419f32a4bbae4e3d77f9a3ba2b45f61 Mon Sep 17 00:00:00 2001 From: qgarnier Date: Mon, 23 May 2022 15:34:35 +0200 Subject: [PATCH] (plugin) network::f5::bigip::snmp - change error message if no entries found (#3681) --- .../network/f5/bigip/snmp/mode/nodestatus.pm | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/centreon-plugins/network/f5/bigip/snmp/mode/nodestatus.pm b/centreon-plugins/network/f5/bigip/snmp/mode/nodestatus.pm index 42dba868a..93642f0af 100644 --- a/centreon-plugins/network/f5/bigip/snmp/mode/nodestatus.pm +++ b/centreon-plugins/network/f5/bigip/snmp/mode/nodestatus.pm @@ -24,7 +24,7 @@ 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) = @_; @@ -38,68 +38,64 @@ sub custom_status_output { return $msg; } +sub prefix_node_output { + my ($self, %options) = @_; + + return "Node '" . $options{instance_value}->{display} . "' "; +} + sub set_counters { my ($self, %options) = @_; $self->{maps_counters_type} = [ - { name => 'node', type => 1, cb_prefix_output => 'prefix_node_output', message_multiple => 'All Nodes are ok', skipped_code => { -10 => 1 } }, + { name => 'node', type => 1, cb_prefix_output => 'prefix_node_output', message_multiple => 'All nodes are ok', skipped_code => { -10 => 1 } } ]; + $self->{maps_counters}->{node} = [ - { label => 'status', threshold => 0, set => { + { + label => 'status', + type => 2, + warning_default => '%{state} eq "enabled" and %{status} eq "yellow"', + critical_default => '%{state} eq "enabled" and %{status} eq "red"', + set => { key_values => [ { name => 'state' }, { name => 'status' }, { name => 'reason' },{ name => 'display' } ], closure_custom_output => $self->can('custom_status_output'), closure_custom_perfdata => sub { return 0; }, - closure_custom_threshold_check => \&catalog_status_threshold, + closure_custom_threshold_check => \&catalog_status_threshold_ng } }, { label => 'current-server-connections', set => { key_values => [ { name => 'ltmNodeAddrStatServerCurConns' }, { name => 'display' } ], output_template => 'current server connections : %s', perfdatas => [ - { label => 'current_server_connections', value => 'ltmNodeAddrStatServerCurConns', template => '%s', - min => 0, label_extra_instance => 1, instance_use => 'display' }, - ], + { label => 'current_server_connections', template => '%s', + min => 0, label_extra_instance => 1, instance_use => 'display' } + ] } - }, + } ]; } -sub prefix_node_output { - my ($self, %options) = @_; - - return "Node '" . $options{instance_value}->{display} . "' "; -} - sub new { my ($class, %options) = @_; my $self = $class->SUPER::new(package => __PACKAGE__, %options); bless $self, $class; $options{options}->add_options(arguments => { - 'filter-name:s' => { name => 'filter_name' }, - 'unknown-status:s' => { name => 'unknown_status', default => '' }, - 'warning-status:s' => { name => 'warning_status', default => '%{state} eq "enabled" and %{status} eq "yellow"' }, - 'critical-status:s' => { name => 'critical_status', default => '%{state} eq "enabled" and %{status} eq "red"' }, + 'filter-name:s' => { name => 'filter_name' } }); return $self; } -sub check_options { - my ($self, %options) = @_; - $self->SUPER::check_options(%options); - - $self->change_macros(macros => ['warning_status', 'critical_status', 'unknown_status']); -} - my $map_node_status = { 0 => 'none', 1 => 'green', 2 => 'yellow', 3 => 'red', - 4 => 'blue', 5 => 'gray', + 4 => 'blue', 5 => 'gray' }; my $map_node_enabled = { 0 => 'none', 1 => 'enabled', - 2 => 'disabled', 3 => 'disabledbyparent', + 2 => 'disabled', 3 => 'disabledbyparent' }; # New OIDS @@ -107,16 +103,16 @@ my $mapping = { new => { AvailState => { oid => '.1.3.6.1.4.1.3375.2.2.4.3.2.1.3', map => $map_node_status }, EnabledState => { oid => '.1.3.6.1.4.1.3375.2.2.4.3.2.1.4', map => $map_node_enabled }, - StatusReason => { oid => '.1.3.6.1.4.1.3375.2.2.4.3.2.1.6' }, + StatusReason => { oid => '.1.3.6.1.4.1.3375.2.2.4.3.2.1.6' } }, old => { AvailState => { oid => '.1.3.6.1.4.1.3375.2.2.4.1.2.1.13', map => $map_node_status }, EnabledState => { oid => '.1.3.6.1.4.1.3375.2.2.4.1.2.1.14', map => $map_node_enabled }, - StatusReason => { oid => '.1.3.6.1.4.1.3375.2.2.4.1.2.1.16' }, - }, + StatusReason => { oid => '.1.3.6.1.4.1.3375.2.2.4.1.2.1.16' } + } }; my $mapping2 = { - ltmNodeAddrStatServerCurConns => { oid => '.1.3.6.1.4.1.3375.2.2.4.2.3.1.9' }, + ltmNodeAddrStatServerCurConns => { oid => '.1.3.6.1.4.1.3375.2.2.4.2.3.1.9' } }; sub manage_selection { @@ -142,7 +138,7 @@ sub manage_selection { my $result = $options{snmp}->map_instance(mapping => $mapping->{$map}, results => $snmp_result->{$branch_name}, instance => $num . '.' . $index); my $name = $self->{output}->decode(join('', map(chr($_), split(/\./, $index)))); - + if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' && $name !~ /$self->{option_results}->{filter_name}/) { $self->{output}->output_add(long_msg => "skipping node '" . $name . "'.", debug => 1); @@ -155,6 +151,11 @@ sub manage_selection { }; } + if (scalar(keys %{$self->{node}}) <= 0) { + $self->{output}->add_option_msg(short_msg => "No entry found."); + $self->{output}->option_exit(); + } + $options{snmp}->load( oids => [ $mapping->{$map}->{EnabledState}->{oid}, @@ -175,11 +176,6 @@ sub manage_selection { $self->{node}->{$_}->{state} = $result->{EnabledState}; $self->{node}->{$_}->{ltmNodeAddrStatServerCurConns} = $result2->{ltmNodeAddrStatServerCurConns}; } - - if (scalar(keys %{$self->{node}}) <= 0) { - $self->{output}->add_option_msg(short_msg => "No entry found."); - $self->{output}->option_exit(); - } } 1;