Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

fix(remote-server): export properly trap matching and hostgroups #8054

Merged
merged 2 commits into from
Nov 5, 2019
Merged

fix(remote-server): export properly trap matching and hostgroups #8054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bd37b1
fix(remote-server): export properly trap matching
kduret Oct 25, 2019
b8a14ad
do not export disabled hostgroup
kduret Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions www/class/config-generate-remote/Host.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ private function getHostGroups(array &$host)
$this->stmtHg = $this->backendInstance->db->prepare("SELECT
hostgroup_hg_id
FROM hostgroup_relation
INNER JOIN hostgroup ON hg_id = hostgroup_hg_id
kduret marked this conversation as resolved.
Show resolved Hide resolved
AND hg_activate = '1'
WHERE host_host_id = :host_id
");
}
Expand Down
3 changes: 2 additions & 1 deletion www/class/config-generate-remote/Relations/TrapsMatching.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

use \PDO;
use ConfigGenerateRemote\Abstracts\AbstractObject;
use ConfigGenerateRemote\ServiceCategory;

class TrapsMatching extends AbstractObject
{
Expand Down Expand Up @@ -106,7 +107,7 @@ public function generateObject($trapId, $trapMatchCache)
continue;
}
$this->generateObjectInFile($value, $value['tmo_id']);
serviceCategory::getInstance($this->dependencyInjector)->generateObject($value['severity_id']);
ServiceCategory::getInstance($this->dependencyInjector)->generateObject($value['severity_id']);
}
}

Expand Down