nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-30 16:14:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #834 from Rosiak/master

Browse Source 
Include hostname in list_alerts API command
This commit is contained in:
Neil Lathwood
2015-04-19 15:00:15 +01:00
parent c1a2e630e1 9da3efe091
commit 6e7fcda0a0
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/API/API-Docs.md
+1
View File
@@ -487,6 +487,7 @@ Output:
"count": 7, "count": 7,
"alerts": [ "alerts": [
{ {
"hostname": "localhost",
"id": "1", "id": "1",
"device_id": "1", "device_id": "1",
"rule_id": "1", "rule_id": "1",
html/includes/api_functions.inc.php
+1 -1
View File
@@ -536,7 +536,7 @@ function list_alerts() {
$sql = "AND id=?"; $sql = "AND id=?";
array_push($param,$alert_id); array_push($param,$alert_id);
} }
$alerts = dbFetchRows("SELECT * FROM `alerts` WHERE `state` IN (?) $sql",$param); $alerts = dbFetchRows("SELECT `D`.`hostname`, `A`.* FROM `alerts` AS `A`, `devices` AS `D` WHERE `D`.`device_id` = `A`.`device_id` AND `A`.`state` IN (?) $sql",$param);
$total_alerts = count($alerts); $total_alerts = count($alerts);
$output = array("status" => "ok", "err-msg" => '', "count" => $total_alerts, "alerts" => $alerts); $output = array("status" => "ok", "err-msg" => '', "count" => $total_alerts, "alerts" => $alerts);
$app->response->setStatus('200'); $app->response->setStatus('200');