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

Refs #6231

This commit is contained in:
Florian 2015-03-28 18:02:09 +01:00
parent 05e07da03b
commit 293759c1ae
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/lmsensors/mode/fan.pm
View File

@ -112,7 +112,7 @@ sub run {
my $label = 'sensor_fan'; my $label = 'sensor_fan';
my $extra_label = ''; my $extra_label = '';
$extra_label = '_' . $SensorDesc if (!defined($self->{option_results}->{sensor}) || defined($self->{option_results}->{use_regexp})); $extra_label = '_' . $SensorId . "_" . $SensorDesc if (!defined($self->{option_results}->{sensor}) || defined($self->{option_results}->{use_regexp}));
$self->{output}->perfdata_add(label => $label . $extra_label, $self->{output}->perfdata_add(label => $label . $extra_label,
value => $SensorValue, value => $SensorValue,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),

4
apps/lmsensors/mode/misc.pm
View File

@ -98,7 +98,7 @@ sub run {
foreach my $SensorId (sort @{$self->{Sensor_id_selected}}) { foreach my $SensorId (sort @{$self->{Sensor_id_selected}}) {
my $SensorDesc = $SensorValueResult->{$oid_SensorDesc . '.' . $SensorId}; my $SensorDesc = $SensorValueResult->{$oid_SensorDesc . '.' . $SensorId};
my $SensorValue = $SensorValueResult->{$oid_SensorValue . '.' . $SensorId}; my $SensorValue = $SensorValueResult->{$oid_SensorValue . '.' . $SensorId} / 1000;
my $exit = $self->{perfdata}->threshold_check(value => $SensorValue, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); my $exit = $self->{perfdata}->threshold_check(value => $SensorValue, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
@ -112,7 +112,7 @@ sub run {
my $label = 'sensor_misc'; my $label = 'sensor_misc';
my $extra_label = ''; my $extra_label = '';
$extra_label = '_' . $SensorDesc if (!defined($self->{option_results}->{sensor}) || defined($self->{option_results}->{use_regexp})); $extra_label = '_' . $SensorId . "_" . $SensorDesc if (!defined($self->{option_results}->{sensor}) || defined($self->{option_results}->{use_regexp}));
$self->{output}->perfdata_add(label => $label . $extra_label, $self->{output}->perfdata_add(label => $label . $extra_label,
value => $SensorValue, value => $SensorValue,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),

2
apps/lmsensors/mode/temperature.pm
View File

@ -112,7 +112,7 @@ sub run {
my $label = 'sensor_temperature'; my $label = 'sensor_temperature';
my $extra_label = ''; my $extra_label = '';
$extra_label = '_' . $SensorDesc if (!defined($self->{option_results}->{sensor}) || defined($self->{option_results}->{use_regexp})); $extra_label = '_' . $SensorId . "_" . $SensorDesc if (!defined($self->{option_results}->{sensor}) || defined($self->{option_results}->{use_regexp}));
$self->{output}->perfdata_add(label => $label . $extra_label, $self->{output}->perfdata_add(label => $label . $extra_label,
value => $SensorValue, value => $SensorValue,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),

2
apps/lmsensors/mode/voltage.pm
View File

@ -112,7 +112,7 @@ sub run {
my $label = 'sensor_voltage'; my $label = 'sensor_voltage';
my $extra_label = ''; my $extra_label = '';
$extra_label = '_' . $SensorDesc if (!defined($self->{option_results}->{sensor}) || defined($self->{option_results}->{use_regexp})); $extra_label = '_' . $SensorId . "_" . $SensorDesc if (!defined($self->{option_results}->{sensor}) || defined($self->{option_results}->{use_regexp}));
$self->{output}->perfdata_add(label => $label . $extra_label, unit => 'V', $self->{output}->perfdata_add(label => $label . $extra_label, unit => 'V',
value => $SensorValue, value => $SensorValue,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),