#ITC-3482 Dashboards: Filter Host and Service status overview by container

Author: ibering

src/Model/Table/HostsTable.php

@@ -43,6 +43,7 @@
 use Cake\Utility\Hash;
 use Cake\Validation\Validator;
 use itnovum\openITCOCKPIT\Cache\ObjectsCache;
+use itnovum\openITCOCKPIT\Core\FileDebugger;
 use itnovum\openITCOCKPIT\Core\HostConditions;
 use itnovum\openITCOCKPIT\Core\ValueObjects\User;
 use itnovum\openITCOCKPIT\Database\PaginateOMat;
@@ -3241,7 +3242,21 @@ public function getHostIdsBySelectedStatusExtendedStatusengine3($MY_RIGHTS, $con
             $query->where([
                 'HostsToContainersSharing.container_id IN' => $MY_RIGHTS
             ]);
+            if (!empty($conditions['Container']['_ids'])) {
+                $query->where([
+                    'HostsToContainersSharing.container_id IN' => $conditions['Container']['_ids']
+                ]);
+            }
+        } else if (!empty($conditions['Container']['_ids'])) {
+            $query->innerJoin(['HostsToContainersSharing' => 'hosts_to_containers'], [
+                'HostsToContainersSharing.host_id = Hosts.id'
+            ]);
+            $containerIds = explode(',', $conditions['Container']['_ids']);
+            $query->where([
+                'HostsToContainersSharing.container_id IN' => $containerIds
+            ]);
         }
+
         $where = [];
 
         $where['Hoststatus.current_state'] = $conditions['Hoststatus']['current_state'];

src/Model/Table/ServicesTable.php

@@ -3547,6 +3547,19 @@ public function getServiceIdsBySelectedStatusExtendedStatusengine3($MY_RIGHTS, $
             $query->where([
                 'HostsToContainersSharing.container_id IN' => $MY_RIGHTS
             ]);
+            if (!empty($conditions['Container']['_ids'])) {
+                $query->where([
+                    'HostsToContainersSharing.container_id IN' => $conditions['Container']['_ids']
+                ]);
+            }
+        } else if (!empty($conditions['Container']['_ids'])) {
+            $query->innerJoin(['HostsToContainersSharing' => 'hosts_to_containers'], [
+                'HostsToContainersSharing.host_id = Hosts.id'
+            ]);
+            $containerIds = explode(',', $conditions['Container']['_ids']);
+            $query->where([
+                'HostsToContainersSharing.container_id IN' => $containerIds
+            ]);
         }
         $where = [];
 

src/itnovum/openITCOCKPIT/Core/Dashboards/HostStatusOverviewExtendedJson.php

@@ -52,6 +52,9 @@ class HostStatusOverviewExtendedJson extends DashboardJsonStandardizer {
             'state_older_than'      => null,
             'state_older_than_unit' => 'MINUTE'
         ],
+        'Container'  => [
+            '_ids' => ''
+        ],
         'Hostgroup'  => [
             '_ids' => ''
         ]
@@ -62,6 +65,14 @@ class HostStatusOverviewExtendedJson extends DashboardJsonStandardizer {
      * @return array
      */
     public function standardizedData($request = []) {
+        if (isset($request['Container']['_ids']) && is_array($request['Container']['_ids'])) {
+            $request['Container']['_ids'] = array_filter(
+                $request['Container']['_ids'], function ($value) {
+                return $value > 0;
+            });
+            // POST request to save to database
+            $request['Container']['_ids'] = implode(',', $request['Container']['_ids']);
+        }
         if (isset($request['Hostgroup']['_ids']) && is_array($request['Hostgroup']['_ids'])) {
             $request['Hostgroup']['_ids'] = array_filter(
                 $request['Hostgroup']['_ids'], function ($value) {

src/itnovum/openITCOCKPIT/Core/Dashboards/ServiceStatusOverviewExtendedJson.php

@@ -56,6 +56,9 @@ class ServiceStatusOverviewExtendedJson extends DashboardJsonStandardizer {
             'keywords'          => '',
             'not_keywords'      => ''
         ],
+        'Container'  => [
+            '_ids' => ''
+        ],
         'Servicegroup'  => [
             '_ids' => ''
         ]
@@ -66,6 +69,14 @@ class ServiceStatusOverviewExtendedJson extends DashboardJsonStandardizer {
      * @return array
      */
     public function standardizedData($request = []) {
+        if (isset($request['Container']['_ids']) && is_array($request['Container']['_ids'])) {
+            $request['Container']['_ids'] = array_filter(
+                $request['Container']['_ids'], function ($value) {
+                return $value > 0;
+            });
+            // POST request to save to database
+            $request['Container']['_ids'] = implode(',', $request['Container']['_ids']);
+        }
         if (isset($request['Servicegroup']['_ids']) && is_array($request['Servicegroup']['_ids'])) {
             $request['Servicegroup']['_ids'] = array_filter(
                 $request['Servicegroup']['_ids'], function ($value) {