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

Severity Enum (#14620)

Browse Source 
* Severity Enum
Replace old Alert constants

* Fix whitespace

* Additional uses

* style fixes

* Fix test too

* More missed locations

* More
This commit is contained in:
Tony Murray
2023-08-05 12:12:36 -05:00
committed by GitHub
parent 9382959c8c
commit d1b7004fef
172 changed files with 591 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/AlertController.php
View File

@@ -6,6 +6,7 @@ use App\Models\Alert;
use App\Models\Eventlog;
use Illuminate\Http\Request;
use LibreNMS\Config;
use LibreNMS\Enum\Severity;
class AlertController extends Controller
{
@@ -41,7 +42,7 @@ class AlertController extends Controller
if ($alert->save()) {
if (in_array($state, [2, 22])) {
$rule_name = $alert->rule->name;
Eventlog::log("$username acknowledged alert $rule_name note: $ack_msg", $alert->device_id, 'alert', 2, $alert->id);
Eventlog::log("$username acknowledged alert $rule_name note: $ack_msg", $alert->device_id, 'alert', Severity::Info, $alert->id);
}
return response()->json([

28
app/Http/Controllers/Table/EventlogController.php
View File

@@ -28,7 +28,7 @@ namespace App\Http\Controllers\Table;
use App\Models\Eventlog;
use Carbon\Carbon;
use LibreNMS\Config;
use LibreNMS\Enum\Alert;
use LibreNMS\Enum\Severity;
use LibreNMS\Util\Url;
class EventlogController extends TableController
@@ -124,26 +124,18 @@ class EventlogController extends TableController
}
/**
* @param int $eventlog_severity
* @param Severity $eventlog_severity
* @return string $eventlog_severity_icon
*/
private function severityLabel($eventlog_severity)
{
switch ($eventlog_severity) {
case Alert::OK:
return 'label-success'; //OK
case Alert::INFO:
return 'label-info'; //Informational
case Alert::NOTICE:
return 'label-primary'; //Notice
case Alert::WARNING:
return 'label-warning'; //Warning
case Alert::ERROR:
return 'label-danger'; //Critical
default:
return 'label-default'; //Unknown
}
return match ($eventlog_severity) {
Severity::Ok => 'label-success',
Severity::Info => 'label-info',
Severity::Notice => 'label-primary',
Severity::Warning => 'label-warning',
Severity::Error => 'label-danger',
default => 'label-default', // Unknown
};
}
// end eventlog_severity
}