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

menu: Only count the worst states in badges

Browse source 
fixes #365
This commit is contained in:
Johannes Meyer 2025-07-01 14:34:19 +02:00
parent a6033491f4
commit cda66ca82e
2 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
library/Businessprocess/Web/Navigation/Renderer/ProcessProblemsBadge.php
View file

@ -10,6 +10,19 @@ use Throwable;
class ProcessProblemsBadge extends BadgeNavigationItemRenderer
{
/**
* Icinga state to badge state mapping
*
* @var array<int, string>
*/
public const NODE_STATE_TO_BADGE_STATE = [
Node::ICINGA_OK => self::STATE_OK,
Node::ICINGA_WARNING => self::STATE_WARNING,
Node::ICINGA_CRITICAL => self::STATE_CRITICAL,
Node::ICINGA_UNKNOWN => self::STATE_UNKNOWN,
Node::ICINGA_PENDING => self::STATE_PENDING
];
/**
* Cached count
*
@ -24,6 +37,7 @@ class ProcessProblemsBadge extends BadgeNavigationItemRenderer
{
if ($this->count === null) {
$count = 0;
$state = Node::ICINGA_OK;
try {
$storage = LegacyStorage::getInstance();
@ -33,9 +47,16 @@ class ProcessProblemsBadge extends BadgeNavigationItemRenderer
// Probably, but it is how it is for a very long time. So it is unlikely to change. (Finger crossed.)
$bp = $storage->loadProcess($this->getBpConfigName());
foreach ($bp->getRootNodes() as $rootNode) {
$nodeState = $rootNode->getState();
if (! $rootNode->isEmpty() &&
! in_array($rootNode->getState(), [Node::ICINGA_OK, Node::ICINGA_PENDING], true)) {
$count++;
! in_array($nodeState, [Node::ICINGA_OK, Node::ICINGA_PENDING], true)
) {
if ($nodeState === $state) {
$count++;
} elseif ($nodeState > $state) {
$count = 1;
$state = $nodeState;
}
}
}
} catch (Throwable $e) {
@ -44,9 +65,9 @@ class ProcessProblemsBadge extends BadgeNavigationItemRenderer
$this->count = $count;
$this->setState(self::STATE_CRITICAL);
$this->setState(self::NODE_STATE_TO_BADGE_STATE[$state] ?? self::STATE_UNKNOWN);
$this->setTitle(sprintf(
tp('One unhandled root node critical', '%d unhandled root nodes critical', $count),
tp('One unhandled root node', '%d unhandled root nodes', $count),
$count
));
}

15
library/Businessprocess/Web/Navigation/Renderer/ProcessesProblemsBadge.php
View file

@ -25,6 +25,7 @@ class ProcessesProblemsBadge extends BadgeNavigationItemRenderer
{
if ($this->count === null) {
$count = 0;
$state = Node::ICINGA_OK;
try {
$storage = LegacyStorage::getInstance();
@ -40,9 +41,17 @@ class ProcessesProblemsBadge extends BadgeNavigationItemRenderer
}
foreach ($bp->getRootNodes() as $rootNode) {
$nodeState = $rootNode->getState();
if (! $rootNode->isEmpty() &&
! in_array($rootNode->getState(), [Node::ICINGA_OK, Node::ICINGA_PENDING], true)) {
$count++;
! in_array($nodeState, [Node::ICINGA_OK, Node::ICINGA_PENDING], true)
) {
if ($nodeState === $state) {
$count++;
} elseif ($nodeState > $state) {
$count = 1;
$state = $nodeState;
}
break;
}
}
@ -52,7 +61,7 @@ class ProcessesProblemsBadge extends BadgeNavigationItemRenderer
}
$this->count = $count;
$this->setState(self::STATE_CRITICAL);
$this->setState(ProcessProblemsBadge::NODE_STATE_TO_BADGE_STATE[$state] ?? self::STATE_UNKNOWN);
}
return $this->count;