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

Fix that imported nodes have no state, once and for all

Browse source
This commit is contained in:
Johannes Meyer 2019-02-07 12:04:55 +01:00
parent aa8f070a00
commit a681d7e393
2 changed files with 40 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
library/Businessprocess/BpConfig.php
View file

@ -89,10 +89,17 @@ class BpConfig
*/
protected $root_nodes = array();
/**
* Imported nodes
*
* @var ImportedNode[]
*/
protected $importedNodes = [];
/**
* Imported configs
*
* @var array
* @var BpConfig[]
*/
protected $importedConfigs = [];
@ -437,21 +444,10 @@ class BpConfig
return $this->nodes;
}
public function hasNode($name, &$usedConfigs = null)
public function hasNode($name)
{
if (array_key_exists($name, $this->nodes)) {
return true;
} elseif (! empty($this->importedConfigs)) {
$usedConfigs[$this->getName()] = true;
foreach ($this->importedConfigs as $config) {
if (isset($usedConfigs[$config->getName()])) {
continue;
}
if ($config->hasNode($name, $usedConfigs)) {
return true;
}
}
}
return false;
@ -506,14 +502,14 @@ class BpConfig
public function listInvolvedHostNames(&$usedConfigs = null)
{
$hosts = $this->hosts;
if (! empty($this->importedConfigs)) {
if (! empty($this->importedNodes)) {
$usedConfigs[$this->getName()] = true;
foreach ($this->importedConfigs as $config) {
if (isset($usedConfigs[$config->getName()])) {
foreach ($this->importedNodes as $node) {
if (isset($usedConfigs[$node->getConfigName()])) {
continue;
}
$hosts += array_flip($config->listInvolvedHostNames($usedConfigs));
$hosts += array_flip($node->getBpConfig()->listInvolvedHostNames($usedConfigs));
}
}
@ -564,6 +560,7 @@ class BpConfig
}
$node = new ImportedNode($this, $params);
$this->importedNodes[$node->getName()] = $node;
$this->nodes[$node->getName()] = $node;
return $node;
}
@ -585,6 +582,22 @@ class BpConfig
return $this->importedConfigs[$name];
}
public function listInvolvedConfigs(&$usedConfigs = null)
{
$configs = [];
foreach ($this->importedNodes as $node) {
$config = $node->getBpConfig();
$configs[] = $config;
if (! isset($usedConfigs[$node->getConfigName()])) {
$usedConfigs[$config->getName()] = true;
$configs = array_merge($configs, $config->listInvolvedConfigs($usedConfigs));
}
}
return $configs;
}
/**
* @return LegacyStorage
*/
@ -601,11 +614,10 @@ class BpConfig
/**
* @param string $name
* @param array $usedConfigs
* @return Node
* @throws Exception
*/
public function getNode($name, &$usedConfigs = null)
public function getNode($name)
{
if ($name === '__unbound__') {
return $this->getUnboundBaseNode();
@ -613,17 +625,6 @@ class BpConfig
if (array_key_exists($name, $this->nodes)) {
return $this->nodes[$name];
} elseif (! empty($this->importedConfigs)) {
$usedConfigs[$this->getName()] = true;
foreach ($this->importedConfigs as $config) {
if (isset($usedConfigs[$config->getName()])) {
continue;
}
if ($config->hasNode($name, $usedConfigs)) {
return $config->getNode($name, $usedConfigs);
}
}
}
// Fallback: if it is a service, create an empty one:

14
library/Businessprocess/State/MonitoringState.php
View file

@ -93,13 +93,17 @@ class MonitoringState
Benchmark::measure('Retrieved states for ' . count($serviceStatus) . ' services in ' . $config->getName());
foreach ($serviceStatus as $row) {
$this->handleDbRow($row, $config);
$configs = $config->listInvolvedConfigs();
$configs[] = $config;
foreach ($configs as $cfg) {
foreach ($serviceStatus as $row) {
$this->handleDbRow($row, $cfg);
}
foreach ($hostStatus as $row) {
$this->handleDbRow($row, $cfg);
}
}
foreach ($hostStatus as $row) {
$this->handleDbRow($row, $config);
}
// TODO: Union, single query?
Benchmark::measure('Got states for business process ' . $config->getName());