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 perfdata output 

+ Fix a big problem with some equipments (no beginning at 1 index)
This commit is contained in:
Quentin Garnier 2014-01-24 10:48:31 +01:00
parent 402fa4c07b
commit 886892ea1e
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
centreon/plugins/output.pm
View File

@ -320,7 +320,7 @@ sub output_txt {
foreach (@{$self->{perfdatas}}) { foreach (@{$self->{perfdatas}}) {
next if (defined($self->{option_results}->{filter_perfdata}) && next if (defined($self->{option_results}->{filter_perfdata}) &&
$_->{label} !~ /$self->{option_results}->{filter_perfdata}/); $_->{label} !~ /$self->{option_results}->{filter_perfdata}/);
print " '" . $_->{label} . "'=" . $_->{value} . $_->{unit} . ";" . $_->{warning} . ";" . $_->{critical} . ";" . $_->{min} . ";" . $_->{max} . ";"; print " '" . $_->{label} . "'=" . $_->{value} . $_->{unit} . ";" . $_->{warning} . ";" . $_->{critical} . ";" . $_->{min} . ";" . $_->{max};
} }
print "\n"; print "\n";
} }

7
snmp_standard/mode/storage.pm
View File

@ -251,10 +251,12 @@ sub reload_cache {
$datas->{oid_filter} = $self->{option_results}->{oid_filter}; $datas->{oid_filter} = $self->{option_results}->{oid_filter};
$datas->{oid_display} = $self->{option_results}->{oid_display}; $datas->{oid_display} = $self->{option_results}->{oid_display};
$datas->{all_ids} = [];
my $result = $self->{snmp}->get_table(oid => $oids_hrStorageTable{$self->{option_results}->{oid_filter}}); my $result = $self->{snmp}->get_table(oid => $oids_hrStorageTable{$self->{option_results}->{oid_filter}});
my $last_num = 0; my $last_num = 0;
foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) { foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) {
next if ($key !~ /\.([0-9]+)$/); next if ($key !~ /\.([0-9]+)$/);
push @{$datas->{all_ids}}, $1;
$datas->{$self->{option_results}->{oid_filter} . "_" . $1} = $self->{output}->to_utf8($result->{$key}); $datas->{$self->{option_results}->{oid_filter} . "_" . $1} = $self->{output}->to_utf8($result->{$key});
$last_num = $1; $last_num = $1;
} }
@ -278,7 +280,6 @@ sub reload_cache {
$datas->{"type_" . $1} = $result->{$key}; $datas->{"type_" . $1} = $result->{$key};
} }
$datas->{total_storage} = $last_num;
$self->{statefile_cache}->write(data => $datas); $self->{statefile_cache}->write(data => $datas);
} }
@ -302,7 +303,7 @@ sub manage_selection {
$self->{statefile_cache}->read(); $self->{statefile_cache}->read();
} }
my $total_storage = $self->{statefile_cache}->get(name => 'total_storage'); my $all_ids = $self->{statefile_cache}->get(name => 'all_ids');
if (!defined($self->{option_results}->{use_name}) && defined($self->{option_results}->{storage})) { if (!defined($self->{option_results}->{use_name}) && defined($self->{option_results}->{storage})) {
# get by ID # get by ID
push @{$self->{storage_id_selected}}, $self->{option_results}->{storage}; push @{$self->{storage_id_selected}}, $self->{option_results}->{storage};
@ -312,7 +313,7 @@ sub manage_selection {
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
} else { } else {
for (my $i = 0; $i <= $total_storage; $i++) { foreach my $i (@{$all_ids}) {
my $filter_name = $self->{statefile_cache}->get(name => $self->{option_results}->{oid_filter} . "_" . $i); my $filter_name = $self->{statefile_cache}->get(name => $self->{option_results}->{oid_filter} . "_" . $i);
next if (!defined($filter_name)); next if (!defined($filter_name));
if (!defined($self->{option_results}->{storage})) { if (!defined($self->{option_results}->{storage})) {

8
snmp_standard/mode/traffic.pm
View File

@ -299,12 +299,13 @@ sub reload_cache {
$datas->{oid_filter} = $self->{option_results}->{oid_filter}; $datas->{oid_filter} = $self->{option_results}->{oid_filter};
$datas->{oid_display} = $self->{option_results}->{oid_display}; $datas->{oid_display} = $self->{option_results}->{oid_display};
$datas->{all_ids} = [];
my $result = $self->{snmp}->get_table(oid => $oids_iftable{$self->{option_results}->{oid_filter}}); my $result = $self->{snmp}->get_table(oid => $oids_iftable{$self->{option_results}->{oid_filter}});
my $last_num = 0; my $last_num = 0;
foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) { foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) {
next if ($key !~ /\.([0-9]+)$/); next if ($key !~ /\.([0-9]+)$/);
push @{$datas->{all_ids}}, $1;
$datas->{$self->{option_results}->{oid_filter} . "_" . $1} = $self->{output}->to_utf8($result->{$key}); $datas->{$self->{option_results}->{oid_filter} . "_" . $1} = $self->{output}->to_utf8($result->{$key});
$last_num = $1;
} }
if (scalar(keys %$datas) <= 0) { if (scalar(keys %$datas) <= 0) {
@ -320,7 +321,6 @@ sub reload_cache {
} }
} }
$datas->{total_interface} = $last_num;
$self->{statefile_cache}->write(data => $datas); $self->{statefile_cache}->write(data => $datas);
} }
@ -344,7 +344,7 @@ sub manage_selection {
$self->{statefile_cache}->read(); $self->{statefile_cache}->read();
} }
my $total_interface = $self->{statefile_cache}->get(name => 'total_interface'); my $all_ids = $self->{statefile_cache}->get(name => 'all_ids');
if (!defined($self->{option_results}->{use_name}) && defined($self->{option_results}->{interface})) { if (!defined($self->{option_results}->{use_name}) && defined($self->{option_results}->{interface})) {
# get by ID # get by ID
push @{$self->{interface_id_selected}}, $self->{option_results}->{interface}; push @{$self->{interface_id_selected}}, $self->{option_results}->{interface};
@ -354,7 +354,7 @@ sub manage_selection {
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
} else { } else {
for (my $i = 0; $i <= $total_interface; $i++) { foreach my $i (@{$all_ids}) {
my $filter_name = $self->{statefile_cache}->get(name => $self->{option_results}->{oid_filter} . "_" . $i); my $filter_name = $self->{statefile_cache}->get(name => $self->{option_results}->{oid_filter} . "_" . $i);
next if (!defined($filter_name)); next if (!defined($filter_name));
if (!defined($self->{option_results}->{interface})) { if (!defined($self->{option_results}->{interface})) {