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 #1959

This commit is contained in:
garnier-quentin 2020-04-23 19:34:11 +02:00
parent 72eb580c9c
commit 8490122c4f
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
network/juniper/common/junos/mode/interfaces.pm
View File

@ -32,7 +32,7 @@ sub set_oids_errors {
$self->{oid_ifInErrors} = '.1.3.6.1.2.1.2.2.1.14'; $self->{oid_ifInErrors} = '.1.3.6.1.2.1.2.2.1.14';
$self->{oid_ifOutDiscards} = '.1.3.6.1.2.1.2.2.1.19'; $self->{oid_ifOutDiscards} = '.1.3.6.1.2.1.2.2.1.19';
$self->{oid_ifOutErrors} = '.1.3.6.1.2.1.2.2.1.20'; $self->{oid_ifOutErrors} = '.1.3.6.1.2.1.2.2.1.20';
$self->{oid_dot3StatsFCSErrors} = '.1.3.6.1.2.1.10.7.2.1.3'; $self->{oid_ifInFCSError} = '.1.3.6.1.2.1.10.7.2.1.3'; # dot3StatsFCSErrors
} }
sub set_counters { sub set_counters {
@ -41,15 +41,15 @@ sub set_counters {
$self->SUPER::set_counters(%options); $self->SUPER::set_counters(%options);
push @{$self->{maps_counters}->{int}}, push @{$self->{maps_counters}->{int}},
{ label => 'fcs-errors', filter => 'add_errors', nlabel => 'interface.fcs.errors.count', set => { { label => 'fcs-errors', filter => 'add_errors', nlabel => 'interface.packets.in.fcs.errors.count', set => {
key_values => [ { name => 'fcserror', diff => 1 }, { name => 'display' } ], key_values => [ { name => 'infcserror', diff => 1 }, { name => 'total_in_packets', diff => 1 }, { name => 'display' }, { name => 'mode_cast' } ],
output_template => 'FCS Errors : %d', closure_custom_calc => $self->can('custom_errors_calc'),
perfdatas => [ closure_custom_calc_extra_options => { label_ref1 => 'in', label_ref2 => 'fcserror' },
{ value => 'fcserror_absolute', template => '%d', closure_custom_output => $self->can('custom_errors_output'), output_error_template => 'Packets In FCS Error : %s',
label_extra_instance => 1, instance_use => 'display_absolute' }, closure_custom_perfdata => $self->can('custom_errors_perfdata'),
], closure_custom_threshold_check => $self->can('custom_errors_threshold')
}
} }
},
; ;
push @{$self->{maps_counters}->{int}}, push @{$self->{maps_counters}->{int}},
@ -58,17 +58,17 @@ sub set_counters {
output_template => 'Input Power : %s dBm', output_template => 'Input Power : %s dBm',
perfdatas => [ perfdatas => [
{ value => 'input_power_absolute', template => '%s', { value => 'input_power_absolute', template => '%s',
unit => 'dBm', label_extra_instance => 1, instance_use => 'display_absolute' }, unit => 'dBm', label_extra_instance => 1, instance_use => 'display_absolute' }
], ]
} }
}, },
{ label => 'bias-current', filter => 'add_optical', nlabel => 'interface.bias.current.milliampere', set => { { label => 'bias-current', filter => 'add_optical', nlabel => 'interface.bias.current.milliampere', set => {
key_values => [ { name => 'bias_current' }, { name => 'display' } ], key_values => [ { name => 'bias_current' }, { name => 'display' } ],
output_template => 'Bias Current : %s mA', output_template => 'Bias Current : %s mA',
perfdatas => [ perfdatas => [
{ value => 'bias_current_absolute', template => '%s', { value => 'bias_current_absolute', template => '%s'
unit => 'mA', label_extra_instance => 1, instance_use => 'display_absolute' }, unit => 'mA', label_extra_instance => 1, instance_use => 'display_absolute' },
], ]
} }
}, },
{ label => 'output-power', filter => 'add_optical', nlabel => 'interface.output.power.dbm', set => { { label => 'output-power', filter => 'add_optical', nlabel => 'interface.output.power.dbm', set => {
@ -76,8 +76,8 @@ sub set_counters {
output_template => 'Output Power : %s dBm', output_template => 'Output Power : %s dBm',
perfdatas => [ perfdatas => [
{ value => 'output_power_absolute', template => '%s', { value => 'output_power_absolute', template => '%s',
unit => 'dBm', label_extra_instance => 1, instance_use => 'display_absolute' }, unit => 'dBm', label_extra_instance => 1, instance_use => 'display_absolute' }
], ]
} }
}, },
{ label => 'module-temperature', filter => 'add_optical', nlabel => 'interface.module.temperature.celsius', set => { { label => 'module-temperature', filter => 'add_optical', nlabel => 'interface.module.temperature.celsius', set => {
@ -85,10 +85,10 @@ sub set_counters {
output_template => 'Module Temperature : %.2f C', output_template => 'Module Temperature : %.2f C',
perfdatas => [ perfdatas => [
{ value => 'module_temperature_absolute', template => '%.2f', { value => 'module_temperature_absolute', template => '%.2f',
unit => 'C', label_extra_instance => 1, instance_use => 'display_absolute' }, unit => 'C', label_extra_instance => 1, instance_use => 'display_absolute' }
], ]
}
} }
},
; ;
} }
@ -127,7 +127,7 @@ sub load_errors {
$self->{oid_ifInErrors}, $self->{oid_ifInErrors},
$self->{oid_ifOutDiscards}, $self->{oid_ifOutDiscards},
$self->{oid_ifOutErrors}, $self->{oid_ifOutErrors},
$self->{oid_dot3StatsFCSErrors} $self->{oid_ifInFCSError}
], ],
instances => $self->{array_interface_selected} instances => $self->{array_interface_selected}
); );
@ -140,7 +140,7 @@ sub add_result_errors {
$self->{int}->{$options{instance}}->{inerror} = $self->{results}->{$self->{oid_ifInErrors} . '.' . $options{instance}}; $self->{int}->{$options{instance}}->{inerror} = $self->{results}->{$self->{oid_ifInErrors} . '.' . $options{instance}};
$self->{int}->{$options{instance}}->{outdiscard} = $self->{results}->{$self->{oid_ifOutDiscards} . '.' . $options{instance}}; $self->{int}->{$options{instance}}->{outdiscard} = $self->{results}->{$self->{oid_ifOutDiscards} . '.' . $options{instance}};
$self->{int}->{$options{instance}}->{outerror} = $self->{results}->{$self->{oid_ifOutErrors} . '.' . $options{instance}}; $self->{int}->{$options{instance}}->{outerror} = $self->{results}->{$self->{oid_ifOutErrors} . '.' . $options{instance}};
$self->{int}->{$options{instance}}->{fcserror} = $self->{results}->{$self->{oid_dot3StatsFCSErrors} . '.' . $options{instance}}; $self->{int}->{$options{instance}}->{infcserror} = $self->{results}->{$self->{oid_ifInFCSError} . '.' . $options{instance}};
} }
my $oid_jnxDomCurrentRxLaserPower = '.1.3.6.1.4.1.2636.3.60.1.1.1.1.5'; my $oid_jnxDomCurrentRxLaserPower = '.1.3.6.1.4.1.2636.3.60.1.1.1.1.5';

4
snmp_standard/mode/interfaces.pm
View File

@ -200,9 +200,11 @@ sub custom_errors_perfdata {
my ($self, %options) = @_; my ($self, %options) = @_;
if ($self->{instance_mode}->{option_results}->{units_errors} eq '%') { if ($self->{instance_mode}->{option_results}->{units_errors} eq '%') {
my $nlabel = $self->{nlabel};
$nlabel =~ s/count/percentage/;
$self->{output}->perfdata_add( $self->{output}->perfdata_add(
label => 'packets_' . $self->{result_values}->{label2} . '_' . $self->{result_values}->{label1}, unit => '%', label => 'packets_' . $self->{result_values}->{label2} . '_' . $self->{result_values}->{label1}, unit => '%',
nlabel => 'interface.packets.' . $self->{result_values}->{label1} . '.' . $self->{result_values}->{label2} . '.percentage', nlabel => $nlabel,
instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef, instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef,
value => sprintf("%.2f", $self->{result_values}->{prct}), value => sprintf("%.2f", $self->{result_values}->{prct}),
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}),