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

Enumerate AlertState (#11665)

Browse Source 
* Enumerate AlertState

* fix typo

* add missing use's

* .

* .
This commit is contained in:
SourceDoctor
2020-05-24 04:14:36 +02:00
committed by GitHub
parent b8c6769049
commit b89eb22cd5
46 changed files with 163 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/Alert.php
View File

@@ -27,6 +27,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use LibreNMS\Enum\AlertState;
class Alert extends Model
{
@@ -41,7 +42,7 @@ class Alert extends Model
*/
public function scopeActive($query)
{
return $query->where('state', '=', '1');
return $query->where('state', '=', AlertState::ACTIVE);
}
/**
@@ -51,7 +52,7 @@ class Alert extends Model
*/
public function scopeAcknowledged($query)
{
return $query->where('state', '=', '2');
return $query->where('state', '=', AlertState::ACKNOWLEDGED);
}
// ---- Define Relationships ----

3
app/Models/AlertRule.php
View File

@@ -26,6 +26,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Builder;
use LibreNMS\Enum\AlertState;
class AlertRule extends BaseModel
{
@@ -52,7 +53,7 @@ class AlertRule extends BaseModel
{
return $query->enabled()
->join('alerts', 'alerts.rule_id', 'alert_rules.id')
->whereNotIn('alerts.state', [0, 2]);
->whereNotIn('alerts.state', [AlertState::CLEAR, AlertState::ACKNOWLEDGED, AlertState::RECOVERED]);
}
/**