diff --git a/includes/polling/current.inc.php b/includes/polling/current.inc.php index d43422cf7f..f408941269 100644 --- a/includes/polling/current.inc.php +++ b/includes/polling/current.inc.php @@ -38,7 +38,7 @@ while($dbcurrent = mysql_fetch_array($current_data)) { $msg .= "A) at " . date($config['timestamp_format']); mail($email, "Current Alarm: " . $device['hostname'] . " " . $dbcurrent['current_descr'], $msg, $config['email_headers']); echo("Alerting for " . $device['hostname'] . " " . $dbcurrent['current_descr'] . "\n"); - eventlog('Current ' . $dbcurrent['current_descr'] . " under threshold: " . $dbcurrent['current_current'] . " A (< " . $dbcurrent['current_limit_low'] . " A)", $device['device_id']); + eventlog('Current ' . $dbcurrent['current_descr'] . " under threshold: " . $current . " A (< " . $dbcurrent['current_limit_low'] . " A)", $device['device_id']); } else if($dbcurrent['current_current'] < $dbcurrent['current_limit'] && $current >= $dbcurrent['current_limit']) { @@ -47,7 +47,7 @@ while($dbcurrent = mysql_fetch_array($current_data)) { $msg .= "A) at " . date($config['timestamp_format']); mail($email, "Current Alarm: " . $device['hostname'] . " " . $dbcurrent['current_descr'], $msg, $config['email_headers']); echo("Alerting for " . $device['hostname'] . " " . $dbcurrent['current_descr'] . "\n"); - eventlog('Current ' . $dbcurrent['current_descr'] . " above threshold: " . $dbcurrent['current_current'] . " A (> " . $dbcurrent['current_limit'] . " A)", $device['device_id']); + eventlog('Current ' . $dbcurrent['current_descr'] . " above threshold: " . $current . " A (> " . $dbcurrent['current_limit'] . " A)", $device['device_id']); } mysql_query("UPDATE current SET current_current = '$current' WHERE current_id = '" . $dbcurrent['current_id'] . "'"); diff --git a/includes/polling/frequencies.inc.php b/includes/polling/frequencies.inc.php index e239e17cc5..17919aae2b 100644 --- a/includes/polling/frequencies.inc.php +++ b/includes/polling/frequencies.inc.php @@ -37,7 +37,7 @@ while($frequency = mysql_fetch_array($freq_data)) { $msg .= "Hz) at " . date($config['timestamp_format']); mail($email, "Frequency Alarm: " . $device['hostname'] . " " . $frequency['freq_descr'], $msg, $config['email_headers']); echo("Alerting for " . $device['hostname'] . " " . $frequency['freq_descr'] . "\n"); - eventlog('Frequency ' . $frequency['freq_descr'] . " under threshold: " . $frequency['freq_current'] . " Hz (< " . $frequency['freq_limit_low'] . " Hz)", $device['device_id']); + eventlog('Frequency ' . $frequency['freq_descr'] . " under threshold: " . $freq . " Hz (< " . $frequency['freq_limit_low'] . " Hz)", $device['device_id']); } else if($frequency['freq_current'] < $frequency['freq_limit'] && $freq >= $frequency['freq_limit']) { @@ -46,7 +46,7 @@ while($frequency = mysql_fetch_array($freq_data)) { $msg .= "Hz) at " . date($config['timestamp_format']); mail($email, "Frequency Alarm: " . $device['hostname'] . " " . $frequency['freq_descr'], $msg, $config['email_headers']); echo("Alerting for " . $device['hostname'] . " " . $frequency['freq_descr'] . "\n"); - eventlog('Frequency ' . $frequency['freq_descr'] . " above threshold: " . $frequency['freq_current'] . " Hz (> " . $frequency['freq_limit'] . " Hz)", $device['device_id']); + eventlog('Frequency ' . $frequency['freq_descr'] . " above threshold: " . $freq . " Hz (> " . $frequency['freq_limit'] . " Hz)", $device['device_id']); } mysql_query("UPDATE frequency SET freq_current = '$freq' WHERE freq_id = '" . $frequency['freq_id'] . "'"); diff --git a/includes/polling/temperatures.inc.php b/includes/polling/temperatures.inc.php index a8fb790892..56dd8a7de7 100755 --- a/includes/polling/temperatures.inc.php +++ b/includes/polling/temperatures.inc.php @@ -40,7 +40,7 @@ while($temperature = mysql_fetch_array($temp_data)) { $msg .= ") at " . date($config['timestamp_format']); mail($email, "Temp Alarm: " . $device['hostname'] . " " . $temperature['temp_descr'], $msg, $config['email_headers']); echo("Alerting for " . $device['hostname'] . " " . $temperature['temp_descr'] . "\n"); - eventlog('Temperature ' . $temperature['temp_descr'] . " over threshold: " . $temperature['temp_current'] . " °C (> " . $temperature['temp_limit'] . " °C)", $device['device_id']); + eventlog('Temperature ' . $temperature['temp_descr'] . " over threshold: " . $temp . " °C (> " . $temperature['temp_limit'] . " °C)", $device['device_id']); } mysql_query("UPDATE temperature SET temp_current = '$temp' WHERE temp_id = '" . $temperature['temp_id'] . "'"); diff --git a/includes/polling/voltages.inc.php b/includes/polling/voltages.inc.php index 98174e582e..d787699452 100755 --- a/includes/polling/voltages.inc.php +++ b/includes/polling/voltages.inc.php @@ -37,7 +37,7 @@ while($voltage = mysql_fetch_array($volt_data)) { $msg .= "V) at " . date($config['timestamp_format']); mail($email, "Voltage Alarm: " . $device['hostname'] . " " . $voltage['volt_descr'], $msg, $config['email_headers']); echo("Alerting for " . $device['hostname'] . " " . $voltage['volt_descr'] . "\n"); - eventlog('Voltage ' . $voltage['volt_descr'] . " under threshold: " . $voltage['volt_current'] . " V (< " . $voltage['volt_limit_low'] . " V)", $device['device_id']); + eventlog('Voltage ' . $voltage['volt_descr'] . " under threshold: " . $volt . " V (< " . $voltage['volt_limit_low'] . " V)", $device['device_id']); } else if($voltage['volt_current'] < $voltage['volt_limit'] && $volt >= $voltage['volt_limit']) { @@ -46,7 +46,7 @@ while($voltage = mysql_fetch_array($volt_data)) { $msg .= "V) at " . date($config['timestamp_format']); mail($email, "Voltage Alarm: " . $device['hostname'] . " " . $voltage['volt_descr'], $msg, $config['email_headers']); echo("Alerting for " . $device['hostname'] . " " . $voltage['volt_descr'] . "\n"); - eventlog('Voltage ' . $voltage['volt_descr'] . " above threshold: " . $voltage['volt_current'] . " V (> " . $voltage['volt_limit'] . " V)", $device['device_id']); + eventlog('Voltage ' . $voltage['volt_descr'] . " above threshold: " . $volt . " V (> " . $voltage['volt_limit'] . " V)", $device['device_id']); } mysql_query("UPDATE voltage SET volt_current = '$volt' WHERE volt_id = '" . $voltage['volt_id'] . "'");