fws
/
zabbix-agent-addons
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix handling Airflow_Temperature_Cel label

Browse Source
tags/zabbix-agent-addons-0.2.20-1 0.2.13_el5
Daniel Berteaud 8 years ago
parent 65b6e43f97
commit 2393ed113e
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      zabbix_scripts/util_generate_sensors_ini

8
zabbix_scripts/util_generate_sensors_ini
Unescape View File

@ -285,14 +285,14 @@ if ($smartctl && -x $smartctl){
my @lines = qx($smartctl -A /dev/$block); my @lines = qx($smartctl -A /dev/$block);
next if ($? != 0); next if ($? != 0);
foreach my $l (@lines){ foreach my $l (@lines){
if ($l =~ /Temperature_Celsius|Airflow_Temperature_Cel/){ if ($l =~ /(Temperature_Celsius|Airflow_Temperature_Cel)/){
$sensors->{$block} = { $sensors->{$block} = {
description => "$block temperature", description => "$block temperature",
threshold_low => $def_hd_temp_thres_high-$temp_hd_hyst, threshold_low => $def_hd_temp_thres_high-$temp_hd_hyst,
threshold_high => $def_hd_temp_thres_high, threshold_high => $def_hd_temp_thres_high,
type => 'temp', type => 'temp',
unit => '°C', unit => '°C',
cmd => "$smartctl -A /dev/$block | grep Temperature_Celsius | awk '{print \$10}'" cmd => "$smartctl -A /dev/$block | grep $1 | awk '{print \$10}'"
}; };
print "Found a temperature sensor using smartctl: $block\n"; print "Found a temperature sensor using smartctl: $block\n";
last; last;
@ -318,14 +318,14 @@ if ($smartctl && -x $smartctl){
print "Found a temperature sensor using smartctl (megaraid): sda-$i\n"; print "Found a temperature sensor using smartctl (megaraid): sda-$i\n";
last; last;
} }
elsif ($l =~ /Temperature_Celsius|Airflow_Temperature_Cel/){ elsif ($l =~ /(Temperature_Celsius|Airflow_Temperature_Cel)/){
$sensors->{'sda-' . $i} = { $sensors->{'sda-' . $i} = {
description => "Temperature for disk No $i on sda", description => "Temperature for disk No $i on sda",
threshold_low => $def_hd_temp_thres_high-$temp_hd_hyst, threshold_low => $def_hd_temp_thres_high-$temp_hd_hyst,
threshold_high => $def_hd_temp_thres_high, threshold_high => $def_hd_temp_thres_high,
type => 'temp', type => 'temp',
unit => '°C', unit => '°C',
cmd => "$smartctl -A -d megaraid,$i /dev/sda | grep Temperature_Celsius | awk '{print \$10}'" cmd => "$smartctl -A -d megaraid,$i /dev/sda | grep $1 | awk '{print \$10}'"
}; };
print "Found a temperature sensor using smartctl (megaraid): sda-$i\n"; print "Found a temperature sensor using smartctl (megaraid): sda-$i\n";
last; last;

Write Preview
Loading…
Cancel
Save