From 56fff33cb2d62e1c9c0edec2f6ddfc5fcdcdf166 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Sun, 27 Sep 2015 14:29:31 +0200 Subject: [PATCH] monitoring: Add StateBadges::STATE_DOWN* refs #5543 --- .../application/views/scripts/list/hostgroups.phtml | 4 ++-- .../library/Monitoring/Web/Widget/StateBadges.php | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml index 607bf448a..d82ada381 100644 --- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml @@ -69,7 +69,7 @@ if (! $this->compact): ?> array($hostgroup->hosts_up, $hostgroup->hostgroup_alias) ) ->add( - StateBadges::STATE_CRITICAL, + StateBadges::STATE_DOWN, array( 'host_state' => 1, 'host_acknowledged' => 0, @@ -83,7 +83,7 @@ if (! $this->compact): ?> array($hostgroup->hosts_down_unhandled, $hostgroup->hostgroup_alias) ) ->add( - StateBadges::STATE_CRITICAL_HANDLED, + StateBadges::STATE_DOWN_HANDLED, array( 'host_state' => 1, 'host_handled' => 1, diff --git a/modules/monitoring/library/Monitoring/Web/Widget/StateBadges.php b/modules/monitoring/library/Monitoring/Web/Widget/StateBadges.php index 3c4bcc0b0..46cb78fac 100644 --- a/modules/monitoring/library/Monitoring/Web/Widget/StateBadges.php +++ b/modules/monitoring/library/Monitoring/Web/Widget/StateBadges.php @@ -17,6 +17,10 @@ class StateBadges extends AbstractWidget const STATE_CRITICAL_HANDLED = 'state-critical-handled'; + const STATE_DOWN = 'state-down'; + + const STATE_DOWN_HANDLED = 'state-down-handled'; + const STATE_OK = 'state-ok'; const STATE_PENDING = 'state-pending'; @@ -124,12 +128,19 @@ class StateBadges extends AbstractWidget array(static::STATE_CRITICAL, static::STATE_CRITICAL_HANDLED), $badges ) + ->createBadgeGroup( + array(static::STATE_DOWN, static::STATE_DOWN_HANDLED), + $badges + ) ->createBadgeGroup( array(static::STATE_UNREACHABLE, static::STATE_UNREACHABLE_HANDLED), $badges ) ->createBadge(static::STATE_UNKNOWN, $badges) ->createBadge(static::STATE_PENDING, $badges); - return $badges->getRenderer()->setCssClass(static::CSS_CLASS)->render(); + return $badges + ->getRenderer() + ->setCssClass(static::CSS_CLASS) + ->render(); } }