fix(printers/standard): markersupply mode - illegal division (#2778)

This commit is contained in:
qgarnier 2021-05-07 15:37:32 +02:00 committed by GitHub
parent 6557e342ab
commit d0d56641e4
2 changed files with 54 additions and 46 deletions

View File

@ -28,15 +28,15 @@ use centreon::plugins::misc;
# 1 means: do percent calc # 1 means: do percent calc
my %unit_managed = ( my %unit_managed = (
3 => 1, # tenThousandthsOfInches(3), -- .0001 3 => 1, # tenThousandthsOfInches(3), -- .0001
4 => 1, # micrometers(4), 4 => 1, # micrometers(4),
7 => 1, # impressions(7), 7 => 1, # impressions(7),
8 => 1, # sheets(8), 8 => 1, # sheets(8),
12 => 1, # thousandthsOfOunces(12), 12 => 1, # thousandthsOfOunces(12),
13 => 1, # tenthsOfGrams(13), 13 => 1, # tenthsOfGrams(13),
14 => 1, # hundrethsOfFluidOunces(14), 14 => 1, # hundrethsOfFluidOunces(14),
15 => 1, # tenthsOfMilliliters(15) 15 => 1, # tenthsOfMilliliters(15)
19 => 0, # percent(19) 19 => 0 # percent(19)
); );
sub new { sub new {
@ -44,12 +44,11 @@ sub new {
my $self = $class->SUPER::new(package => __PACKAGE__, %options); my $self = $class->SUPER::new(package => __PACKAGE__, %options);
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => $options{options}->add_options(arguments => {
{ 'warning:s' => { name => 'warning' },
"warning:s" => { name => 'warning' }, 'critical:s' => { name => 'critical' },
"critical:s" => { name => 'critical' }, 'filter:s' => { name => 'filter' }
"filter:s" => { name => 'filter' }, });
});
return $self; return $self;
} }
@ -70,7 +69,6 @@ sub check_options {
sub run { sub run {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{snmp} = $options{snmp};
my $oid_prtMarkerSuppliesColorantIndex = '.1.3.6.1.2.1.43.11.1.1.3'; my $oid_prtMarkerSuppliesColorantIndex = '.1.3.6.1.2.1.43.11.1.1.3';
my $oid_prtMarkerSuppliesDescription = '.1.3.6.1.2.1.43.11.1.1.6'; my $oid_prtMarkerSuppliesDescription = '.1.3.6.1.2.1.43.11.1.1.6';
@ -78,24 +76,30 @@ sub run {
my $oid_prtMarkerSuppliesMaxCapacity = '.1.3.6.1.2.1.43.11.1.1.8'; my $oid_prtMarkerSuppliesMaxCapacity = '.1.3.6.1.2.1.43.11.1.1.8';
my $oid_prtMarkerSuppliesLevel = '.1.3.6.1.2.1.43.11.1.1.9'; my $oid_prtMarkerSuppliesLevel = '.1.3.6.1.2.1.43.11.1.1.9';
my $oid_prtMarkerColorantValue = '.1.3.6.1.2.1.43.12.1.1.4'; my $oid_prtMarkerColorantValue = '.1.3.6.1.2.1.43.12.1.1.4';
my $result = $self->{snmp}->get_table(oid => $oid_prtMarkerSuppliesColorantIndex, nothing_quit => 1); my $result = $options{snmp}->get_table(oid => $oid_prtMarkerSuppliesColorantIndex, nothing_quit => 1);
$self->{snmp}->load(oids => [$oid_prtMarkerSuppliesDescription, $oid_prtMarkerSuppliesSupplyUnit, $options{snmp}->load(
$oid_prtMarkerSuppliesMaxCapacity, $oid_prtMarkerSuppliesLevel], oids => [
instances => [keys %$result], instance_regexp => '(\d+\.\d+)$'); $oid_prtMarkerSuppliesDescription, $oid_prtMarkerSuppliesSupplyUnit,
$oid_prtMarkerSuppliesMaxCapacity, $oid_prtMarkerSuppliesLevel
],
instances => [keys %$result], instance_regexp => '(\d+\.\d+)$'
);
foreach (keys %$result) { foreach (keys %$result) {
if ($result->{$_} != 0) { if ($result->{$_} != 0) {
/(\d+)\.(\d+)$/; # $1 = hrDeviceIndex /(\d+)\.(\d+)$/; # $1 = hrDeviceIndex
$self->{snmp}->load(oids => [$oid_prtMarkerColorantValue . '.' . $1 . '.' . $result->{$_}]); $options{snmp}->load(oids => [$oid_prtMarkerColorantValue . '.' . $1 . '.' . $result->{$_}]);
} }
} }
$self->{output}->output_add(severity => 'OK', $self->{output}->output_add(
short_msg => "Marker supply usages are ok."); severity => 'OK',
short_msg => 'Marker supply usages are ok.'
);
my $perf_label = {}; my $perf_label = {};
my $result2 = $self->{snmp}->get_leef(); my $result2 = $options{snmp}->get_leef();
foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) { foreach my $key ($options{snmp}->oid_lex_sort(keys %$result)) {
$key =~ /(\d+).(\d+)$/; $key =~ /(\d+).(\d+)$/;
my ($hrDeviceIndex, $prtMarkerSuppliesIndex) = ($1, $2); my ($hrDeviceIndex, $prtMarkerSuppliesIndex) = ($1, $2);
my $instance = $hrDeviceIndex . '.' . $prtMarkerSuppliesIndex; my $instance = $hrDeviceIndex . '.' . $prtMarkerSuppliesIndex;
@ -125,15 +129,17 @@ sub run {
} }
my $prct_value = $current_value; my $prct_value = $current_value;
if ($unit_managed{$unit} == 1) { if ($unit_managed{$unit} == 1 && $max_value > 0) {
$prct_value = $current_value * 100 / $max_value; $prct_value = $current_value * 100 / $max_value;
} }
my $exit = $self->{perfdata}->threshold_check(value => $prct_value, threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); my $exit = $self->{perfdata}->threshold_check(value => $prct_value, threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
$self->{output}->output_add(long_msg => sprintf("Marker supply '%s': %.2f %% [instance: '%s']", $descr, $prct_value, $hrDeviceIndex . '.' . $prtMarkerSuppliesIndex)); $self->{output}->output_add(long_msg => sprintf("Marker supply '%s': %.2f %% [instance: '%s']", $descr, $prct_value, $hrDeviceIndex . '.' . $prtMarkerSuppliesIndex));
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("Marker supply '%s': %.2f %%", $descr, $prct_value)); severity => $exit,
short_msg => sprintf("Marker supply '%s': %.2f %%", $descr, $prct_value)
);
} }
my $label = $descr; my $label = $descr;
@ -146,11 +152,13 @@ sub run {
} }
$perf_label->{$label} = 1; $perf_label->{$label} = 1;
$self->{output}->perfdata_add(label => $label, unit => '%', $self->{output}->perfdata_add(
value => sprintf("%.2f", $prct_value), label => $label, unit => '%',
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'), value => sprintf("%.2f", $prct_value),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
min => 0, max => 100); critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'),
min => 0, max => 100
);
} }
$self->{output}->display(); $self->{output}->display();

View File

@ -30,14 +30,14 @@ sub new {
bless $self, $class; bless $self, $class;
$self->{version} = '0.1'; $self->{version} = '0.1';
%{$self->{modes}} = ( $self->{modes} = {
'cover-status' => 'hardware::printers::standard::rfc3805::mode::coverstatus', 'cover-status' => 'hardware::printers::standard::rfc3805::mode::coverstatus',
'hardware-device' => 'snmp_standard::mode::hardwaredevice', 'hardware-device' => 'snmp_standard::mode::hardwaredevice',
'markersupply-usage' => 'hardware::printers::standard::rfc3805::mode::markersupply', 'markersupply-usage' => 'hardware::printers::standard::rfc3805::mode::markersupply',
'marker-impression' => 'hardware::printers::standard::rfc3805::mode::markerimpression', 'marker-impression' => 'hardware::printers::standard::rfc3805::mode::markerimpression',
'papertray-usage' => 'hardware::printers::standard::rfc3805::mode::papertray', 'papertray-usage' => 'hardware::printers::standard::rfc3805::mode::papertray',
'printer-error' => 'snmp_standard::mode::printererror', 'printer-error' => 'snmp_standard::mode::printererror'
); };
return $self; return $self;
} }