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(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 4c643145e1
commit 23fd642b39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
hardware/printers/standard/rfc3805/mode/markersupply.pm
View File

@ -28,28 +28,27 @@ use centreon::plugins::misc;
# 1 means: do percent calc
my %unit_managed = (
3 => 1, # tenThousandthsOfInches(3), -- .0001
4 => 1, # micrometers(4),
7 => 1, # impressions(7),
8 => 1, # sheets(8),
12 => 1, # thousandthsOfOunces(12),
13 => 1, # tenthsOfGrams(13),
14 => 1, # hundrethsOfFluidOunces(14),
15 => 1, # tenthsOfMilliliters(15)
19 => 0, # percent(19)
3 => 1, # tenThousandthsOfInches(3), -- .0001
4 => 1, # micrometers(4),
7 => 1, # impressions(7),
8 => 1, # sheets(8),
12 => 1, # thousandthsOfOunces(12),
13 => 1, # tenthsOfGrams(13),
14 => 1, # hundrethsOfFluidOunces(14),
15 => 1, # tenthsOfMilliliters(15)
19 => 0 # percent(19)
);
sub new {
my ($class, %options) = @_;
my $self = $class->SUPER::new(package => __PACKAGE__, %options);
bless $self, $class;
$options{options}->add_options(arguments =>
{
"warning:s" => { name => 'warning' },
"critical:s" => { name => 'critical' },
"filter:s" => { name => 'filter' },
});
$options{options}->add_options(arguments => {
'warning:s' => { name => 'warning' },
'critical:s' => { name => 'critical' },
'filter:s' => { name => 'filter' }
});
return $self;
}
@ -70,32 +69,37 @@ sub check_options {
sub run {
my ($self, %options) = @_;
$self->{snmp} = $options{snmp};
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_prtMarkerSuppliesSupplyUnit = '.1.3.6.1.2.1.43.11.1.1.7';
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_prtMarkerColorantValue = '.1.3.6.1.2.1.43.12.1.1.4';
my $result = $self->{snmp}->get_table(oid => $oid_prtMarkerSuppliesColorantIndex, nothing_quit => 1);
$self->{snmp}->load(oids => [$oid_prtMarkerSuppliesDescription, $oid_prtMarkerSuppliesSupplyUnit,
$oid_prtMarkerSuppliesMaxCapacity, $oid_prtMarkerSuppliesLevel],
instances => [keys %$result], instance_regexp => '(\d+\.\d+)$');
my $result = $options{snmp}->get_table(oid => $oid_prtMarkerSuppliesColorantIndex, nothing_quit => 1);
$options{snmp}->load(
oids => [
$oid_prtMarkerSuppliesDescription, $oid_prtMarkerSuppliesSupplyUnit,
$oid_prtMarkerSuppliesMaxCapacity, $oid_prtMarkerSuppliesLevel
],
instances => [keys %$result], instance_regexp => '(\d+\.\d+)$'
);
foreach (keys %$result) {
if ($result->{$_} != 0) {
/(\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',
short_msg => "Marker supply usages are ok.");
$self->{output}->output_add(
severity => 'OK',
short_msg => 'Marker supply usages are ok.'
);
my $perf_label = {};
my $result2 = $self->{snmp}->get_leef();
foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) {
my $result2 = $options{snmp}->get_leef();
foreach my $key ($options{snmp}->oid_lex_sort(keys %$result)) {
$key =~ /(\d+).(\d+)$/;
my ($hrDeviceIndex, $prtMarkerSuppliesIndex) = ($1, $2);
my $instance = $hrDeviceIndex . '.' . $prtMarkerSuppliesIndex;
@ -123,19 +127,21 @@ sub run {
$self->{output}->output_add(long_msg => "Skipping marker supply '$descr' (instance: $instance): filter.");
next;
}
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;
}
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));
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit,
short_msg => sprintf("Marker supply '%s': %.2f %%", $descr, $prct_value));
$self->{output}->output_add(
severity => $exit,
short_msg => sprintf("Marker supply '%s': %.2f %%", $descr, $prct_value)
);
}
my $label = $descr;
if ($result->{$oid_prtMarkerSuppliesColorantIndex . '.' . $instance} != 0 &&
defined($result2->{$oid_prtMarkerColorantValue . '.' . $hrDeviceIndex . '.' . $result->{$oid_prtMarkerSuppliesColorantIndex . '.' . $instance}})) {
@ -145,14 +151,16 @@ sub run {
}
}
$perf_label->{$label} = 1;
$self->{output}->perfdata_add(label => $label, unit => '%',
value => sprintf("%.2f", $prct_value),
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'),
min => 0, max => 100);
$self->{output}->perfdata_add(
label => $label, unit => '%',
value => sprintf("%.2f", $prct_value),
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'),
min => 0, max => 100
);
}
$self->{output}->display();
$self->{output}->exit();
}

6
hardware/printers/standard/rfc3805/plugin.pm
View File

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