Skip to content

Commit c9e33ed

Browse files
committed
UCDMIB: Error Flag should be optional, some implimentations don't support it
1 parent 4426272 commit c9e33ed

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

plugins-scripts/Classes/UCDMIB/Components/DiskSubsystem.pm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,13 @@ sub check {
9696
$spaceleft =~ s/(?<=\d)(?=(?:\d\d\d)+\b)/,/g;
9797
$self->add_info(sprintf '%s has %s MB left (%.2f%%)%s',
9898
$self->{dskPath}, $spaceleft, $free,
99-
$self->{dskErrorFlag} eq 'error'
100-
? sprintf ' - %s', $self->{dskErrorMsg}
101-
: '');
99+
defined $self->{dskErrorFlag} && defined $self->{dskErrorMsg}
100+
&& $self->{dskErrorFlag} eq 'error'
101+
? sprintf ' - %s', $self->{dskErrorMsg}
102+
: '');
102103

103104
# raise critical error if errorflag is set
104-
if ($self->{dskErrorFlag} eq 'error') {
105+
if (defined $self->{dskErrorFlag} && $self->{dskErrorFlag} eq 'error') {
105106
$self->add_critical();
106107
} else {
107108
# otherwise check thresholds

plugins-scripts/Classes/UCDMIB/Components/LoadSubsystem.pm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,12 @@ sub check {
4343
$self->add_info(
4444
sprintf '%s is %.2f%s',
4545
lc $self->{laNames}, $self->{laLoad},
46-
$self->{'laErrorFlag'} eq 'error'
47-
? sprintf ' (%s)', $self->{'laErrMessage'}
48-
: ''
46+
$self->{'laErrorFlag'} && defined $self->{'laErrMessage'}
47+
&& $self->{'laErrorFlag'} eq 'error'
48+
? sprintf ' (%s)', $self->{'laErrMessage'}
49+
: ''
4950
);
50-
if ($self->{'laErrorFlag'} eq 'error') {
51+
if (defined $self->{'laErrorFlag'} && $self->{'laErrorFlag'} eq 'error') {
5152
$self->add_critical();
5253
} else {
5354
$self->add_message($self->check_thresholds(

plugins-scripts/Classes/UCDMIB/Components/ProcessSubsystem.pm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,18 @@ sub check {
4747
$self->add_info(sprintf '%s: %d%s',
4848
$self->{prNames},
4949
$self->{prCount},
50-
$self->{prErrorFlag} eq 'error'
51-
? sprintf ' (%s)', $self->{prErrMessage}
52-
: '');
50+
defined $self->{prErrorFlag} && defined $self->{prErrMessage}
51+
&& $self->{prErrorFlag} eq 'error'
52+
? sprintf ' (%s)', $self->{prErrMessage}
53+
: '');
5354
my $threshold = sprintf '%u:%s',
5455
!$self->{prMin} && !$self->{prMax} ? 1 : $self->{prMin},
5556
$self->{prMax} && $self->{prMax} >= $self->{prMin} ? $self->{prMax} : '';
5657
$self->set_thresholds(
5758
metric => $self->{prNames},
5859
warning => $threshold,
5960
critical => $threshold);
60-
if ($self->{prErrorFlag} eq 'error') {
61+
if (defined $self->{prErrorFlag} && $self->{prErrorFlag} eq 'error') {
6162
$self->add_critical();
6263
} else {
6364
$self->add_message($self->check_thresholds(

0 commit comments

Comments
 (0)