diff --git a/src/Template/Services/disabled.php b/src/Template/Services/disabled.php
index 2637b70150..29a2d61429 100755
--- a/src/Template/Services/disabled.php
+++ b/src/Template/Services/disabled.php
@@ -105,6 +105,13 @@
ng-model-options="{debounce: 500}">
+
+
@@ -123,6 +130,13 @@
ng-model-options="{debounce: 500}">
+
+
diff --git a/src/Template/Services/not_monitored.php b/src/Template/Services/not_monitored.php
index c0e5f3a5f4..200aa017a6 100755
--- a/src/Template/Services/not_monitored.php
+++ b/src/Template/Services/not_monitored.php
@@ -105,6 +105,13 @@
ng-model-options="{debounce: 500}">
+
+
@@ -123,6 +130,13 @@
ng-model-options="{debounce: 500}">
+
+
diff --git a/src/itnovum/openITCOCKPIT/Filter/ServiceFilter.php b/src/itnovum/openITCOCKPIT/Filter/ServiceFilter.php
index df4ed323ba..5c0712092f 100644
--- 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
index d72f0dd9a7..ff44f5b45a 100644
--- 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);
- });
\ No newline at end of file
+ });
diff --git a/webroot/js/scripts/controllers/Services/ServicesNotMonitoredController.js b/webroot/js/scripts/controllers/Services/ServicesNotMonitoredController.js
index 411ad54b84..8889e396fd 100644
--- 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
};