From 9c92f2961cd3752b1c8eb0c7a92b3686c2e7d405 Mon Sep 17 00:00:00 2001 From: garnier-quentin Date: Thu, 20 Aug 2015 17:08:00 +0200 Subject: [PATCH] + fix alcatel domain oxe --- network/alcatel/oxe/snmp/mode/domainusage.pm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/network/alcatel/oxe/snmp/mode/domainusage.pm b/network/alcatel/oxe/snmp/mode/domainusage.pm index 0c4838d27..b37642acf 100644 --- a/network/alcatel/oxe/snmp/mode/domainusage.pm +++ b/network/alcatel/oxe/snmp/mode/domainusage.pm @@ -51,7 +51,6 @@ my $maps_counters = { } }; - sub custom_usage_perfdata { my ($self, %options) = @_; @@ -91,6 +90,10 @@ sub custom_usage_output { sub custom_cac_usage_calc { my ($self, %options) = @_; + if ($options{new_datas}->{$self->{instance} . '_cacAllowed'} <= 0) { + $self->{error_msg} = "skipped (no allowed)"; + return -2; + } $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'}; $self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_cacAllowed'}; $self->{result_values}->{used} = $options{new_datas}->{$self->{instance} . '_cacUsed'}; @@ -105,6 +108,10 @@ sub custom_cac_usage_calc { sub custom_conference_usage_calc { my ($self, %options) = @_; + if ($options{new_datas}->{$self->{instance} . '_confAvailable'} <= 0) { + $self->{error_msg} = "skipped (no available)"; + return -2; + } $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'}; $self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_confAvailable'}; $self->{result_values}->{used} = $options{new_datas}->{$self->{instance} . '_confBusy'}; @@ -240,7 +247,7 @@ sub manage_selection { my ($self, %options) = @_; $self->{domain} = {}; - my $oid_ipDomainEntry = '.1.3.6.1.4.1.637.64.4400.1.3.1.1'; + my $oid_ipDomainEntry = '.1.3.6.1.4.1.637.64.4400.1.3.1'; $self->{results} = $self->{snmp}->get_table(oid => $oid_ipDomainEntry, nothing_quit => 1); foreach my $oid (keys %{$self->{results}}) { @@ -257,8 +264,8 @@ sub manage_selection { %{$result}}; } - if (defined($self->{option_results}->{no_component}) && scalar(keys %{$self->{domain}}) <= 0) { - $self->{output}->output_add(severity => $self->{no_components}, + if (scalar(keys %{$self->{domain}}) <= 0) { + $self->{output}->output_add(severity => defined($self->{no_components}) ? $self->{no_components} : 'unknown', short_msg => 'No components are checked.'); } } @@ -287,6 +294,10 @@ Can be: 'cac-usage' (%), 'conference-usage' (%). Threshold critical. Can be: 'cac-usage' (%), 'conference-usage' (%). +=item B<--no-component> + +Set the threshold where no components (Default: 'unknown' returns). + =back =cut