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 datadomain modes

This commit is contained in:
garnier-quentin 2016-01-20 16:13:40 +01:00
parent 89c073b117
commit cfd4d84d50
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
centreon-plugins/storage/emc/DataDomain/mode/filesystem.pm
View File

@ -33,7 +33,7 @@ sub set_counters {
{ name => 'fs', type => 1, cb_prefix_output => 'prefix_fs_output', message_multiple => 'All filesystems are ok.' }, { name => 'fs', type => 1, cb_prefix_output => 'prefix_fs_output', message_multiple => 'All filesystems are ok.' },
]; ];
$self->{maps_counters}->{ap} = [ $self->{maps_counters}->{fs} = [
{ label => 'usage', set => { { label => 'usage', set => {
key_values => [ { name => 'free' }, { name => 'used' }, { name => 'display' } ], key_values => [ { name => 'free' }, { name => 'used' }, { name => 'display' } ],
closure_custom_calc => $self->can('custom_used_calc'), closure_custom_calc => $self->can('custom_used_calc'),
@ -104,10 +104,10 @@ my ($oid_fileSystemResourceName, $oid_fileSystemSpaceUsed, $oid_fileSystemSpaceA
sub add_result { sub add_result {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{filesystem_id_selected}->{$options{instance}} = {}; $self->{fs}->{$options{instance}} = {};
$self->{filesystem_id_selected}->{$options{instance}}->{display} = $self->{results}->{$oid_fileSystemSpaceEntry}->{$oid_fileSystemResourceName . '.' . $options{instance}}; $self->{fs}->{$options{instance}}->{display} = $self->{results}->{$oid_fileSystemSpaceEntry}->{$oid_fileSystemResourceName . '.' . $options{instance}};
$self->{filesystem_id_selected}->{$options{instance}}->{free} = int($self->{results}->{$oid_fileSystemSpaceEntry}->{$oid_fileSystemSpaceAvail . '.' . $options{instance}} * 1024 * 1024 * 1024); $self->{fs}->{$options{instance}}->{free} = int($self->{results}->{$oid_fileSystemSpaceEntry}->{$oid_fileSystemSpaceAvail . '.' . $options{instance}} * 1024 * 1024 * 1024);
$self->{filesystem_id_selected}->{$options{instance}}->{used} = int($self->{results}->{$oid_fileSystemSpaceEntry}->{$oid_fileSystemSpaceUsed . '.' . $options{instance}} * 1024 * 1024 * 1024); $self->{fs}->{$options{instance}}->{used} = int($self->{results}->{$oid_fileSystemSpaceEntry}->{$oid_fileSystemSpaceUsed . '.' . $options{instance}} * 1024 * 1024 * 1024);
} }
sub manage_selection { sub manage_selection {
@ -161,7 +161,7 @@ sub manage_selection {
} }
} }
if (scalar(keys %{$self->{filesystem_id_selected}}) <= 0 && !defined($options{disco})) { if (scalar(keys %{$self->{fs}}) <= 0 && !defined($options{disco})) {
if (defined($self->{option_results}->{device})) { if (defined($self->{option_results}->{device})) {
$self->{output}->add_option_msg(short_msg => "No filesystem found '" . $self->{option_results}->{filesystem} . "'."); $self->{output}->add_option_msg(short_msg => "No filesystem found '" . $self->{option_results}->{filesystem} . "'.");
} else { } else {
@ -183,8 +183,8 @@ sub disco_show {
# $options{snmp} = snmp object # $options{snmp} = snmp object
$self->{snmp} = $options{snmp}; $self->{snmp} = $options{snmp};
$self->manage_selection(disco => 1); $self->manage_selection(disco => 1);
foreach (sort keys %{$self->{filesystem_id_selected}}) { foreach (sort keys %{$self->{fs}}) {
$self->{output}->add_disco_entry(name => $self->{filesystem_id_selected}->{$_}->{display}, $self->{output}->add_disco_entry(name => $self->{fs}->{$_}->{display},
deviceid => $_); deviceid => $_);
} }
} }

2
centreon-plugins/storage/emc/DataDomain/mode/hardware.pm
View File

@ -102,7 +102,7 @@ sub get_version {
my ($self, %options) = @_; my ($self, %options) = @_;
my $oid_sysDescr = '.1.3.6.1.2.1.1.1.0'; # 'Data Domain OS 5.4.1.1-411752' my $oid_sysDescr = '.1.3.6.1.2.1.1.1.0'; # 'Data Domain OS 5.4.1.1-411752'
my $result = $self->{snmp}->get_leef(oids => [ $oid_sysDescr ]); my $result = $options{snmp}->get_leef(oids => [ $oid_sysDescr ]);
if (!($self->{os_version} = storage::emc::DataDomain::lib::functions::get_version(value => $result->{$oid_sysDescr}))) { if (!($self->{os_version} = storage::emc::DataDomain::lib::functions::get_version(value => $result->{$oid_sysDescr}))) {
$self->{output}->output_add(severity => 'UNKNOWN', $self->{output}->output_add(severity => 'UNKNOWN',
short_msg => 'Cannot get DataDomain OS version.'); short_msg => 'Cannot get DataDomain OS version.');