tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1727 from CPbN/storagecount 

Add count to storage mode
This commit is contained in:
qgarnier 2019-11-14 17:10:42 +01:00 committed by GitHub
parent 6ffa73031f cec2556697
commit 292a52e96d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snmp_standard/mode/diskusage.pm
View File

@ -49,7 +49,7 @@ sub set_counters {
]; ];
$self->{maps_counters}->{global} = [ $self->{maps_counters}->{global} = [
{ label => 'count', nlabel => 'storages.partitions.count', display_ok => 0, set => { { label => 'count', nlabel => 'storage.partitions.count', display_ok => 0, set => {
key_values => [ { name => 'count' } ], key_values => [ { name => 'count' } ],
output_template => 'Partitions count : %d', output_template => 'Partitions count : %d',
perfdatas => [ perfdatas => [

14
snmp_standard/mode/storage.pm
View File

@ -162,9 +162,21 @@ sub set_counters {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{maps_counters_type} = [ $self->{maps_counters_type} = [
{ name => 'global', type => 0, cb_init => 'skip_global' },
{ name => 'storage', type => 1, cb_prefix_output => 'prefix_storage_output', message_multiple => 'All storages are ok', skipped_code => { -10 => 1 } }, { name => 'storage', type => 1, cb_prefix_output => 'prefix_storage_output', message_multiple => 'All storages are ok', skipped_code => { -10 => 1 } },
]; ];
$self->{maps_counters}->{global} = [
{ label => 'count', nlabel => 'storage.partitions.count', display_ok => 0, set => {
key_values => [ { name => 'count' } ],
output_template => 'Partitions count : %d',
perfdatas => [
{ label => 'count', value => 'count_absolute', template => '%d', min => 0 },
],
}
},
];
$self->{maps_counters}->{storage} = [ $self->{maps_counters}->{storage} = [
{ label => 'usage', nlabel => 'storage.space.usage.bytes', set => { { label => 'usage', nlabel => 'storage.space.usage.bytes', set => {
key_values => [ { name => 'display' }, { name => 'used' }, { name => 'size' }, { name => 'allocation_units' } ], key_values => [ { name => 'display' }, { name => 'used' }, { name => 'size' }, { name => 'allocation_units' } ],
@ -299,6 +311,7 @@ sub manage_selection {
my $result = $options{snmp}->get_leef(); my $result = $options{snmp}->get_leef();
my $access_result = $self->access_result(snmp => $options{snmp}); my $access_result = $self->access_result(snmp => $options{snmp});
$self->{global}->{count} = 0;
$self->{storage} = {}; $self->{storage} = {};
foreach (sort @{$self->{storage_id_selected}}) { foreach (sort @{$self->{storage_id_selected}}) {
my $name_storage = $self->get_display_value(id => $_); my $name_storage = $self->get_display_value(id => $_);
@ -324,6 +337,7 @@ sub manage_selection {
used => $result->{$oid_hrStorageUsed . "." . $_}, used => $result->{$oid_hrStorageUsed . "." . $_},
access => defined($access_result->{$_}) ? $access_result->{$_} : undef, access => defined($access_result->{$_}) ? $access_result->{$_} : undef,
}; };
$self->{global}->{count}++;
} }
if (scalar(keys %{$self->{storage}}) <= 0) { if (scalar(keys %{$self->{storage}}) <= 0) {