Skip to content

Commit

Permalink
Refactor fetching v1 attributes from parent template tree.
Browse files Browse the repository at this point in the history 
Refs #5929
  • Loading branch information
Michael Friedrich committed May 23, 2014
1 parent 8e0d634 commit ac733a6
Show file tree
Hide file tree
Showing 5 changed files with 146 additions and 74 deletions.
187 changes: 117 additions & 70 deletions modules/conftool/library/Conftool/Icinga/IcingaConfig.php
View file
Expand Up @@ -6,13 +6,15 @@ class IcingaConfig
{
protected $base_config;
protected $config_file;
protected $definition_files = array();

protected $allDefinitions = array();
protected $templates = array();

protected $definition_files = array();
protected $definitions = array();
protected $host_index = array();
protected $group_members = array();
protected $host_groups = array();
protected $all_services = array();

public function __construct($file)
{
Expand Down Expand Up @@ -143,6 +145,8 @@ public function refresh()
$this->discoverDefinitionFiles($dir);
}
$this->parseDefinitionFiles();
$this->resolveParents();
$this->createDefinitionIndexes();
$this->resolveServices();
}

Expand All @@ -157,11 +161,11 @@ public function parseDefinitionFiles()
));
}
$content = file_get_contents($file);
$this->parseDefinitions($content);
$this->parseDefinitions($content, $file);
}
}

public function parseDefinitions($content)
public function parseDefinitions($content, $file)
{
$content = preg_replace('~^\s*[\#\;].*$~m', '', $content);
$content = preg_replace('~([^\\\])\;.*$~m', '$1', $content);
Expand All @@ -183,7 +187,7 @@ public function parseDefinitions($content)
} elseif (preg_match('~^\s*define\s+([a-z]+)\s*$~', $line, $match)) {
$buffer .= $line;
} else {
throw new IcingaConfigException(sprintf('Cannot parse config file line: "%s"', $line));
throw new IcingaConfigException(sprintf('Cannot parse config line: "%s" in file "%s"', $line, $file));
}
continue;
}
Expand All @@ -194,7 +198,7 @@ public function parseDefinitions($content)
$kv = preg_split('~\s+~', $line, 2, PREG_SPLIT_NO_EMPTY);
if (! empty($kv)) {
if (! isset($kv[1])) {
// Skip illegal lines
// Skip illegal lines. TODO: Shall we show a notice?
continue;
}
$vals->$kv[0] = rtrim($kv[1]);
Expand All @@ -208,22 +212,17 @@ public function parseDefinitions($content)
if ($current_type == 'serviceescalation') continue;
if ($current_type == 'hostextinfo') continue;
if ($current_type == 'serviceextinfo') continue;

$def = IcingaObjectDefinition::factory($current_type, $vals);
$def->validate();
if ($def instanceof IcingaTemplate) {
$this->addTemplate($def);
} elseif ($def instanceof IcingaService) {
$this->addService($def);
} else {
$this->addDefinition($def);
}
if ($current_type == 'hostdependency') continue;
if ($current_type == 'servicedependency') continue;
$this->addDefinition(
IcingaObjectDefinition::factory($current_type, $vals)
);
}
}

protected function splitComma($string)
{
return preg_split('/,\s*/', $string, null, PREG_SPLIT_NO_EMPTY);
return preg_split('/\s*,\s*/', $string, null, PREG_SPLIT_NO_EMPTY);
}

protected function addHostGroupMapping($host, $group)
Expand Down Expand Up @@ -273,6 +272,42 @@ public function hostHasGroup($host, $group)

public function addDefinition(IcingaObjectDefinition $definition)
{
$this->allDefinitions[] = $definition;
if ($definition->isTemplate()) {
$this->templates[(string) $definition] = $definition;
}
return $this;
}

protected function resolveParents()
{
foreach ($this->allDefinitions as $definition) {
if (! $definition->use) { return; }
$uses = $this->splitComma($definition->use);
foreach ($uses as $use) {
if (! array_key_exists($use, $this->templates)) {
throw new IcingaDefinitionException(
sprintf('Object inherits from unknown template "%s"', $use) . print_r($definition)
);
}
$definition->addParent($this->templates[$use]);
}
}
}

protected function createDefinitionIndexes()
{
foreach ($this->allDefinitions as $definition) {
$this->createDefinitionIndex($definition);
}
}

