Fix #1798
This commit is contained in:
parent
aa41f2d924
commit
c6fa19fe25
|
@ -27,21 +27,24 @@ use warnings;
|
||||||
|
|
||||||
sub set_system {
|
sub set_system {
|
||||||
my ($self, %options) = @_;
|
my ($self, %options) = @_;
|
||||||
|
|
||||||
$self->{regexp_threshold_overload_check_section_option} = '^(sensor)$';
|
$self->{regexp_threshold_overload_check_section_option} = '^(sensor)$';
|
||||||
$self->{regexp_threshold_numeric_check_section_option} = '^(temperature|humidity)$';
|
$self->{regexp_threshold_numeric_check_section_option} = '^(temperature|humidity)$';
|
||||||
|
|
||||||
$self->{cb_hook2} = 'snmp_execute';
|
$self->{cb_hook2} = 'snmp_execute';
|
||||||
|
|
||||||
$self->{thresholds} = {
|
$self->{thresholds} = {
|
||||||
sensor => [
|
sensor => [
|
||||||
['uioNormal', 'OK'],
|
['uioNormal', 'OK'],
|
||||||
['uioWarning', 'WARNING'],
|
['uioWarning', 'WARNING'],
|
||||||
['uioCritical', 'OK'],
|
['uioCritical', 'OK'],
|
||||||
['sensorStatusNotApplicable', 'OK'],
|
['sensorStatusNotApplicable', 'OK'],
|
||||||
|
|
||||||
|
['disconnected', 'WARNING'],
|
||||||
|
['connected', 'OK'],
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
$self->{components_path} = 'hardware::ups::apc::snmp::mode::components';
|
$self->{components_path} = 'hardware::ups::apc::snmp::mode::components';
|
||||||
$self->{components_module} = ['sensor'];
|
$self->{components_module} = ['sensor'];
|
||||||
}
|
}
|
||||||
|
@ -50,17 +53,16 @@ sub new {
|
||||||
my ($class, %options) = @_;
|
my ($class, %options) = @_;
|
||||||
my $self = $class->SUPER::new(package => __PACKAGE__, %options, no_load_components => 1);
|
my $self = $class->SUPER::new(package => __PACKAGE__, %options, no_load_components => 1);
|
||||||
bless $self, $class;
|
bless $self, $class;
|
||||||
|
|
||||||
$options{options}->add_options(arguments =>
|
$options{options}->add_options(arguments => {
|
||||||
{
|
});
|
||||||
});
|
|
||||||
|
|
||||||
return $self;
|
return $self;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub snmp_execute {
|
sub snmp_execute {
|
||||||
my ($self, %options) = @_;
|
my ($self, %options) = @_;
|
||||||
|
|
||||||
$self->{snmp} = $options{snmp};
|
$self->{snmp} = $options{snmp};
|
||||||
$self->{results} = $self->{snmp}->get_multiple_table(oids => $self->{request});
|
$self->{results} = $self->{snmp}->get_multiple_table(oids => $self->{request});
|
||||||
}
|
}
|
||||||
|
@ -108,74 +110,201 @@ package hardware::ups::apc::snmp::mode::components::sensor;
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
|
||||||
my %map_status = (1 => 'uioNormal', 2 => 'uioWarning', 3 => 'uioCritical', 4 => 'sensorStatusNotApplicable');
|
my $map_alarm_status = {
|
||||||
|
1 => 'uioNormal', 2 => 'uioWarning', 3 => 'uioCritical', 4 => 'sensorStatusNotApplicable'
|
||||||
|
};
|
||||||
|
my $map_iem_status = {
|
||||||
|
1 => 'disconnected', 2 => 'connected'
|
||||||
|
};
|
||||||
|
my $map_iem_unit = {
|
||||||
|
1 => 'celsius', 2 => 'fahrenheit'
|
||||||
|
};
|
||||||
|
|
||||||
my $mapping = {
|
my $mapping = {
|
||||||
uioSensorStatusSensorName => { oid => '.1.3.6.1.4.1.318.1.1.25.1.2.1.3' },
|
uioSensorStatusSensorName => { oid => '.1.3.6.1.4.1.318.1.1.25.1.2.1.3' },
|
||||||
uioSensorStatusTemperatureDegC => { oid => '.1.3.6.1.4.1.318.1.1.25.1.2.1.6' },
|
uioSensorStatusTemperatureDegC => { oid => '.1.3.6.1.4.1.318.1.1.25.1.2.1.6' },
|
||||||
uioSensorStatusHumidity => { oid => '.1.3.6.1.4.1.318.1.1.25.1.2.1.7' },
|
uioSensorStatusHumidity => { oid => '.1.3.6.1.4.1.318.1.1.25.1.2.1.7' },
|
||||||
uioSensorStatusAlarmStatus => { oid => '.1.3.6.1.4.1.318.1.1.25.1.2.1.9', map => \%map_status },
|
uioSensorStatusAlarmStatus => { oid => '.1.3.6.1.4.1.318.1.1.25.1.2.1.9', map => $map_alarm_status },
|
||||||
|
};
|
||||||
|
my $mapping_iem = {
|
||||||
|
iemStatusProbeName => { oid => '.1.3.6.1.4.1.318.1.1.10.2.3.2.1.2' },
|
||||||
|
iemStatusProbeStatus => { oid => '.1.3.6.1.4.1.318.1.1.10.2.3.2.1.3', map => $map_iem_status },
|
||||||
|
iemStatusProbeCurrentTemp => { oid => '.1.3.6.1.4.1.318.1.1.10.2.3.2.1.4' },
|
||||||
|
iemStatusProbeTempUnits => { oid => '.1.3.6.1.4.1.318.1.1.10.2.3.2.1.5', map => $map_iem_unit },
|
||||||
|
iemStatusProbeCurrentHumid => { oid => '.1.3.6.1.4.1.318.1.1.10.2.3.2.1.6' },
|
||||||
};
|
};
|
||||||
my $oid_uioSensorStatusEntry = '.1.3.6.1.4.1.318.1.1.25.1.2.1';
|
my $oid_uioSensorStatusEntry = '.1.3.6.1.4.1.318.1.1.25.1.2.1';
|
||||||
|
my $oid_iemStatusProbesEntry = '.1.3.6.1.4.1.318.1.1.10.2.3.2.1';
|
||||||
|
|
||||||
sub load {
|
sub load {
|
||||||
my ($self) = @_;
|
my ($self) = @_;
|
||||||
|
|
||||||
push @{$self->{request}}, { oid => $oid_uioSensorStatusEntry };
|
push @{$self->{request}}, { oid => $oid_uioSensorStatusEntry, start => $mapping->{uioSensorStatusSensorName}->{oid} },
|
||||||
|
{ oid => $oid_iemStatusProbesEntry, start => $mapping->{iemStatusProbeName}->{oid}, end => $mapping->{iemStatusProbeCurrentHumid}->{oid} };
|
||||||
}
|
}
|
||||||
|
|
||||||
sub check {
|
sub check_uoi {
|
||||||
my ($self) = @_;
|
my ($self) = @_;
|
||||||
|
|
||||||
$self->{output}->output_add(long_msg => "Checking sensors");
|
|
||||||
$self->{components}->{sensor} = {name => 'sensors', total => 0, skip => 0};
|
|
||||||
return if ($self->check_filter(section => 'sensor'));
|
|
||||||
|
|
||||||
my ($exit, $warn, $crit, $checked);
|
my ($exit, $warn, $crit, $checked);
|
||||||
foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_uioSensorStatusEntry}})) {
|
foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_uioSensorStatusEntry}})) {
|
||||||
next if ($oid !~ /^$mapping->{uioSensorStatusAlarmStatus}->{oid}\.(.*)$/);
|
next if ($oid !~ /^$mapping->{uioSensorStatusAlarmStatus}->{oid}\.(.*)$/);
|
||||||
my $instance = $1;
|
my $instance = $1;
|
||||||
my $result = $self->{snmp}->map_instance(mapping => $mapping, results => $self->{results}->{$oid_uioSensorStatusEntry}, instance => $instance);
|
my $result = $self->{snmp}->map_instance(mapping => $mapping, results => $self->{results}->{$oid_uioSensorStatusEntry}, instance => $instance);
|
||||||
|
|
||||||
next if ($self->check_filter(section => 'sensor', instance => $instance));
|
next if ($self->check_filter(section => 'sensor', instance => $instance));
|
||||||
|
|
||||||
$self->{components}->{sensor}->{total}++;
|
$self->{components}->{sensor}->{total}++;
|
||||||
$self->{output}->output_add(long_msg => sprintf("sensor '%s' status is '%s' [instance = %s] [temperature = %s C] [humidity = %s %%]",
|
$self->{output}->output_add(
|
||||||
$result->{uioSensorStatusSensorName}, $result->{uioSensorStatusAlarmStatus}, $instance,
|
long_msg => sprintf(
|
||||||
$result->{uioSensorStatusTemperatureDegC} != -1 ? $result->{uioSensorStatusTemperatureDegC} : '-',
|
"sensor '%s' status is '%s' [instance = %s] [temperature = %s C] [humidity = %s %%]",
|
||||||
$result->{uioSensorStatusHumidity} != -1 ? $result->{uioSensorStatusHumidity} : '-'));
|
$result->{uioSensorStatusSensorName}, $result->{uioSensorStatusAlarmStatus}, $instance,
|
||||||
|
$result->{uioSensorStatusTemperatureDegC} != -1 ? $result->{uioSensorStatusTemperatureDegC} : '-',
|
||||||
|
$result->{uioSensorStatusHumidity} != -1 ? $result->{uioSensorStatusHumidity} : '-'
|
||||||
|
)
|
||||||
|
);
|
||||||
$exit = $self->get_severity(section => 'sensor', value => $result->{uioSensorStatusAlarmStatus});
|
$exit = $self->get_severity(section => 'sensor', value => $result->{uioSensorStatusAlarmStatus});
|
||||||
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(
|
||||||
short_msg => sprintf("Sensor '%s' status is '%s'", $result->{uioSensorStatusSensorName}, $result->{uioSensorStatusAlarmStatus}));
|
severity => $exit,
|
||||||
|
short_msg => sprintf("Sensor '%s' status is '%s'", $result->{uioSensorStatusSensorName}, $result->{uioSensorStatusAlarmStatus})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($result->{uioSensorStatusTemperatureDegC} != -1) {
|
if ($result->{uioSensorStatusTemperatureDegC} != -1) {
|
||||||
($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'temperature', instance => $instance, value => $result->{uioSensorStatusTemperatureDegC});
|
($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'temperature', instance => $instance, value => $result->{uioSensorStatusTemperatureDegC});
|
||||||
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(
|
||||||
short_msg => sprintf("Sensor temperature '%s' is %s C", $result->{uioSensorStatusSensorName}, $result->{uioSensorStatusTemperatureDegC}));
|
severity => $exit,
|
||||||
|
short_msg => sprintf(
|
||||||
|
"sensor temperature '%s' is %s C",
|
||||||
|
$result->{uioSensorStatusSensorName},
|
||||||
|
$result->{uioSensorStatusTemperatureDegC}
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
$self->{output}->perfdata_add(label => 'temp_' . $result->{uioSensorStatusSensorName}, unit => 'C',
|
$self->{output}->perfdata_add(
|
||||||
value => $result->{uioSensorStatusTemperatureDegC},
|
label => 'temp', unit => 'C',
|
||||||
warning => $warn,
|
nlabel => 'sensor.temperature.celsius',
|
||||||
critical => $crit
|
instances => $result->{uioSensorStatusSensorName},
|
||||||
);
|
value => $result->{uioSensorStatusTemperatureDegC},
|
||||||
|
warning => $warn,
|
||||||
|
critical => $crit
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($result->{uioSensorStatusHumidity} != -1) {
|
next if ($result->{uioSensorStatusHumidity} == -1);
|
||||||
($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'humidity', instance => $instance, value => $result->{uioSensorStatusHumidity});
|
|
||||||
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
|
($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'humidity', instance => $instance, value => $result->{uioSensorStatusHumidity});
|
||||||
$self->{output}->output_add(severity => $exit,
|
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
|
||||||
short_msg => sprintf("Sensor humidity '%s' is %s %%", $result->{uioSensorStatusSensorName}, $result->{uioSensorStatusHumidity}));
|
$self->{output}->output_add(
|
||||||
}
|
severity => $exit,
|
||||||
$self->{output}->perfdata_add(label => 'humidity_' . $result->{uioSensorStatusSensorName}, unit => '%',
|
short_msg => sprintf(
|
||||||
value => $result->{uioSensorStatusHumidity},
|
"sensor humidity '%s' is %s %%",
|
||||||
warning => $warn,
|
$result->{uioSensorStatusSensorName},
|
||||||
critical => $crit, min => 0, max => 100
|
$result->{uioSensorStatusHumidity}
|
||||||
);
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
$self->{output}->perfdata_add(
|
||||||
|
label => 'humidity', unit => '%',
|
||||||
|
nlabel => 'sensor.humidity.percentage',
|
||||||
|
instances => $result->{uioSensorStatusSensorName},
|
||||||
|
value => $result->{uioSensorStatusHumidity},
|
||||||
|
warning => $warn,
|
||||||
|
critical => $crit,
|
||||||
|
min => 0, max => 100
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub check_iem {
|
||||||
|
my ($self) = @_;
|
||||||
|
|
||||||
|
my ($exit, $warn, $crit, $checked);
|
||||||
|
foreach my $oid ($self->{snmp}->oid_lex_sort(keys %{$self->{results}->{$oid_iemStatusProbesEntry}})) {
|
||||||
|
next if ($oid !~ /^$mapping_iem->{iemStatusProbeName}->{oid}\.(.*)$/);
|
||||||
|
my $instance = $1;
|
||||||
|
my $result = $self->{snmp}->map_instance(mapping => $mapping_iem, results => $self->{results}->{$oid_iemStatusProbesEntry}, instance => $instance);
|
||||||
|
|
||||||
|
next if ($self->check_filter(section => 'sensor', instance => $instance));
|
||||||
|
|
||||||
|
$self->{components}->{sensor}->{total}++;
|
||||||
|
$self->{output}->output_add(
|
||||||
|
long_msg => sprintf(
|
||||||
|
"sensor '%s' status is '%s' [instance = %s] [temperature = %s %s] [humidity = %s %%]",
|
||||||
|
$result->{iemStatusProbeName}, $result->{iemStatusProbeStatus}, $instance,
|
||||||
|
$result->{iemStatusProbeCurrentTemp} != -1 ? $result->{iemStatusProbeCurrentTemp} : '-',
|
||||||
|
$result->{iemStatusProbeTempUnits},
|
||||||
|
$result->{iemStatusProbeCurrentHumid} != -1 ? $result->{iemStatusProbeCurrentHumid} : '-'
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$exit = $self->get_severity(section => 'sensor', value => $result->{iemStatusProbeStatus});
|
||||||
|
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
|
||||||
|
$self->{output}->output_add(
|
||||||
|
severity => $exit,
|
||||||
|
short_msg => sprintf("Sensor '%s' status is '%s'", $result->{iemStatusProbeName}, $result->{iemStatusProbeStatus})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($result->{iemStatusProbeCurrentTemp} != -1) {
|
||||||
|
($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'temperature', instance => $instance, value => $result->{iemStatusProbeCurrentTemp});
|
||||||
|
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
|
||||||
|
$self->{output}->output_add(
|
||||||
|
severity => $exit,
|
||||||
|
short_msg => sprintf(
|
||||||
|
"sensor temperature '%s' is %s %s",
|
||||||
|
$result->{iemStatusProbeName},
|
||||||
|
$result->{iemStatusProbeCurrentTemp},
|
||||||
|
$result->{iemStatusProbeTempUnits}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
$self->{output}->perfdata_add(
|
||||||
|
label => 'temp',
|
||||||
|
unit => $result->{iemStatusProbeTempUnits} eq 'celsius' ? 'C' : 'F',
|
||||||
|
nlabel => 'sensor.temperature.' . $result->{iemStatusProbeTempUnits},
|
||||||
|
instances => $result->{iemStatusProbeName},
|
||||||
|
value => $result->{iemStatusProbeCurrentTemp},
|
||||||
|
warning => $warn,
|
||||||
|
critical => $crit
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
next if ($result->{iemStatusProbeCurrentHumid} == -1);
|
||||||
|
|
||||||
|
($exit, $warn, $crit, $checked) = $self->get_severity_numeric(section => 'humidity', instance => $instance, value => $result->{iemStatusProbeCurrentHumid});
|
||||||
|
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
|
||||||
|
$self->{output}->output_add(
|
||||||
|
severity => $exit,
|
||||||
|
short_msg => sprintf(
|
||||||
|
"sensor humidity '%s' is %s %%",
|
||||||
|
$result->{iemStatusProbeName},
|
||||||
|
$result->{iemStatusProbeCurrentHumid}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
$self->{output}->perfdata_add(
|
||||||
|
label => 'humidity', unit => '%',
|
||||||
|
nlabel => 'sensor.humidity.percentage',
|
||||||
|
instances => $result->{iemStatusProbeName},
|
||||||
|
value => $result->{iemStatusProbeCurrentHumid},
|
||||||
|
warning => $warn,
|
||||||
|
critical => $crit,
|
||||||
|
min => 0, max => 100
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sub check {
|
||||||
|
my ($self) = @_;
|
||||||
|
|
||||||
|
$self->{output}->output_add(long_msg => 'checking sensors');
|
||||||
|
$self->{components}->{sensor} = {name => 'sensors', total => 0, skip => 0};
|
||||||
|
return if ($self->check_filter(section => 'sensor'));
|
||||||
|
|
||||||
|
check_uoi($self);
|
||||||
|
check_iem($self);
|
||||||
|
}
|
||||||
|
|
||||||
1;
|
1;
|
||||||
|
|
Loading…
Reference in New Issue