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

enhance netgear readynas plugin

This commit is contained in:
garnier-quentin 2019-01-09 15:58:47 +01:00
parent cf480c0adc
commit 50317c1c31
6 changed files with 126 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
storage/netgear/readynas/snmp/mode/components/disk.pm
View File

@ -51,7 +51,7 @@ sub load {
sub check {
my ($self) = @_;
$self->{output}->output_add(long_msg => "Checking disk");
$self->{output}->output_add(long_msg => "checking disks");
$self->{components}->{disk} = {name => 'disk', total => 0, skip => 0};
return if ($self->check_filter(section => 'disk'));
@ -67,14 +67,13 @@ sub check {
my $temperature_unit = $temperature_string ne '' && $self->{mib_ver} == 6 ? 'C)' : '';
$temperature_unit = $temperature_string ne '' && $self->{mib_ver} == 4 ? 'F)' : '';
$self->{output}->output_add(long_msg => sprintf("disk '%s'%s%s status is %s.",
$instance, $temperature_string, $temperature_unit, $result->{diskState}));
$self->{output}->output_add(long_msg => sprintf("disk '%s' status is %s [temperature: %s%s]",
$instance, $result->{diskState}, $temperature_string, $temperature_unit));
my $exit = $self->get_severity(section => 'disk', value => $result->{diskState});
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit,
short_msg => sprintf("Disk '%s'%s%s status is %s", $instance, $temperature_string, $temperature_unit, $result->{diskState}));
short_msg => sprintf("Disk '%s' status is %s", $instance, $result->{diskState}));
}
}
}

15
storage/netgear/readynas/snmp/mode/components/fan.pm
View File

@ -49,7 +49,7 @@ sub load {
sub check {
my ($self) = @_;
$self->{output}->output_add(long_msg => "Checking fan");
$self->{output}->output_add(long_msg => "checking fan");
$self->{components}->{fan} = {name => 'fan', total => 0, skip => 0};
return if ($self->check_filter(section => 'fan'));
@ -69,7 +69,9 @@ sub check {
short_msg => sprintf("fan '%s' status is %s", $instance, $result->{fanStatus}));
}
}
}elsif ($self->{mib_ver} == 4){
return ;
}
foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_fanTable}})) {
next if ($oid !~ /^$mapping->{fanRPM}->{oid}\.(\d+)/);
my $instance = $1;
@ -79,13 +81,16 @@ sub check {
$self->{components}->{fan}->{total}++;
$self->{output}->output_add(long_msg => sprintf("fan '%s' rpm is %s.", $instance, $result->{fanRPM}));
my ($exit) = $self->get_severity_numeric(section => 'fan', instance => $instance, value => $result->{fanRPM});
my ($exit, $warn, $crit) = $self->get_severity_numeric(section => 'fan', instance => $instance, value => $result->{fanRPM});
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit,
short_msg => sprintf("fan '%s' rpm is %s", $instance, $result->{fanRPM}));
}
$self->{output}->perfdata_add(label => "fan_" . $instance, unit => 'RPM', value => $result->{fanRPM});
}
$self->{output}->perfdata_add(label => "fan_" . $instance, unit => 'rpm',
value => $result->{fanRPM},
warning => $warn,
critical => $crit);
}
}

2
storage/netgear/readynas/snmp/mode/components/psu.pm
View File