protected function createDefinitionIndex($definition)
{
if ($definition instanceof IcingaService) {
return;
}

$id = (string) $definition;

$type = $definition->getDefinitionType();
Expand All @@ -283,75 +318,87 @@ public function addDefinition(IcingaObjectDefinition $definition)
));
}
$this->definitions[$type][$id] = $definition;
if (! $definition->isTemplate()) {
if ($definition instanceof IcingaHostgroup) {
$members = $this->splitComma($definition->members);
foreach ($members as $member) {
$this->addHostGroupMapping($member, (string) $definition);
}

if ($definition->isTemplate()) {
return;
}

if ($definition instanceof IcingaHostgroup) {
$members = $this->splitComma($definition->members);
foreach ($members as $member) {
$this->addHostGroupMapping($member, (string) $definition);
}
if ($definition instanceof IcingaHost) {
if ($definition->hostgroups) {
$members = $this->splitComma($definition->hostgroups);
foreach ($members as $member) {
$this->addHostGroupMapping((string) $definition, $member);
}
}
if ($definition instanceof IcingaHost) {
if ($definition->hostgroups) {
$members = $this->splitComma($definition->hostgroups);
foreach ($members as $member) {
$this->addHostGroupMapping((string) $definition, $member);
}
$this->host_index[strtolower($definition->address)] = $id;
$this->host_index[strtolower($definition->host_name)] = $id;
$this->host_index[strtolower($definition->alias)] = $id;
}
$this->host_index[strtolower($definition->address)] = $id;
$this->host_index[strtolower($definition->host_name)] = $id;
$this->host_index[strtolower($definition->alias)] = $id;
}
}

// Still EXPERIMENTAL and UGLY:
protected function addService(IcingaService $service)
protected function resolveServices()
{
$this->all_services[] = $service;
foreach ($this->allDefinitions as $definition) {
if ($definition instanceof IcingaService) {
$this->resolveService($definition);
return;
}
}
}

protected function resolveServices()
protected function resolveService(IcingaService $service)
{
foreach ($this->all_services as $service) {
// $this->addDefinition($service); -> kein __toString...
$hostgroups = $service->hostgroup_name
? $this->splitComma($service->hostgroup_name)
: array();
$hosts = $service->host_name
? $this->splitComma($service->host_name)
: array();
if (empty($hosts) && empty($hostgroups) && $service->isTemplate()) {
continue;
}
if ($service->isTemplate()) {
return;
}

$assigned = false;
foreach (array_unique($hosts) as $host) {
if (isset($this->definitions['host'][$host])) {
$assigned = true;
if (! $this->definitions['host'][$host]->hasService($service)) {
$this->definitions['host'][$host]->addService($service);
}
} elseif (substr($host, 0, 1) === '!' && isset($this->definitions['host'][substr($host, 1)])) {
$assigned = true;
$host = substr($host, 1);
if (! $this->definitions['host'][$host]->hasBlacklistedService($service)) {
$this->definitions['host'][$host]->blacklistService($service);
}
} else {
printf('Cannot assign service "%s" to host "%s"', $service, $host);
$hostgroups = $service->hostgroup_name
? $this->splitComma($service->hostgroup_name)
: array();
$hosts = $service->host_name
? $this->splitComma($service->host_name)
: array();
if (empty($hosts) && empty($hostgroups) && $service->isTemplate()) {
continue;
}

$assigned = false;
foreach (array_unique($hosts) as $host) {
if (isset($this->definitions['host'][$host])) {
$assigned = true;
if (! $this->definitions['host'][$host]->hasService($service)) {
$this->definitions['host'][$host]->addService($service);
}
} elseif (substr($host, 0, 1) === '!' && isset($this->definitions['host'][substr($host, 1)])) {
$assigned = true;
$host = substr($host, 1);
if (! $this->definitions['host'][$host]->hasBlacklistedService($service)) {
$this->definitions['host'][$host]->blacklistService($service);
}
} else {
printf('Cannot assign service "%s" to host "%s"', $service, $host);
}
foreach (array_unique($hostgroups) as $hostgroup) {
if (isset($this->definitions['hostgroup'][$hostgroup])) {
$assigned = true;
}
foreach (array_unique($hostgroups) as $hostgroup) {
if (isset($this->definitions['hostgroup'][$hostgroup])) {
$assigned = true;
try {
$this->definitions['hostgroup'][$hostgroup]->addService($service);
} else {
printf('Cannot assign service "%s" to hostgroup "%s"', $service, $hostgroup);
} catch (Exception $e) {
echo 'Exception: ', $e->getMessage(), ' for hostgroup ', $hostgroup, '\n';
}
} else {
printf('Cannot assign service "%s" to hostgroup "%s"', $service, $hostgroup);
}
if (! $assigned) {
echo 'Unassigned service: ' . print_r($service, 1);
}
}
if (! $assigned) {
echo 'Unassigned service: ' . print_r($service, 1);
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/conftool/library/Conftool/Icinga/IcingaHostdependency.php
View file
Expand Up @@ -4,6 +4,6 @@

class IcingaHostDependency extends IcingaObjectDefinition
{
// protected $key = ??;
//protected $key = ''; //dummy
}

27 changes: 26 additions & 1 deletion modules/conftool/library/Conftool/Icinga/IcingaObjectDefinition.php
View file
Expand Up @@ -6,6 +6,7 @@ abstract class IcingaObjectDefinition
{
protected $key = 'name';
protected $props;
protected $_parents = array();
protected $is_template = false;
protected $type;

Expand Down Expand Up @@ -108,10 +109,18 @@ public function __toString()
} elseif ($this->{$this->key}) {
return $this->{$this->key};
} else {
echo "FOOBAR: no key found. but template.";
return null; // Will fail badly
}
} else {
return $this->{$this->key};
if ($this->{$this->key}) {
return $this->{$this->key};
} elseif ($this->name) {
return $this->name;
} else {
echo "no template: no key/name found.";
return null; // Will fail badly
}
}
}

Expand Down Expand Up @@ -142,10 +151,26 @@ public function __get($key)
if (isset($this->props->$key)) {
return $this->props->$key;
} else {
foreach ($this->_parents as $parent) {
if ($parent->$key !== null) {
return $parent->$key;
}
}
return null;
}
}

public function addParent(IcingaTemplate $parent)
{
$this->_parents[] = $parent;
return $this;
}

public function getParents()
{
return $this->_parents;
}

public function validate()
{
if (! $this->isTemplate()) {
Expand Down
2 changes: 1 addition & 1 deletion modules/conftool/library/Conftool/Icinga/IcingaServicedependency.php
View file
Expand Up @@ -4,6 +4,6 @@

class IcingaServiceDependency extends IcingaObjectDefinition
{
// protected $key = ??;
//protected $key = ''; //dummy
}

2 changes: 1 addition & 1 deletion modules/conftool/library/Conftool/Icinga/IcingaServiceescalation.php
View file
Expand Up @@ -4,6 +4,6 @@

class IcingaServiceescalation extends IcingaObjectDefinition
{
// protected $key = ??;
protected $key = 'first_notification'; //dummy
}

0 comments on commit ac733a6

Please sign in to comment.