ITC-2993 Add option to enable/disable search by regex to services act…

…ions
Skywalker-11 · May 4, 2023 · b5163df · b5163df
1 parent f40ccec
commit b5163df
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 9 deletions.
diff --git a/src/Template/Services/disabled.php b/src/Template/Services/disabled.php
@@ -105,6 +105,13 @@
                                                    ng-model-options="{debounce: 500}">
                                             <div class="input-group-append">
                                                 <span class="input-group-text pt-0 pb-0">
+                                                       <label>
+                                                            <?= __('Enable RegEx'); ?>
+                                                            &nbsp;
+                                                            <input type="checkbox"
+                                                                   ng-model="filter.Hosts.name_regex">
+                                                        </label>
+                                                        &nbsp;
                                                     <regex-helper-tooltip></regex-helper-tooltip>
                                                 </span>
                                             </div>
@@ -123,6 +130,13 @@
                                                    ng-model-options="{debounce: 500}">
                                             <div class="input-group-append">
                                                 <span class="input-group-text pt-0 pb-0">
+                                                       <label>
+                                                            <?= __('Enable RegEx'); ?>
+                                                            &nbsp;
+                                                            <input type="checkbox"
+                                                                   ng-model="filter.Services.name_regex">
+                                                        </label>
+                                                        &nbsp;
                                                     <regex-helper-tooltip></regex-helper-tooltip>
                                                 </span>
                                             </div>

diff --git a/src/Template/Services/not_monitored.php b/src/Template/Services/not_monitored.php
@@ -105,6 +105,13 @@
                                                    ng-model-options="{debounce: 500}">
                                             <div class="input-group-append">
                                                 <span class="input-group-text pt-0 pb-0">
+                                                     <label>
+                                                            <?= __('Enable RegEx'); ?>
+                                                            &nbsp;
+                                                            <input type="checkbox"
+                                                                   ng-model="filter.Hosts.name_regex">
+                                                        </label>
+                                                        &nbsp;
                                                     <regex-helper-tooltip></regex-helper-tooltip>
                                                 </span>
                                             </div>
@@ -123,6 +130,13 @@
                                                    ng-model-options="{debounce: 500}">
                                             <div class="input-group-append">
                                                 <span class="input-group-text pt-0 pb-0">
+                                                     <label>
+                                                            <?= __('Enable RegEx'); ?>
+                                                            &nbsp;
+                                                            <input type="checkbox"
+                                                                   ng-model="filter.Services.name_regex">
+                                                        </label>
+                                                        &nbsp;
                                                     <regex-helper-tooltip></regex-helper-tooltip>
                                                 </span>
                                             </div>

diff --git a/src/itnovum/openITCOCKPIT/Filter/ServiceFilter.php b/src/itnovum/openITCOCKPIT/Filter/ServiceFilter.php
@@ -80,11 +80,11 @@ public function indexFilter() {
      */
     public function notMonitoredFilter() {
         $filters = [
-            'rlike'  => [
+            'like_or_rlike' => [
                 'Hosts.name',
                 'servicename',
             ],
-            'equals' => [
+            'equals'        => [
                 'Hosts.id',
                 'Services.uuid'
             ]

diff --git a/webroot/js/scripts/controllers/Services/ServicesDisabledController.js b/webroot/js/scripts/controllers/Services/ServicesDisabledController.js
@@ -17,10 +17,12 @@ angular.module('openITCOCKPIT')
         var defaultFilter = function(){
             $scope.filter = {
                 Hosts: {
-                    name: ''
+                    name: '',
+                    name_regex: false
                 },
                 Services: {
-                    name: ''
+                    name: '',
+                    name_regex: false
                 }
             };
         };
@@ -77,7 +79,9 @@ angular.module('openITCOCKPIT')
                 'page': $scope.currentPage,
                 'direction': SortService.getDirection(),
                 'filter[Hosts.name]': $scope.filter.Hosts.name,
-                'filter[servicename]': $scope.filter.Services.name
+                'filter[Hosts.name_regex]': $scope.filter.Hosts.name_regex,
+                'filter[servicename]': $scope.filter.Services.name,
+                'filter[servicename_regex]': $scope.filter.Services.name_regex
             };
 
 
@@ -171,4 +175,4 @@ angular.module('openITCOCKPIT')
             $scope.selectedElements = MassChangeService.getCount();
         }, true);
 
-    });
+    });
diff --git a/webroot/js/scripts/controllers/Services/ServicesNotMonitoredController.js b/webroot/js/scripts/controllers/Services/ServicesNotMonitoredController.js
@@ -19,10 +19,12 @@ angular.module('openITCOCKPIT')
         var defaultFilter = function(){
             $scope.filter = {
                 Hosts: {
-                    name: ''
+                    name: '',
+                    name_regex: false
                 },
                 Services: {
-                    name: ''
+                    name: '',
+                    name_regex: ''
                 }
             };
         };
@@ -45,7 +47,9 @@ angular.module('openITCOCKPIT')
                 'page': $scope.currentPage,
                 'direction': SortService.getDirection(),
                 'filter[Hosts.name]': $scope.filter.Hosts.name,
-                'filter[servicename]': $scope.filter.Services.name
+                'filter[Hosts.name_regex]': $scope.filter.Hosts.name_regex,
+                'filter[servicename]': $scope.filter.Services.name,
+                'filter[servicename_regex]': $scope.filter.Services.name_regex
             };