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

IcingaServiceSet: implement target zone for...

Browse Source 
...resolved v1 apply rules
This commit is contained in:
Thomas Gelf 2016-11-07 12:42:27 +01:00
parent 2c1f745c4e
commit 7e749da982
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/Director/IcingaConfig/IcingaConfigFile.php
View File

@ -45,6 +45,17 @@ class IcingaConfigFile
return $this; return $this;
} }
public function addContent($content)
{
if ($this->content === null) {
$this->content = $content;
} else {
$this->content .= $content;
}
$this->checksum = null;
return $this;
}
public function getObjectCount() public function getObjectCount()
{ {
return $this->cntObject; return $this->cntObject;

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

@ -133,7 +133,11 @@ class IcingaServiceSet extends IcingaObject
protected function getConfigHeaderComment(IcingaConfig $config) protected function getConfigHeaderComment(IcingaConfig $config)
{ {
if ($config->isLegacy()) { if ($config->isLegacy()) {
$comment = "## Service Set '%s'\n\n"; if ($this->get('assign_filter')) {
$comment = "## applied Service Set '%s'\n\n";
} else {
$comment = "## Service Set '%s' on this host\n\n";
}
} else { } else {
$comment = "/** Service Set '%s' **/\n\n"; $comment = "/** Service Set '%s' **/\n\n";
} }
@ -162,12 +166,6 @@ class IcingaServiceSet extends IcingaObject
// Loop over all services belonging to this set // Loop over all services belonging to this set
// generate every service with host_name host1,host2... -> not yet. And Zones? // generate every service with host_name host1,host2... -> not yet. And Zones?
$file = $config->configFile(
// TODO: zones.d?
'zones.d/' . $this->getRenderingZone($config) . '/servicesets'
);
$file->prepend($this->getConfigHeaderComment($config));
$conn = $this->getConnection(); $conn = $this->getConnection();
// Delegating this to the service would look, but this way it's faster // Delegating this to the service would look, but this way it's faster
@ -179,22 +177,41 @@ class IcingaServiceSet extends IcingaObject
$this->copyVarsToService($service); $this->copyVarsToService($service);
foreach ($hosts as $hostname) { foreach ($hosts as $hostname) {
$file = $this->legacyHostnameServicesFile($hostname, $config);
$file->addContent($this->getConfigHeaderComment($config));
$service->set('host', $hostname); $service->set('host', $hostname);
$file->addLegacyObject($service); $file->addLegacyObject($service);
} }
} }
} else { } else {
foreach ($this->getServiceObjects() as $service) { foreach ($this->getServiceObjects() as $service) {
$service->set('object_type', 'object'); $service->set('object_type', 'object');
$service->set('host_id', $this->get('host_id')); $service->set('host_id', $this->get('host_id'));
foreach ($this->vars() as $k => $var) { foreach ($this->vars() as $k => $var) {
$service->$k = $var; $service->$k = $var;
} }
$file = $this->legacyRelatedHostFile($service, $config);
$file->addContent($this->getConfigHeaderComment($config));
$file->addLegacyObject($service); $file->addLegacyObject($service);
} }
} }
} }
protected function legacyHostnameServicesFile($hostname, IcingaConfig $config)
{
return $config->configFile(
'director/' . IcingaHost::load($hostname, $this->getConnection())->getRenderingZone($config) . '/servicesets'
);
}
protected function legacyRelatedHostFile(IcingaService $service, IcingaConfig $config)
{
return $config->configFile(
'director/' . $service->getRelated('host')->getRenderingZone($config) . '/servicesets'
);
}
public function getRenderingZone(IcingaConfig $config = null) public function getRenderingZone(IcingaConfig $config = null)
{ {
if ($this->get('host_id') === null) { if ($this->get('host_id') === null) {