Additional parameters for list_alerts and list_devices API calls (#9040)

- Add filtering by severity in list_alerts.
- Added ability to filter only active devices (not ignored and not disabled) in list_devices.

DO NOT DELETE THIS TEXT

#### Please note

> Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.

- [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)

#### Testers

If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926`
This commit is contained in:
dsgagi
2018-08-28 18:44:47 +02:00
committed by Neil Lathwood
parent de2f3028da
commit 31a21ba2bc
3 changed files with 23 additions and 1 deletions

View File

@@ -318,6 +318,8 @@ function list_devices()
if ($type == 'all' || empty($type)) {
$sql = '1';
} elseif ($type == 'active') {
$sql = "`d`.`ignore`='0' AND `d`.`disabled`='0'";
} elseif ($type == 'location') {
$sql = "`d`.`location` LIKE '%".$query."%'";
} elseif ($type == 'ignored') {
@@ -1043,6 +1045,17 @@ function list_alerts()
$sql .= 'AND `A`.id=?';
}
$severity = $_GET['severity'];
if (isset($severity)) {
if (in_array($severity, ['ok', 'warning', 'critical'])) {
$param[] = $severity;
$sql .= ' AND `R`.severity=?';
}
}
$order = $_GET['order'] ?: "timestamp desc";
$sql .= ' ORDER BY A.'.$order;
$alerts = dbFetchRows($sql, $param);
api_success($alerts, 'alerts');
}