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

This commit is contained in:
Quentin Garnier 2014-01-13 16:41:20 +01:00
parent 71a6bcb7d1
commit 3f64c358e1
2 changed files with 97 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
snmp_standard/mode/liststorages.pm
View File

@ -51,9 +51,39 @@ my $oid_hrStorageSize = '.1.3.6.1.2.1.25.2.3.1.5';
my $oid_hrStorageType = '.1.3.6.1.2.1.25.2.3.1.2';
my %storage_types_manage = (
'.1.3.6.1.2.1.25.2.1.4' => 'hrStorageFixedDisk',
'.1.3.6.1.2.1.25.2.1.10' => 'hrStorageNetworkDisk',
'.1.3.6.1.2.1.25.3.9.3' => 'hrFSBerkeleyFFS' # For Freebsd
'.1.3.6.1.2.1.25.2.1.1' => 'hrStorageOther',
'.1.3.6.1.2.1.25.2.1.2' => 'hrStorageRam',
'.1.3.6.1.2.1.25.2.1.3' => 'hrStorageVirtualMemory',
'.1.3.6.1.2.1.25.2.1.4' => 'hrStorageFixedDisk',
'.1.3.6.1.2.1.25.2.1.5' => 'hrStorageRemovableDisk',
'.1.3.6.1.2.1.25.2.1.6' => 'hrStorageFloppyDisk',
'.1.3.6.1.2.1.25.2.1.7' => 'hrStorageCompactDisc',
'.1.3.6.1.2.1.25.2.1.8' => 'hrStorageRamDisk',
'.1.3.6.1.2.1.25.2.1.9' => 'hrStorageFlashMemory',
'.1.3.6.1.2.1.25.2.1.10' => 'hrStorageNetworkDisk',
'.1.3.6.1.2.1.25.3.9.1' => 'hrFSOther',
'.1.3.6.1.2.1.25.3.9.2' => 'hrFSUnknown',
'.1.3.6.1.2.1.25.3.9.3' => 'hrFSBerkeleyFFS', # For Freebsd
'.1.3.6.1.2.1.25.3.9.4' => 'hrFSSys5FS',
'.1.3.6.1.2.1.25.3.9.5' => 'hrFSFat',
'.1.3.6.1.2.1.25.3.9.6' => 'hrFSHPFS',
'.1.3.6.1.2.1.25.3.9.7' => 'hrFSHFS',
'.1.3.6.1.2.1.25.3.9.8' => 'hrFSMFS',
'.1.3.6.1.2.1.25.3.9.9' => 'hrFSNTFS',
'.1.3.6.1.2.1.25.3.9.10' => 'hrFSVNode',
'.1.3.6.1.2.1.25.3.9.11' => 'hrFSJournaled',
'.1.3.6.1.2.1.25.3.9.12' => 'hrFSiso9660',
'.1.3.6.1.2.1.25.3.9.13' => 'hrFSRockRidge',
'.1.3.6.1.2.1.25.3.9.14' => 'hrFSNFS',
'.1.3.6.1.2.1.25.3.9.15' => 'hrFSNetware',
'.1.3.6.1.2.1.25.3.9.16' => 'hrFSAFS',
'.1.3.6.1.2.1.25.3.9.17' => 'hrFSDFS',
'.1.3.6.1.2.1.25.3.9.18' => 'hrFSAppleshare',
'.1.3.6.1.2.1.25.3.9.19' => 'hrFSRFS',
'.1.3.6.1.2.1.25.3.9.20' => 'hrFSDGCFS',
'.1.3.6.1.2.1.25.3.9.21' => 'hrFSBFS',
'.1.3.6.1.2.1.25.3.9.22' => 'hrFSFAT32',
'.1.3.6.1.2.1.25.3.9.23' => 'hrFSLinuxExt2',
);
sub new {
@ -72,6 +102,7 @@ sub new {
"oid-display:s" => { name => 'oid_display', default => 'hrStorageDescr'},
"display-transform-src:s" => { name => 'display_transform_src' },
"display-transform-dst:s" => { name => 'display_transform_dst' },
"filter-storage-type:s" => { name => 'filter_storage_type', default => '^(hrStorageFixedDisk|hrStorageNetworkDisk|hrFSBerkeleyFFS)$' },
});
$self->{storage_id_selected} = [];
@ -108,7 +139,8 @@ sub run {
foreach (sort @{$self->{storage_id_selected}}) {
my $display_value = $self->get_display_value(id => $_);
my $storage_type = $result->{$oid_hrStorageType . "." . $_};
next if (!defined($storage_type) || (!defined($storage_types_manage{$storage_type})));
next if (!defined($storage_type) ||
($storage_types_manage{$storage_type} !~ /$self->{option_results}->{filter_storage_type}/i));
$storage_display .= $storage_display_append . "name = $display_value [size = " . $result->{$oid_hrStorageSize . "." . $_} * $result->{$oid_hrStorageAllocationUnits . "." . $_} . "B, id = $_]";
$storage_display_append = ', ';
@ -219,7 +251,8 @@ sub disco_show {
foreach (sort @{$self->{storage_id_selected}}) {
my $display_value = $self->get_display_value(id => $_);
my $storage_type = $result->{$oid_hrStorageType . "." . $_};
next if (!defined($storage_type) || (!defined($storage_types_manage{$storage_type})));
next if (!defined($storage_type) ||
($storage_types_manage{$storage_type} !~ /$self->{option_results}->{filter_storage_type}/i));
$self->{output}->add_disco_entry(name => $display_value,
total => $result->{$oid_hrStorageSize . "." . $_} * $result->{$oid_hrStorageAllocationUnits . "." . $_},
@ -267,6 +300,10 @@ Regexp src to transform display value. (security risk!!!)
Regexp dst to transform display value. (security risk!!!)
=item B<--filter-storage-type>
Filter storage types with a regexp (Default: '^(hrStorageFixedDisk|hrStorageNetworkDisk|hrFSBerkeleyFFS)$').
=back
=cut

59
snmp_standard/mode/storage.pm
View File

@ -48,9 +48,39 @@ my %oids_hrStorageTable = (
'hrstoragetype' => '.1.3.6.1.2.1.25.2.3.1.2',
);
my %storage_types_manage = (
'.1.3.6.1.2.1.25.2.1.4' => 'hrStorageFixedDisk',
'.1.3.6.1.2.1.25.2.1.10' => 'hrStorageNetworkDisk',
'.1.3.6.1.2.1.25.3.9.3' => 'hrFSBerkeleyFFS' # For Freebsd
'.1.3.6.1.2.1.25.2.1.1' => 'hrStorageOther',
'.1.3.6.1.2.1.25.2.1.2' => 'hrStorageRam',
'.1.3.6.1.2.1.25.2.1.3' => 'hrStorageVirtualMemory',
'.1.3.6.1.2.1.25.2.1.4' => 'hrStorageFixedDisk',
'.1.3.6.1.2.1.25.2.1.5' => 'hrStorageRemovableDisk',
'.1.3.6.1.2.1.25.2.1.6' => 'hrStorageFloppyDisk',
'.1.3.6.1.2.1.25.2.1.7' => 'hrStorageCompactDisc',
'.1.3.6.1.2.1.25.2.1.8' => 'hrStorageRamDisk',
'.1.3.6.1.2.1.25.2.1.9' => 'hrStorageFlashMemory',
'.1.3.6.1.2.1.25.2.1.10' => 'hrStorageNetworkDisk',
'.1.3.6.1.2.1.25.3.9.1' => 'hrFSOther',
'.1.3.6.1.2.1.25.3.9.2' => 'hrFSUnknown',
'.1.3.6.1.2.1.25.3.9.3' => 'hrFSBerkeleyFFS', # For Freebsd
'.1.3.6.1.2.1.25.3.9.4' => 'hrFSSys5FS',
'.1.3.6.1.2.1.25.3.9.5' => 'hrFSFat',
'.1.3.6.1.2.1.25.3.9.6' => 'hrFSHPFS',
'.1.3.6.1.2.1.25.3.9.7' => 'hrFSHFS',
'.1.3.6.1.2.1.25.3.9.8' => 'hrFSMFS',
'.1.3.6.1.2.1.25.3.9.9' => 'hrFSNTFS',
'.1.3.6.1.2.1.25.3.9.10' => 'hrFSVNode',
'.1.3.6.1.2.1.25.3.9.11' => 'hrFSJournaled',
'.1.3.6.1.2.1.25.3.9.12' => 'hrFSiso9660',
'.1.3.6.1.2.1.25.3.9.13' => 'hrFSRockRidge',
'.1.3.6.1.2.1.25.3.9.14' => 'hrFSNFS',
'.1.3.6.1.2.1.25.3.9.15' => 'hrFSNetware',
'.1.3.6.1.2.1.25.3.9.16' => 'hrFSAFS',
'.1.3.6.1.2.1.25.3.9.17' => 'hrFSDFS',
'.1.3.6.1.2.1.25.3.9.18' => 'hrFSAppleshare',
'.1.3.6.1.2.1.25.3.9.19' => 'hrFSRFS',
'.1.3.6.1.2.1.25.3.9.20' => 'hrFSDGCFS',
'.1.3.6.1.2.1.25.3.9.21' => 'hrFSBFS',
'.1.3.6.1.2.1.25.3.9.22' => 'hrFSFAT32',
'.1.3.6.1.2.1.25.3.9.23' => 'hrFSLinuxExt2',
);
sub new {
@ -75,6 +105,8 @@ sub new {
"display-transform-src:s" => { name => 'display_transform_src' },
"display-transform-dst:s" => { name => 'display_transform_dst' },
"show-cache" => { name => 'show_cache' },
"space-reservation:s" => { name => 'space_reservation' },
"filter-storage-type:s" => { name => 'filter_storage_type', default => '^(hrStorageFixedDisk|hrStorageNetworkDisk|hrFSBerkeleyFFS)$' },
});
$self->{storage_id_selected} = [];
@ -95,6 +127,12 @@ sub check_options {
$self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'.");
$self->{output}->option_exit();
}
if (defined($self->{option_results}->{space_reservation}) &&
($self->{option_results}->{space_reservation} < 0 || $self->{option_results}->{space_reservation} > 100)) {
$self->{output}->add_option_msg(short_msg => "Space reservation argument must be between 0 and 100 percent.");
$self->{output}->option_exit();
}
$self->{option_results}->{oid_filter} = lc($self->{option_results}->{oid_filter});
if ($self->{option_results}->{oid_filter} !~ /^(hrstoragedescr|hrfsmountpoint)$/) {
$self->{output}->add_option_msg(short_msg => "Unsupported --oid-filter option.");
@ -135,13 +173,17 @@ sub run {
foreach (sort @{$self->{storage_id_selected}}) {
# Skipped disks
my $storage_type = $self->{statefile_cache}->get(name => "type_" . $_);
next if (!defined($storage_type) || (!defined($storage_types_manage{$storage_type})));
next if (!defined($storage_type) ||
($storage_types_manage{$storage_type} !~ /$self->{option_results}->{filter_storage_type}/i));
my $name_storage = $self->get_display_value(id => $_);
$num_disk_check++;
# in bytes hrStorageAllocationUnits
my $total_size = $result->{$oid_hrStorageSize . "." . $_} * $result->{$oid_hrStorageAllocationUnits . "." . $_};
if (defined($self->{option_results}->{space_reservation})) {
$total_size = $total_size - ($self->{option_results}->{space_reservation} * $total_size / 100);
}
next if ($total_size == 0);
my $total_used = $result->{$oid_hrStorageUsed . "." . $_} * $result->{$oid_hrStorageAllocationUnits . "." . $_};
my $total_free = $total_size - $total_used;
@ -374,6 +416,15 @@ Regexp dst to transform display value. (security risk!!!)
Display cache storage datas.
=item B<--space-reservation>
Some filesystem has space reserved (like ext4 for root).
The value is in percent of total (Default: none).
=item B<--filter-storage-type>
Filter storage types with a regexp (Default: '^(hrStorageFixedDisk|hrStorageNetworkDisk|hrFSBerkeleyFFS)$').
=back
=cut