+ Fix extreme network modes (hardware and memory)

This commit is contained in:
garnier-quentin 2015-06-17 09:22:37 +02:00
parent b12c149d28
commit 211fd1113e
3 changed files with 4 additions and 4 deletions

View File

@ -57,7 +57,7 @@ my $oid_extremePowerSupplyEntry = '.1.3.6.1.4.1.1916.1.1.1.27.1';
sub load { sub load {
my (%options) = @_; my (%options) = @_;
push @{$options{request}}, { oid => $oid_extremePowerSupplyEntry, end => $mapping->{extremePowerSupplyStatus}->{oid} }; push @{$options{request}}, { oid => $oid_extremePowerSupplyEntry, start => $mapping->{extremePowerSupplyStatus}->{oid} };
} }
sub check_fan_speed { sub check_fan_speed {

View File

@ -65,7 +65,7 @@ my $oid_extremeSlotEntry = '.1.3.6.1.4.1.1916.1.1.2.2.1';
sub load { sub load {
my (%options) = @_; my (%options) = @_;
push @{$options{request}}, { oid => $oid_extremeSlotEntry, end => $mapping->{extremeSlotName}->{oid} }; push @{$options{request}}, { oid => $oid_extremeSlotEntry, start => $mapping->{extremeSlotName}->{oid}, end => $mapping->{extremeSlotModuleState}->{oid} };
} }
sub check { sub check {
@ -89,7 +89,7 @@ sub check {
$self->{components}->{slot}->{total}++; $self->{components}->{slot}->{total}++;
$self->{output}->output_add(long_msg => sprintf("Slot '%s' status is '%s' [instance = %s]", $self->{output}->output_add(long_msg => sprintf("Slot '%s' status is '%s' [instance = %s]",
$result->{extremeSlotName}, $result->{extremeSlotModuleState}, $instance)); $result->{extremeSlotName}, $result->{extremeSlotModuleState}, $instance));
my $exit = $self->get_severity(section => 'psu', value => $result->{extremeSlotModuleState}); my $exit = $self->get_severity(section => 'slot', value => $result->{extremeSlotModuleState});
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit, $self->{output}->output_add(severity => $exit,
short_msg => sprintf("Slot '%s' status is '%s'", $result->{extremeSlotName}, $result->{extremeSlotModuleState})); short_msg => sprintf("Slot '%s' status is '%s'", $result->{extremeSlotName}, $result->{extremeSlotModuleState}));

View File

@ -94,7 +94,7 @@ sub custom_usage_calc {
$self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'}; $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
$self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_total'}; $self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_total'};
$self->{result_values}->{used} = $options{new_datas}->{$self->{instance} . '_total'} + $options{new_datas}->{$self->{instance} . '_free'}; $self->{result_values}->{used} = $options{new_datas}->{$self->{instance} . '_total'} - $options{new_datas}->{$self->{instance} . '_free'};
$self->{result_values}->{free} = $options{new_datas}->{$self->{instance} . '_free'}; $self->{result_values}->{free} = $options{new_datas}->{$self->{instance} . '_free'};
$self->{result_values}->{prct_free} = $self->{result_values}->{free} * 100 / $self->{result_values}->{total}; $self->{result_values}->{prct_free} = $self->{result_values}->{free} * 100 / $self->{result_values}->{total};
$self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total}; $self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total};