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

Revert "Changes to improve testing (#9608)" (#9937)

Browse Source 
This reverts commit d1a0ccda46.
This commit is contained in:
Tony Murray
2019-03-12 00:49:14 -05:00
committed by GitHub
parent d1a0ccda46
commit eb648a1d6f
43 changed files with 266 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Models/DeviceGroup.php
View File

@@ -25,7 +25,9 @@
namespace App\Models;
use App\Util;
use DB;
use Settings;
class DeviceGroup extends BaseModel
{
@@ -114,7 +116,7 @@ class DeviceGroup extends BaseModel
return $pattern;
}
foreach (\LibreNMS\Config::get('alert.macros.group', []) as $macro => $value) {
foreach (Settings::get('alert.macros.group', []) as $macro => $value) {
$value = str_replace(['%', '&&', '||'], ['', 'AND', 'OR'], $value); // this might need something more complex
if (!str_contains($macro, ' ')) {
$pattern = str_replace('macros.'.$macro, '('.$value.')', $pattern);
@@ -256,14 +258,14 @@ class DeviceGroup extends BaseModel
*
* @param array|string $params
*/
// public function setParamsAttribute($params)
// {
// if (!Util::isJson($params)) {
// $params = json_encode($params);
// }
//
// $this->attributes['params'] = $params;
// }
public function setParamsAttribute($params)
{
if (!Util::isJson($params)) {
$params = json_encode($params);
}
$this->attributes['params'] = $params;
}
/**
* Check if the stored pattern is v1