tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

+ Fix #112

This commit is contained in:
garnier-quentin 2015-07-29 13:52:14 +02:00
parent 12f41d0438
commit cc89e244fc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
snmp_standard/mode/interfaces.pm
View File

@ -489,7 +489,8 @@ sub check_oids_label {
my ($self, %options) = @_; my ($self, %options) = @_;
foreach (('oid_filter', 'oid_display')) { foreach (('oid_filter', 'oid_display')) {
if (!defined($self->{oids_label}->{lc($self->{option_results}->{$_})})) { $self->{option_results}->{$_} = lc($self->{option_results}->{$_}) if (defined($self->{option_results}->{$_}));
if (!defined($self->{oids_label}->{$self->{option_results}->{$_}})) {
my $label = $_; my $label = $_;
$label =~ s/_/-/g; $label =~ s/_/-/g;
$self->{output}->add_option_msg(short_msg => "Unsupported oid in --" . $label . " option."); $self->{output}->add_option_msg(short_msg => "Unsupported oid in --" . $label . " option.");
@ -497,10 +498,14 @@ sub check_oids_label {
} }
} }
if (defined($self->{option_results}->{oid_extra_display}) && !defined($self->{oids_label}->{lc($self->{option_results}->{oid_extra_display})})) {
if (defined($self->{option_results}->{oid_extra_display})) {
$self->{option_results}->{oid_extra_display} = lc($self->{option_results}->{oid_extra_display});
if (!defined($self->{oids_label}->{$self->{option_results}->{oid_extra_display}})) {
$self->{output}->add_option_msg(short_msg => "Unsupported oid in --oid-extra-display option."); $self->{output}->add_option_msg(short_msg => "Unsupported oid in --oid-extra-display option.");
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
}
} }
sub default_warning_status { sub default_warning_status {
@ -608,6 +613,7 @@ sub check_options {
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
$self->{get_speed} = 0;
if ((!defined($self->{option_results}->{speed}) || $self->{option_results}->{speed} eq '') && if ((!defined($self->{option_results}->{speed}) || $self->{option_results}->{speed} eq '') &&
((!defined($self->{option_results}->{speed_in}) || $self->{option_results}->{speed_in} eq '') || ((!defined($self->{option_results}->{speed_in}) || $self->{option_results}->{speed_in} eq '') ||
(!defined($self->{option_results}->{speed_out}) || $self->{option_results}->{speed_out} eq ''))) { (!defined($self->{option_results}->{speed_out}) || $self->{option_results}->{speed_out} eq ''))) {