mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Fixed Component status log (#7723)

Browse Source 
I have failed SQL in my log for creating entries.
Which amount to "Component Created"

It doesn't seem as though the status log is displayed/used anywhere.  Especially considering, it didn't work.  So, I would be fine with deleting it too.
This commit is contained in:
Tony Murray
2017-11-13 14:43:28 -06:00
committed by Neil Lathwood
parent 06510bba5e
commit c36c80f486
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
LibreNMS/Component.php
View File

@@ -218,11 +218,11 @@ class Component
return $count;
}
public function getComponentStatusLog($component = null, $start = null, $end = null)
public function getComponentStatusLog($component_id, $start, $end)
{
if (($component == null) || ($start == null) || ($end == null)) {
if (($component_id == null) || ($start == null) || ($end == null)) {
// Error...
d_echo("Required arguments are missing. Component: ".$component.", Start: ".$start.", End: ".$end."\n");
d_echo("Required arguments are missing. Component ID: ".$component_id.", Start: ".$start.", End: ".$end."\n");
return false;
}
@@ -230,8 +230,8 @@ class Component
$return = array();
// 1. find the previous value, this is the value when $start occurred.
$sql_query = "SELECT status FROM component_statuslog WHERE `component` = ? AND time < ? ORDER BY `id` desc LIMIT 1";
$sql_param = array($component,$start);
$sql_query = "SELECT status FROM `component_statuslog` WHERE `component_id` = ? AND `timestamp` < ? ORDER BY `id` desc LIMIT 1";
$sql_param = array($component_id, $start);
$result = dbFetchRow($sql_query, $sql_param);
if ($result == false) {
$return['initial'] = false;
@@ -240,8 +240,8 @@ class Component
}
// 2. Then we just need a list of all the entries for the time period.
$sql_query = "SELECT status, time, message FROM component_statuslog WHERE `component` = ? AND time >= ? AND time < ? ORDER BY `time`";
$sql_param = array($component,$start,$end);
$sql_query = "SELECT status, `timestamp`, message FROM `component_statuslog` WHERE `component_id` = ? AND `timestamp` >= ? AND `timestamp` < ? ORDER BY `timestamp`";
$sql_param = array($component_id, $start,$end);
$return['data'] = dbFetchRows($sql_query, $sql_param);
d_echo("Status Log Data: ".print_r($return, true)."\n");
@@ -270,11 +270,11 @@ class Component
return $ARRAY;
}
public function createStatusLogEntry($component, $status, $message)
public function createStatusLogEntry($component_id, $status, $message)
{
// Add an entry to the statuslog table for a particular component.
$DATA = array(
'component' => $component,
'component_id' => $component_id,
'status' => $status,
'message' => $message,
);
@@ -307,7 +307,7 @@ class Component
// If the Status has changed we need to add a log entry
if ($AVP['status'] != $OLD[$device_id][$COMPONENT]['status']) {
d_echo("Status Changed - Old: ".$OLD[$device_id][$COMPONENT]['status'].", New: ".$AVP['status']."\n");
$this->createStatusLogEntry($COMPONENT, $AVP['status'], $AVP['error']);
$this->createStatusLogEntry($COMPONENT['id'], $AVP['status'], $AVP['error']);
}
// Process our reserved components first.