Add icinga state for services

Author: jrauh01

library/Kubernetes/Model/Service.php

@@ -83,6 +83,8 @@ public function getColumnDefinitions(): array
             'allocate_load_balancer_node_ports' => $this->translate('Allocated Load Balancer Node Ports'),
             'load_balancer_class'               => $this->translate('Load Balancer Class'),
             'internal_traffic_policy'           => $this->translate('Internal Traffic Policy'),
+            'icinga_state'                      => $this->translate('Icinga State'),
+            'icinga_state_reason'               => $this->translate('Icinga State Reason'),
             'yaml'                              => $this->translate('YAML'),
             'created'                           => $this->translate('Created At')
         ];
@@ -110,6 +112,8 @@ public function getColumns(): array
             'allocate_load_balancer_node_ports',
             'load_balancer_class',
             'internal_traffic_policy',
+            'icinga_state',
+            'icinga_state_reason',
             'yaml',
             'created'
         ];

library/Kubernetes/Web/ServiceDetail.php

@@ -71,7 +71,11 @@ protected function assemble(): void
                 ),
                 $this->translate('Load Balancer Class')               => $this->service->load_balancer_class ??
                     new EmptyState($this->translate('None')),
-                $this->translate('Internal Traffic Policy')           => $this->service->internal_traffic_policy
+                $this->translate('Internal Traffic Policy')           => $this->service->internal_traffic_policy,
+                $this->translate('Icinga State')                      => new DetailState($this->service->icinga_state),
+                $this->translate('Icinga State Reason')               => new IcingaStateReason(
+                    $this->service->icinga_state_reason
+                )
             ])),
             new Labels($this->service->label),
             new Annotations($this->service->annotation),

library/Kubernetes/Web/ServiceListItem.php

@@ -5,8 +5,10 @@
 namespace Icinga\Module\Kubernetes\Web;
 
 use Icinga\Module\Kubernetes\Common\BaseListItem;
+use Icinga\Module\Kubernetes\Common\DefaultListItemCaption;
 use Icinga\Module\Kubernetes\Common\DefaultListItemHeader;
 use Icinga\Module\Kubernetes\Common\DefaultListItemMain;
+use Icinga\Module\Kubernetes\Common\DefaultListItemVisual;
 use Icinga\Module\Kubernetes\Common\Links;
 use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
@@ -16,19 +18,14 @@
 use ipl\I18n\Translation;
 use ipl\Web\Widget\HorizontalKeyValue;
 use ipl\Web\Widget\Link;
-use ipl\Web\Widget\StateBall;
 
 class ServiceListItem extends BaseListItem
 {
     use Translation;
     use DefaultListItemHeader;
+    use DefaultListItemCaption;
     use DefaultListItemMain;
-
-    protected function assembleCaption(BaseHtmlElement $caption): void
-    {
-        // TODO add state reason then replace function by DefaultListItemCaption trait
-        $caption->addHtml(new Text('Placeholder for Icinga State Reason'));
-    }
+    use DefaultListItemVisual;
 
     protected function assembleFooter(BaseHtmlElement $footer): void
     {
@@ -58,9 +55,4 @@ protected function assembleTitle(BaseHtmlElement $title): void
             )
         );
     }
-
-    protected function assembleVisual(BaseHtmlElement $visual): void
-    {
-        $visual->addHtml(new StateBall('none', StateBall::SIZE_MEDIUM));
-    }
 }