diff --git a/library/Icingadb/Common/HostStates.php b/library/Icingadb/Common/HostStates.php index b3a9473e..06b92367 100644 --- a/library/Icingadb/Common/HostStates.php +++ b/library/Icingadb/Common/HostStates.php @@ -13,8 +13,6 @@ class HostStates const DOWN = 1; - const UNREACHABLE = 2; - const PENDING = 99; /** @@ -35,9 +33,6 @@ class HostStates case 'down': $int = self::DOWN; break; - case 'unreachable': - $int = self::UNREACHABLE; - break; case 'pending': $int = self::PENDING; break; @@ -66,9 +61,6 @@ class HostStates case $state === self::DOWN: $text = 'down'; break; - case $state === self::UNREACHABLE: - $text = 'unreachable'; - break; case $state === self::PENDING: $text = 'pending'; break; @@ -100,9 +92,6 @@ class HostStates case $state === self::DOWN: $text = t('down'); break; - case $state === self::UNREACHABLE: - $text = t('unreachable'); - break; case $state === self::PENDING: $text = t('pending'); break; diff --git a/library/Icingadb/Model/Hostgroupsummary.php b/library/Icingadb/Model/Hostgroupsummary.php index 6e93df56..364f64ee 100644 --- a/library/Icingadb/Model/Hostgroupsummary.php +++ b/library/Icingadb/Model/Hostgroupsummary.php @@ -71,12 +71,6 @@ class Hostgroupsummary extends UnionModel 'hosts_unreachable' => new Expression( 'SUM(CASE WHEN host_state = 2 THEN 1 ELSE 0 END)' ), - 'hosts_unreachable_handled' => new Expression( - 'SUM(CASE WHEN host_state = 2 AND host_handled = \'y\' THEN 1 ELSE 0 END)' - ), - 'hosts_unreachable_unhandled' => new Expression( - 'SUM(CASE WHEN host_state = 2 AND host_handled = \'n\' THEN 1 ELSE 0 END)' - ), 'hosts_up' => new Expression( 'SUM(CASE WHEN host_state = 0 THEN 1 ELSE 0 END)' ), diff --git a/library/Icingadb/Model/HoststateSummary.php b/library/Icingadb/Model/HoststateSummary.php index e437c198..f59de274 100644 --- a/library/Icingadb/Model/HoststateSummary.php +++ b/library/Icingadb/Model/HoststateSummary.php @@ -51,14 +51,6 @@ class HoststateSummary extends Host 'hosts_unreachable' => new Expression( 'SUM(CASE WHEN host_state.soft_state = 2 THEN 1 ELSE 0 END)' ), - 'hosts_unreachable_handled' => new Expression( - 'SUM(CASE WHEN host_state.soft_state = 2' - . ' AND host_state.is_handled = \'y\' THEN 1 ELSE 0 END)' - ), - 'hosts_unreachable_unhandled' => new Expression( - 'SUM(CASE WHEN host_state.soft_state = 2' - . ' AND host_state.is_handled = \'n\' THEN 1 ELSE 0 END)' - ), 'hosts_up' => new Expression( 'SUM(CASE WHEN host_state.soft_state = 0 THEN 1 ELSE 0 END)' ) diff --git a/library/Icingadb/Widget/HostSummaryDonut.php b/library/Icingadb/Widget/HostSummaryDonut.php index 7a677700..86d1707f 100644 --- a/library/Icingadb/Widget/HostSummaryDonut.php +++ b/library/Icingadb/Widget/HostSummaryDonut.php @@ -46,8 +46,6 @@ class HostSummaryDonut extends Card ->addSlice($this->summary->hosts_up, ['class' => 'slice-state-ok']) ->addSlice($this->summary->hosts_down_handled, ['class' => 'slice-state-critical-handled']) ->addSlice($this->summary->hosts_down_unhandled, ['class' => 'slice-state-critical']) - ->addSlice($this->summary->hosts_unreachable_handled, ['class' => 'slice-state-unreachable-handled']) - ->addSlice($this->summary->hosts_unreachable_unhandled, ['class' => 'slice-state-unreachable']) ->addSlice($this->summary->hosts_pending, ['class' => 'slice-state-pending']) ->setLabelBig($this->summary->hosts_down_unhandled) ->setLabelBigUrl(Links::hosts()->setQueryString(QueryString::render($labelBigUrlFilter))->addParams([ diff --git a/library/Icingadb/Widget/ItemTable/HostgroupGridCell.php b/library/Icingadb/Widget/ItemTable/HostgroupGridCell.php index 49b9c0fe..8d619a81 100644 --- a/library/Icingadb/Widget/ItemTable/HostgroupGridCell.php +++ b/library/Icingadb/Widget/ItemTable/HostgroupGridCell.php @@ -56,45 +56,6 @@ class HostgroupGridCell extends BaseHostGroupItem ) ] ); - } elseif ($this->item->hosts_unreachable_unhandled > 0) { - return new Link( - new StateBadge($this->item->hosts_unreachable_unhandled, 'unreachable'), - $url->addParams([ - 'state.soft_state' => 2, - 'state.is_handled' => 'n' - ]), - [ - 'title' => sprintf( - $this->translatePlural( - 'List %d host that is currently in UNREACHABLE state in host group "%s"', - 'List %d hosts which are currently in UNREACHABLE state in host group "%s"', - $this->item->hosts_unreachable_unhandled - ), - $this->item->hosts_unreachable_unhandled, - $this->item->display_name - ) - ] - ); - } elseif ($this->item->hosts_unreachable_handled > 0) { - return new Link( - new StateBadge($this->item->hosts_unreachable_handled, 'unreachable', true), - $url->addParams([ - 'state.soft_state' => 2, - 'state.is_handled' => 'y' - ]), - [ - 'title' => sprintf( - $this->translatePlural( - 'List %d host that is currently in UNREACHABLE (Acknowledged) state in host group "%s"', - 'List %d hosts which are currently in UNREACHABLE (Acknowledged) state in host group' - . ' "%s"', - $this->item->hosts_unreachable_handled - ), - $this->item->hosts_unreachable_handled, - $this->item->display_name - ) - ] - ); } elseif ($this->item->hosts_pending > 0) { return new Link( new StateBadge($this->item->hosts_pending, 'pending'),