fix unit raritan

This commit is contained in:
garnier-quentin 2020-02-21 15:34:27 +01:00
parent 48761dac52
commit 9f62d733e1

View File

@ -72,15 +72,25 @@ sub check {
if ($value =~ /[0-9]/) { if ($value =~ /[0-9]/) {
$value *= 10 ** -int($result->{Decimal}); $value *= 10 ** -int($result->{Decimal});
} }
$self->{output}->output_add(long_msg => sprintf("'%s' %s state is '%s' [instance: %s, value: %s, unit: %s, label: %s]", $self->{output}->output_add(
long_msg => sprintf(
"'%s' %s state is '%s' [instance: %s, value: %s, unit: %s, label: %s]",
$instance, $component, $result->{State}, $instance, $component, $result->{State},
$instance, $value, $result->{Unit}->{unit}, $result2->{Label})); $instance, $value, $result->{Unit}->{unit}, $result2->{Label}
my $exit = $self->get_severity(section => $component, label => $value_type, )
instance => $instance, value => $result->{State}); );
my $exit = $self->get_severity(
section => $component, label => $value_type,
instance => $instance, value => $result->{State}
);
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit, $self->{output}->output_add(
short_msg => sprintf("'%s' %s state is '%s'", severity => $exit,
$instance, $component, $result->{State})); short_msg => sprintf(
"'%s' %s state is '%s'",
$instance, $component, $result->{State}
)
);
} }
if ($value =~ /[0-9]/) { if ($value =~ /[0-9]/) {
@ -112,12 +122,17 @@ sub check {
$crit = $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $component . '-instance-' . $instance); $crit = $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $component . '-instance-' . $instance);
} }
if (!$self->{output}->is_status(value => $exit2, compare => 'ok', litteral => 1)) { if (!$self->{output}->is_status(value => $exit2, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit2, $self->{output}->output_add(
short_msg => sprintf("'%s' %s value is %s %s", severity => $exit2,
$instance, $component, $value, $result->{Unit}->{unit})); short_msg => sprintf(
"'%s' %s value is %s %s",
$instance, $component, $value, $result->{Unit}->{unit}
)
);
} }
my $nunit = (!defined($result->{Unit}->{nunit}) ? $result->{Unit}->{nunit} : lc($result->{Unit}->{unit})); my $nunit = (defined($result->{Unit}->{nunit}) ? $result->{Unit}->{nunit} : lc($result->{Unit}->{unit}));
$self->{output}->perfdata_add( $self->{output}->perfdata_add(
label => $component, unit => $result->{Unit}->{unit}, label => $component, unit => $result->{Unit}->{unit},
nlabel => 'hardware.sensor.' . $options{type} . '.' . lc($component) . '.' . $nunit, nlabel => 'hardware.sensor.' . $options{type} . '.' . lc($component) . '.' . $nunit,