mirror of
https://github.com/centreon/centreon-plugins.git
synced 2025-07-22 21:24:53 +02:00
wip adsl/vdsl speed for interfaces
This commit is contained in:
parent
57ecbb9c33
commit
6dcad1281c
@ -61,6 +61,7 @@ sub custom_threshold_output {
|
||||
|
||||
sub custom_status_output {
|
||||
my ($self, %options) = @_;
|
||||
|
||||
my $msg = 'Status : ' . $self->{result_values}->{opstatus} . ' (admin: ' . $self->{result_values}->{admstatus} . ')';
|
||||
if (defined($self->{instance_mode}->{option_results}->{add_duplex_status})) {
|
||||
$msg .= ' (duplex: ' . $self->{result_values}->{duplexstatus} . ')';
|
||||
@ -495,7 +496,7 @@ sub set_counters_cast {
|
||||
unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display' }
|
||||
]
|
||||
}
|
||||
},
|
||||
}
|
||||
;
|
||||
}
|
||||
|
||||
@ -620,8 +621,8 @@ sub set_oids_label {
|
||||
$self->{oids_label} = {
|
||||
'ifdesc' => { oid => '.1.3.6.1.2.1.2.2.1.2', cache => 'reload_cache_index_value' },
|
||||
'ifalias' => { oid => '.1.3.6.1.2.1.31.1.1.1.18', cache => 'reload_cache_index_value' },
|
||||
'ifname' => { oid => '.1.3.6.1.2.1.31.1.1.1.1', cache => 'reload_cache_index_value', },
|
||||
'ipaddr' => { oid => '.1.3.6.1.2.1.4.20.1.2', cache => 'reload_cache_values_index', },
|
||||
'ifname' => { oid => '.1.3.6.1.2.1.31.1.1.1.1', cache => 'reload_cache_index_value' },
|
||||
'ipaddr' => { oid => '.1.3.6.1.2.1.4.20.1.2', cache => 'reload_cache_values_index' }
|
||||
};
|
||||
}
|
||||
|
||||
@ -660,6 +661,11 @@ sub set_oids_traffic {
|
||||
$self->{oid_speed64} = '.1.3.6.1.2.1.31.1.1.1.15'; # need multiple by '1000000'
|
||||
$self->{oid_in64} = '.1.3.6.1.2.1.31.1.1.1.6'; # in B
|
||||
$self->{oid_out64} = '.1.3.6.1.2.1.31.1.1.1.10'; # in B
|
||||
$self->{oid_iftype} = '.1.3.6.1.2.1.2.2.1.3';
|
||||
$self->{oid_adslAtucCurrAttainableRate} = '.1.3.6.1.2.1.10.94.1.1.2.1.8';
|
||||
$self->{oid_adslAturCurrAttainableRate} = '.1.3.6.1.2.1.10.94.1.1.3.1.8';
|
||||
$self->{oid_xdsl2LineStatusAttainableRateDs} = '.1.3.6.1.2.1.10.251.1.1.1.1.20';
|
||||
$self->{oid_xdsl2LineStatusAttainableRateUs} = '.1.3.6.1.2.1.10.251.1.1.1.1.21';
|
||||
}
|
||||
|
||||
sub set_oids_cast {
|
||||
@ -797,7 +803,8 @@ sub new {
|
||||
'reload-cache-time:s' => { name => 'reload_cache_time', default => 180 },
|
||||
'nagvis-perfdata' => { name => 'nagvis_perfdata' },
|
||||
'force-counters32' => { name => 'force_counters32' },
|
||||
'force-counters64' => { name => 'force_counters64' }
|
||||
'force-counters64' => { name => 'force_counters64' },
|
||||
'map-speed-dsl:s@' => { name => 'map_speed_dsl' }
|
||||
});
|
||||
if ($self->{no_traffic} == 0) {
|
||||
$options{options}->add_options(arguments => { 'add-traffic' => { name => 'add_traffic' } });
|
||||
@ -882,8 +889,8 @@ sub check_options {
|
||||
|
||||
sub get_display_value {
|
||||
my ($self, %options) = @_;
|
||||
my $value = $self->{statefile_cache}->get(name => $self->{option_results}->{oid_display} . "_" . $options{id});
|
||||
|
||||
my $value = $self->{statefile_cache}->get(name => $self->{option_results}->{oid_display} . "_" . $options{id});
|
||||
if (defined($self->{option_results}->{display_transform_src})) {
|
||||
$self->{option_results}->{display_transform_dst} = '' if (!defined($self->{option_results}->{display_transform_dst}));
|
||||
eval "\$value =~ s{$self->{option_results}->{display_transform_src}}{$self->{option_results}->{display_transform_dst}}";
|
||||
@ -906,6 +913,7 @@ sub check_oids_options_change {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1018,7 +1026,7 @@ sub get_selection {
|
||||
}
|
||||
} else {
|
||||
foreach (@{$all_ids}) {
|
||||
my $filter_name = $self->{statefile_cache}->get(name => $self->{option_results}->{oid_filter} . "_" . $_);
|
||||
my $filter_name = $self->{statefile_cache}->get(name => $self->{option_results}->{oid_filter} . '_' . $_);
|
||||
next if (!defined($filter_name));
|
||||
if (!defined($self->{option_results}->{interface})) {
|
||||
$self->add_selected_interface(id => $_);
|
||||
@ -1030,6 +1038,22 @@ sub get_selection {
|
||||
}
|
||||
}
|
||||
|
||||
if (defined($self->{option_results}->{map_speed_dsl})) {
|
||||
$self->{map_speed_dsl} = [];
|
||||
foreach (@{$self->{option_results}->{map_speed_dsl}}) {
|
||||
my ($src, $dst) = split /,/;
|
||||
next if (!defined($dst) || $dst eq '' || !defined($src) || $src eq '');
|
||||
push @{$self->{map_speed_dsl}}, { src => $src, dst => $dst };
|
||||
}
|
||||
foreach (@{$all_ids}) {
|
||||
my $filter_name = $self->{statefile_cache}->get(name => $self->{option_results}->{oid_filter} . '_' . $_);
|
||||
for (my $i = 0; $i < scalar(@{$self->{map_speed_dsl}}); $i++) {
|
||||
$self->{map_speed_dsl}->[$i]->{src_index} = $_ if ($filter_name =~ /$self->{map_speed_dsl}->[$i]->{src}/);
|
||||
$self->{map_speed_dsl}->[$i]->{dst_index} = $_ if ($filter_name =~ /$self->{map_speed_dsl}->[$i]->{dst}/);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (scalar(keys %{$self->{int}}) <= 0) {
|
||||
$self->{output}->add_option_msg(short_msg => "No entry found (maybe you should reload cache file)");
|
||||
$self->{output}->option_exit();
|
||||
@ -1065,6 +1089,15 @@ sub load_traffic {
|
||||
$self->{snmp}->load(oids => [$self->{oid_speed64}], instances => $self->{array_interface_selected});
|
||||
}
|
||||
}
|
||||
|
||||
return if (!defined($self->{map_speed_dsl}));
|
||||
my $dst_indexes = [map { $_->{dst_index} } grep { defined($_->{dst_index}) } @{$self->{map_speed_dsl}}];
|
||||
if (scalar(@$dst_indexes) <= 0) {
|
||||
$self->{map_speed_dsl} = undef;
|
||||
return ;
|
||||
}
|
||||
|
||||
$self->{snmp}->load(oids => [$self->{oid_iftype}], instances => $dst_indexes);
|
||||
}
|
||||
|
||||
sub load_errors {
|
||||
@ -1150,6 +1183,7 @@ sub manage_selection {
|
||||
|
||||
$self->{results} = $self->{snmp}->get_leef();
|
||||
|
||||
$self->pre_result();
|
||||
$self->add_result_global() if (defined($self->{option_results}->{add_global}));
|
||||
foreach (@{$self->{array_interface_selected}}) {
|
||||
$self->add_result_status(instance => $_) if (defined($self->{option_results}->{add_status}));
|
||||
@ -1198,6 +1232,45 @@ sub add_result_global {
|
||||
}
|
||||
}
|
||||
|
||||
sub pre_result {
|
||||
my ($self, %options) = @_;
|
||||
|
||||
if (defined($self->{map_speed_dsl})) {
|
||||
my $oids = [];
|
||||
|
||||
foreach (@{$self->{map_speed_dsl}}) {
|
||||
next if (!defined($_->{dst_index}));
|
||||
next if (!defined($self->{results}->{ $self->{oid_iftype} . '.' . $_->{dst_index} }));
|
||||
# 94 = adsl, 251 => vdsl2
|
||||
if ($self->{results}->{ $self->{oid_iftype} . '.' . $_->{dst_index} } == 94) {
|
||||
push @$oids, $self->{oid_adslAtucCurrAttainableRate} . '.' . $_->{dst_index}, $self->{oid_adslAturCurrAttainableRate} . '.' . $_->{dst_index};
|
||||
} elsif ($self->{results}->{ $self->{oid_iftype} . '.' . $_->{dst_index} } == 251) {
|
||||
push @$oids, $self->{oid_xdsl2LineStatusAttainableRateDs} . '.' . $_->{dst_index}, $self->{oid_xdsl2LineStatusAttainableRateUs} . '.' . $_->{dst_index};
|
||||
}
|
||||
}
|
||||
|
||||
if (scalar(@$oids) > 0) {
|
||||
my $results = $self->{snmp}->get_leef(oids => $oids);
|
||||
for (my $i = 0; $i < scalar(@{$self->{map_speed_dsl}}); $i++) {
|
||||
next if (!defined($self->{map_speed_dsl}->[$i]->{dst_index}));
|
||||
next if (!defined($self->{results}->{ $self->{oid_iftype} . '.' . $self->{map_speed_dsl}->[$i]->{dst_index} }));
|
||||
# 94 = adsl, 251 => vdsl2
|
||||
if ($self->{results}->{ $self->{oid_iftype} . '.' . $self->{map_speed_dsl}->[$i]->{dst_index} } == 94) {
|
||||
$self->{map_speed_dsl}->[$i]->{speed_in} = $results->{ $self->{oid_adslAturCurrAttainableRate} . '.' . $self->{map_speed_dsl}->[$i]->{dst_index} }
|
||||
if (defined($results->{ $self->{oid_adslAturCurrAttainableRate} . '.' . $self->{map_speed_dsl}->[$i]->{dst_index} }));
|
||||
$self->{map_speed_dsl}->[$i]->{speed_out} = $results->{ $self->{oid_adslAtucCurrAttainableRate} . '.' . $self->{map_speed_dsl}->[$i]->{dst_index} }
|
||||
if (defined($results->{ $self->{oid_adslAtucCurrAttainableRate} . '.' . $self->{map_speed_dsl}->[$i]->{dst_index} }));
|
||||
} elsif ($self->{results}->{ $self->{oid_iftype} . '.' . $self->{map_speed_dsl}->[$i]->{dst_index} } == 251) {
|
||||
$self->{map_speed_dsl}->[$i]->{speed_in} = $results->{ $self->{oid_xdsl2LineStatusAttainableRateDs} . '.' . $self->{map_speed_dsl}->[$i]->{dst_index} }
|
||||
if (defined($results->{ $self->{oid_xdsl2LineStatusAttainableRateDs} . '.' . $self->{map_speed_dsl}->[$i]->{dst_index} }));
|
||||
$self->{map_speed_dsl}->[$i]->{speed_out} = $results->{ $self->{oid_xdsl2LineStatusAttainableRateUs} . '.' . $self->{map_speed_dsl}->[$i]->{dst_index} }
|
||||
if (defined($results->{ $self->{oid_xdsl2LineStatusAttainableRateUs} . '.' . $self->{map_speed_dsl}->[$i]->{dst_index} }));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub add_result_status {
|
||||
my ($self, %options) = @_;
|
||||
|
||||
@ -1242,15 +1315,22 @@ sub add_result_traffic {
|
||||
$self->{int}->{$options{instance}}->{speed_in} = $self->{option_results}->{speed_in} * 1000000 if (defined($self->{option_results}->{speed_in}) && $self->{option_results}->{speed_in} ne '');
|
||||
$self->{int}->{$options{instance}}->{speed_out} = $self->{option_results}->{speed_out} * 1000000 if (defined($self->{option_results}->{speed_out}) && $self->{option_results}->{speed_out} ne '');
|
||||
} else {
|
||||
|
||||
if (defined($self->{map_speed_dsl})) {
|
||||
foreach (@{$self->{map_speed_dsl}}) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
my $interface_speed = 0;
|
||||
if (defined($self->{results}->{$self->{oid_speed64} . "." . $options{instance}}) && $self->{results}->{$self->{oid_speed64} . "." . $options{instance}} ne '') {
|
||||
$interface_speed = $self->{results}->{$self->{oid_speed64} . "." . $options{instance}} * 1000000;
|
||||
if (defined($self->{results}->{$self->{oid_speed64} . '.' . $options{instance}}) && $self->{results}->{$self->{oid_speed64} . "." . $options{instance}} ne '') {
|
||||
$interface_speed = $self->{results}->{$self->{oid_speed64} . '.' . $options{instance}} * 1000000;
|
||||
# If 0, we put the 32 bits
|
||||
if ($interface_speed == 0) {
|
||||
$interface_speed = $self->{results}->{$self->{oid_speed32} . "." . $options{instance}};
|
||||
$interface_speed = $self->{results}->{$self->{oid_speed32} . '.' . $options{instance}};
|
||||
}
|
||||
} else {
|
||||
$interface_speed = $self->{results}->{$self->{oid_speed32} . "." . $options{instance}};
|
||||
$interface_speed = $self->{results}->{$self->{oid_speed32} . '.' . $options{instance}};
|
||||
}
|
||||
|
||||
$self->{int}->{$options{instance}}->{speed_in} = $interface_speed;
|
||||
@ -1436,6 +1516,14 @@ Set interface speed for incoming traffic (in Mb).
|
||||
|
||||
Set interface speed for outgoing traffic (in Mb).
|
||||
|
||||
=item B<--map-speed-dsl>
|
||||
|
||||
Get interface speed configuration for interface type 'adsl' and 'vdsl2'.
|
||||
|
||||
Syntax: --map-speed-dsl=interface-src-name,interface-dsl-name
|
||||
|
||||
E.g: --map-speed-dsl=Et0.835,Et0-vdsl2
|
||||
|
||||
=item B<--no-skipped-counters>
|
||||
|
||||
Don't skip counters when no change.
|
||||
|
Loading…
x
Reference in New Issue
Block a user