upstream/icingaweb2-module-businessprocess
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-businessprocess.git synced 2026-02-09 22:13:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

LegacyConfigParser: Establish parent-child relationships

Browse source 
This replaces commit d1f32c5 as this is the more efficient
and proper solution.

refs #134
This commit is contained in:
Johannes Meyer 2019-02-21 08:11:59 +01:00
parent e0529ee844
commit 8465bc0bc3
2 changed files with 19 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
application/controllers/NodeController.php
View file

@ -25,15 +25,6 @@ class NodeController extends Controller
foreach ($this->storage()->listProcessNames() as $configName) {
$config = $this->storage()->loadProcess($configName);
// TODO: Fix issues with children, they do not exist unless resolved :-/
// This is a workaround:
foreach ($config->getRootNodes() as $node) {
$node->getState();
}
foreach ($config->getRootNodes() as $node) {
$node->clearState();
}
if (! $config->hasNode($name)) {
continue;
}

44
library/Businessprocess/Storage/LegacyConfigParser.php
View file

@ -298,48 +298,42 @@ class LegacyConfigParser
// New feature: $minWarn = $m[2];
$value = $m[3];
}
$cmps = preg_split('~\s*\\' . $op . '\s*~', $value, -1, PREG_SPLIT_NO_EMPTY);
$childNames = array();
$node = new BpNode((object) array(
'name' => $name,
'operator' => $op_name,
'child_names' => []
));
$node->setBpConfig($bp);
$cmps = preg_split('~\s*\\' . $op . '\s*~', $value, -1, PREG_SPLIT_NO_EMPTY);
foreach ($cmps as $val) {
if (strpos($val, ';') !== false) {
if ($bp->hasNode($val)) {
$childNames[] = $val;
continue;
}
list($host, $service) = preg_split('~;~', $val, 2);
if ($service === 'Hoststatus') {
$bp->createHost($host);
$node->addChild($bp->getNode($val));
} else {
$bp->createService($host, $service);
list($host, $service) = preg_split('~;~', $val, 2);
if ($service === 'Hoststatus') {
$node->addChild($bp->createHost($host));
} else {
$node->addChild($bp->createService($host, $service));
}
}
}
if ($val[0] === '@') {
} elseif ($val[0] === '@') {
if (strpos($val, ':') === false) {
throw new ConfigurationError(
"I'm unable to import full external configs, a node needs to be provided for '%s'",
$val
);
// TODO: this might work:
// $node = $bp->createImportedNode(substr($val, 1));
} else {
list($config, $nodeName) = preg_split('~:\s*~', substr($val, 1), 2);
$node = $bp->createImportedNode($config, $nodeName);
$node->addChild($bp->createImportedNode($config, $nodeName));
}
$val = $node->getName();
} else {
$node->addChild($bp->getNode($val));
}
$childNames[] = $val;
}
$node = new BpNode((object) array(
'name' => $name,
'operator' => $op_name,
'child_names' => $childNames
));
$node->setBpConfig($bp);
$bp->addNode($name, $node);
}