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 for API services bug #6894 (#6895)

Browse Source 
* Fixed an issue with the output including all services from a host that had a single matched service  regardless of whether they matched the filter.

* Cleaned up some bits

* Updated based on murrants suggestions

* A couple small cleanups
This commit is contained in:
Dubby85
2017-06-28 01:00:46 -05:00
committed by Tony Murray
parent b8d8d79a0a
commit 0fd7f3f5ed
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/api_functions.inc.php
+23 -25
View File
@@ -1502,6 +1502,7 @@ function list_arp()
$app->response->headers->set('Content-Type', 'application/json');
echo _json_encode($output);
}
function list_services()
{
global $config;
@@ -1510,16 +1511,16 @@ function list_services()
$status = 'ok';
$code = 200;
$message = '';
$host_par = array();
$sql_param = array();
$services = array();
$where = '';
$devicewhere = '';
$where = array();
$params = array();
// Filter BY STATE
// Filter by State
if (isset($_GET['state'])) {
$where = " AND S.service_status= ? AND S.service_disabled='0' AND S.service_ignore='0'";
$host_par[] = $_GET['state'];
$where[] = '`service_status`=?';
$params[] = $_GET['state'];
$where[] = "`service_disabled`='0'";
$where[] = "`service_ignore`='0'";
if (!is_numeric($_GET['state'])) {
$status = 'error';
@@ -1527,13 +1528,18 @@ function list_services()
}
}
// GET BY HOST
//Filter by Type
if (isset($_GET['type'])) {
$where[] = '`service_type` LIKE ?';
$params[] = $_GET['type'];
}
//GET by Host
if (isset($router['hostname'])) {
$hostname = $router['hostname'];
$device_id = ctype_digit($hostname) ? $hostname : getidbyname($hostname);
$where .= " AND S.device_id = ?";
$host_par[] = $device_id;
$where[] = '`device_id` = ?';
$params[] = $device_id;
if (!is_numeric($device_id)) {
$status = 'error';
@@ -1541,22 +1547,14 @@ function list_services()
}
}
// DEVICE
$host_sql = 'SELECT * FROM devices AS D, services AS S WHERE D.device_id = S.device_id '.$where.' GROUP BY D.hostname ORDER BY D.hostname';
$query = 'SELECT * FROM `services`';
// SERVICE
foreach (dbFetchRows($host_sql, $host_par) as $device) {
$device_id = $device['device_id'];
$sql_param[0] = $device_id;
// FILTER BY TYPE
if (isset($_GET['type'])) {
$devicewhere = " AND `service_type` LIKE ?";
$sql_param[1] = $_GET['type'];
}
$services[] = dbFetchRows("SELECT * FROM `services` WHERE `device_id` = ?".$devicewhere, $sql_param);
if (!empty($where)) {
$query .= ' WHERE ' . implode(' AND ', $where);
}
$query .= ' ORDER BY `service_ip`';
$services = array(dbFetchRows($query, $params)); // double array for backwards compat :(
$count = count($services);
$output = array(
'status' => $status,