tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-28 08:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

IcingaServiceSet: Refactor config rendering for sets

Browse Source 
* A header is now always rendered and includes assign and description
* Diff is now visible for sets
This commit is contained in:
Markus Frosch 2019-04-10 13:08:30 +02:00
parent db00f1bfc4
commit 1e5f6b4f76
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
library/Director/Objects/IcingaServiceSet.php
View File

@ -78,6 +78,12 @@ class IcingaServiceSet extends IcingaObject implements ExportInterface
*/ */
public function getServiceObjects() public function getServiceObjects()
{ {
// don't try to resolve services for unstored objects - as in getServiceObjectsForSet()
// also for diff in activity log
if ($this->get('id') === null) {
return [];
}
if ($this->get('host_id')) { if ($this->get('host_id')) {
$imports = $this->imports()->getObjects(); $imports = $this->imports()->getObjects();
if (empty($imports)) { if (empty($imports)) {
@ -280,6 +286,9 @@ class IcingaServiceSet extends IcingaObject implements ExportInterface
*/ */
public function renderToConfig(IcingaConfig $config) public function renderToConfig(IcingaConfig $config)
{ {
// always print the header, so you have minimal info present
$file = $this->getConfigFileWithHeader($config);
if ($this->get('assign_filter') === null && $this->isTemplate()) { if ($this->get('assign_filter') === null && $this->isTemplate()) {
return; return;
} }
@ -293,7 +302,6 @@ class IcingaServiceSet extends IcingaObject implements ExportInterface
if (empty($services)) { if (empty($services)) {
return; return;
} }
$file = $this->getConfigFileWithHeader($config);
// Loop over all services belonging to this set // Loop over all services belonging to this set
// add our assign rules and then add the service to the config // add our assign rules and then add the service to the config
@ -350,17 +358,38 @@ class IcingaServiceSet extends IcingaObject implements ExportInterface
protected function getConfigHeaderComment(IcingaConfig $config) protected function getConfigHeaderComment(IcingaConfig $config)
{ {
$name = $this->getObjectName();
$assign = $this->get('assign_filter');
if ($config->isLegacy()) { if ($config->isLegacy()) {
if ($this->get('assign_filter')) { if ($assign !== null) {
$comment = "## applied Service Set '%s'\n\n"; return "## applied Service Set '${name}'\n\n";
} else { } else {
$comment = "## Service Set '%s' on this host\n\n"; return "## Service Set '${name}' on this host\n\n";
} }
} else { } else {
$comment = "/** Service Set '%s' **/\n\n"; $comment = [
} "Service Set: ${name}",
];
return sprintf($comment, $this->getObjectName()); if (($host = $this->get('host')) !== null) {
$comment[] = 'on host ' . $host;
}
if (($description = $this->get('description')) !== null) {
$comment[] = '';
foreach (preg_split('~\\n~', $description) as $line) {
$comment[] = $line;
}
}
if ($assign !== null) {
$comment[] = '';
$comment[] = trim($this->renderAssign_Filter());
}
return "/**\n * " . join("\n * ", $comment) . "\n */\n\n";
}
} }
public function copyVarsToService(IcingaService $service) public function copyVarsToService(IcingaService $service)