@ -49,7 +49,7 @@ sub load {
sub check {
my ($self) = @_;
$self->{output}->output_add(long_msg => "Checking power supply");
$self->{output}->output_add(long_msg => "checking power supply");
$self->{components}->{psu} = {name => 'psu', total => 0, skip => 0};
return if ($self->check_filter(section => 'psu'));

57
storage/netgear/readynas/snmp/mode/components/temperature.pm
View File

@ -52,7 +52,7 @@ sub load {
sub check {
my ($self) = @_;
$self->{output}->output_add(long_msg => "Checking temperatures");
$self->{output}->output_add(long_msg => "checking temperatures");
$self->{components}->{temperature} = { name => 'temperatures', total => 0, skip => 0 };
return if ($self->check_filter(section => 'temperature'));
@ -60,6 +60,7 @@ sub check {
next if ($oid !~ /^$mapping->{temperatureValue}->{oid}\.(.*)$/);
my $instance = $1;
my $result = $self->{snmp}->map_instance(mapping => $mapping, results => $self->{results}->{$oid_temperatureTable}, instance => $instance);
$instance .= "_" . $result->{temperatureType} if (defined($result->{temperatureType}));
next if ($self->check_filter(section => 'temperature', instance => $instance));
$self->{components}->{temperature}->{total}++;
@ -67,56 +68,24 @@ sub check {
my $temperatureMax_string = defined($result->{temperatureMax}) && $result->{temperatureMax} != -1 ? " ($result->{temperatureMax} max)" : '';
my $temperatureMax_unit = defined($result->{temperatureMax}) && $self->{mib_ver} == 6 ? 'C' : 'F';
if ($self->{mib_ver} == 6){
$self->{output}->output_add(long_msg => sprintf("'%s' %s temperature is %d%s%s.",
$instance, $result->{temperatureType}, $result->{temperatureValue},
$temperatureMax_unit, $temperatureMax_string));
if (defined($result->{temperatureValue}) && $result->{temperatureValue} != -1) {
my ($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'temperature', instance => $instance, value => $result->{temperatureValue});
if ($checked == 0) {
my $crit_th = $result->{temperatureMax} != -1 ? $result->{temperatureMax} : '';
my $warn_th = $crit_th ne '' ? $crit_th-10 : '';
$self->{perfdata}->threshold_validate(label => 'warning-temperature-instance-' . $instance, value => $warn_th);
$self->{perfdata}->threshold_validate(label => 'critical-temperature-instance-' . $instance, value => $crit_th);
$warn = $self->{perfdata}->get_perfdata_for_output(label => 'warning-temperature-instance-' . $instance);
$crit = $self->{perfdata}->get_perfdata_for_output(label => 'critical-temperature-instance-' . $instance);
}
$self->{output}->output_add(long_msg => sprintf("temperature '%s' status is %s [value = %s%s]",
$instance, $result->{temperatureStatus}, $result->{temperatureValue}, $temperatureMax_unit));
my $exit = $self->get_severity(label => 'default', section => 'temperature', value => $result->{temperatureStatus});
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit,
short_msg => sprintf("Temperature '%s' %s is %s degree %s",
$instance, $result->{temperatureType}, $result->{temperatureValue}, $temperatureMax_unit));
short_msg => sprintf("Temperature '%s' status is %s.", $instance, $result->{temperatureStatus}));
}
$self->{output}->perfdata_add(label => "temp_" . $instance . "_" . $result->{temperatureType}, unit => $temperatureMax_unit,
my ($exit2, $warn, $crit) = $self->get_severity_numeric(section => 'temperature', instance => $instance, value => $result->{temperatureValue});
if (!$self->{output}->is_status(value => $exit2, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit2,
short_msg => sprintf("Temperature '%s' is %s%s", $instance, $result->{temperatureValue}, $temperatureMax_unit));
}
$self->{output}->perfdata_add(label => "temp_" . $instance, unit => $temperatureMax_unit,
value => $result->{temperatureValue},
warning => $warn,
critical => $crit);
}
}elsif ($self->{mib_ver} == 4){
$self->{output}->output_add(long_msg => sprintf("temperature '%s' (%dF) is %s.",
$instance, $result->{temperatureValue}, $result->{temperatureStatus}));
# check for warnings or criticals ?
my ($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'temperature', instance => $instance, value => $result->{temperatureValue});
if ($checked == 1) {
$self->{perfdata}->threshold_validate(label => 'warning-temperature-instance-' . $instance, value => $warn);
$self->{perfdata}->threshold_validate(label => 'critical-temperature-instance-' . $instance, value => $crit);
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit,
short_msg => sprintf("Temperature '%s' (%s%s) is %s.", $instance, $result->{temperatureValue}, $temperatureMax_unit, $exit));
}
}else{
my $exit = $self->get_severity(label => 'default', section => 'temperature', value => $result->{temperatureStatus});
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit,
short_msg => sprintf("Temperature '%s' (%s%s) is %s.", $instance, $result->{temperatureValue}, $temperatureMax_unit, $result->{temperatureStatus}));
}
}
$self->{output}->perfdata_add(label => "temp_" . $instance, unit => $temperatureMax_unit,
value => $result->{temperatureValue});
}
}
}
1;

2
storage/netgear/readynas/snmp/mode/components/volume.pm
View File

@ -51,7 +51,7 @@ sub load {
sub check {
my ($self) = @_;
$self->{output}->output_add(long_msg => "Checking volume");
$self->{output}->output_add(long_msg => "checking volume");
$self->{components}->{volume} = {name => 'volume', total => 0, skip => 0};
return if ($self->check_filter(section => 'volume'));

12
storage/netgear/readynas/snmp/mode/hardware.pm
View File

@ -37,7 +37,6 @@ sub set_system {
$self->{cb_hook2} = 'snmp_execute';
$self->{thresholds} = {
# fan, temperature (v4)
default => [
['Normal', 'OK'],
['Ok', 'OK'],
@ -87,7 +86,6 @@ sub snmp_execute {
$self->{snmp} = $options{snmp};
$self->{results} = $self->{snmp}->get_multiple_table(oids => $self->{request});
}
sub new {
@ -96,10 +94,8 @@ sub new {
bless $self, $class;
$self->{version} = '1.0';
# In v4, fanRPM must be >0
$options{options}->add_options(arguments => {
"critical:s@" => { name => 'critical', default => ['fan,.*,1:'] },
$options{options}->add_options(arguments =>
{
});
return $self;
@ -138,12 +134,12 @@ Example: --threshold-overload='psu,CRITICAL,^(?!(on)$)'
=item B<--warning>
Set warning threshold for temperatures (syntax: type,instance,threshold)
Set warning threshold for temperatures, fan (syntax: type,instance,threshold)
Example: --warning='xxxxx,.*,30'
=item B<--critical>
Set critical threshold for temperatures (syntax: type,instance,threshold)
Set critical threshold for temperatures, fan (syntax: type,instance,threshold)
Example: --critical='xxxxx,.*,40'
=back