6797 Commits

Author SHA1 Message Date
Eric Lippmann
8cbb83d630 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-05 15:29:16 +02:00
Eric Lippmann
3e29046f56 Merge branch 'bugfix/monitoring-remove-services-tab-7998'
fixes #7998
2015-06-05 15:28:39 +02:00
Eric Lippmann
11a006681b Merge branch 'master' into bugfix/monitoring-remove-services-tab-7998
Conflicts:
	application/controllers/ConfigController.php
	library/Icinga/Web/Widget/FilterEditor.php
	modules/monitoring/application/controllers/HostsController.php
2015-06-05 15:27:42 +02:00
Eric Lippmann
1d775842f9 monitoring: Restrict the service grid
refs #9009
2015-06-05 15:06:34 +02:00
Eric Lippmann
3425b71b4d monitoring: Restrict problem badges
The code should be placed somewhere else in the future.

refs #9009
2015-06-05 15:01:45 +02:00
Eric Lippmann
4dc2eb9f4a monitoring: Use soft states in the host status summary query again
refs #9009
2015-06-05 15:01:08 +02:00
Eric Lippmann
2e059a9bb7 monitoring: Use soft states in the host group summary again
refs #9009
2015-06-05 15:00:14 +02:00
Eric Lippmann
dae35b9106 monitoring: Restrict host and service groups when viewing a host or service
refs #9009
2015-06-05 14:47:01 +02:00
Eric Lippmann
5bc611f772 monitoring: Use new restriction when viewing a service
refs #9009
2015-06-05 14:44:35 +02:00
Eric Lippmann
5745790cdd monitoring: Use new restriction when viewing a host
refs #9009
2015-06-05 14:44:03 +02:00
Eric Lippmann
d830480655 monitoring: Add missing restrictable columns to host and service comments and downtimes
refs #9009
2015-06-05 14:43:38 +02:00
Eric Lippmann
80c80436cf monitoring: Support restricting service groups of a service
refs #9009
2015-06-05 14:42:49 +02:00
Eric Lippmann
bbcd6e3a2b monitoring: Support restricting host groups of a host
refs #9009
2015-06-05 14:42:11 +02:00
Eric Lippmann
c735ee799c monitoring: Remove unnecessary group call in the host downtime query
refs #9009
2015-06-05 14:41:25 +02:00
Eric Lippmann
52a0ad363f monitoring: Remove unnecessary group call in the host comment query
refs #9009
2015-06-05 14:40:17 +02:00
Eric Lippmann
f3b84b7ae8 monitoring: Restrict service summary when viewing a host or service
refs #9009
2015-06-05 14:14:22 +02:00
Eric Lippmann
b7afec8f3c monitoring: Restrict the tactical overview
refs #9009
2015-06-05 12:43:24 +02:00
Eric Lippmann
45d883dcf1 monitoring: Add restrictable filter columns to the status summary
refs #9009
2015-06-05 12:42:55 +02:00
Eric Lippmann
2b3acc99e2 monitoring: Use host and service status queries in the status summary query
refs #9009
2015-06-05 12:42:27 +02:00
Eric Lippmann
b69b47277e monitoring: Add columns the to host status query required by the tactical overview
refs #9009
2015-06-05 12:37:29 +02:00
Eric Lippmann
99b5c7b243 monitoring: Add columns the to service status query required by the tactical overview
refs #9009
2015-06-05 12:36:56 +02:00
Eric Lippmann
55921b4854 monitoring: Fix service status query regarding handled/unhandled and using distinct
refs #9009
2015-06-05 11:49:00 +02:00
Eric Lippmann
c08a98f6ac monitoring: Use grouping instead of distinct in the host status query
refs #9009
2015-06-05 11:48:33 +02:00
Eric Lippmann
c993ee63b7 monitoring: Use grouping instead of distinct in the service downtime query
refs #9009
2015-06-05 11:48:03 +02:00
Eric Lippmann
c3c1993870 monitoring: Use grouping instead of distinct in the service comment query
refs #9009
2015-06-05 11:47:39 +02:00
Eric Lippmann
2539e51549 monitoring: Use grouping instead of distinct in the host downtime query
refs #9009
2015-06-05 11:47:07 +02:00
Eric Lippmann
044027772d monitoring: Use grouping instead of distinct in the host comment query
refs #9009
2015-06-05 11:46:45 +02:00
Eric Lippmann
0719c294d8 monitoring: Use the service group summary query
refs #9009
2015-06-05 10:29:30 +02:00
Eric Lippmann
e0b117915a monitoring: Use a sub select in the service status summary
refs #9009
2015-06-05 10:28:50 +02:00
Eric Lippmann
76e2d8f5ee monitoring: Add service_last_state_change to the service status query
refs #9009
2015-06-05 10:17:54 +02:00
Eric Lippmann
3f02197891 monitoring: Remove allowCustomVars form the host status summary query
allowCustomVars is not needed on this query because all filters are passed to the underlying query.

refs #9009
2015-06-05 10:17:07 +02:00
Eric Lippmann
480becd3d6 monitoring: Fix pagination of the host group overview
refs #9009
2015-06-05 10:16:41 +02:00
Eric Lippmann
7b176261f8 monitoring: Add query for service group summaries
refs #9009
2015-06-05 10:16:17 +02:00
Eric Lippmann
82b0354704 monitoring: Support filtering the service group overview by custom variables
refs #9009
2015-06-05 09:16:28 +02:00
Eric Lippmann
1ea7335b96 monitoring: Support filtering the service group summary by service custom variables
refs #9009
2015-06-05 09:15:09 +02:00
Eric Lippmann
c299fb3ce9 monitoring: Support filtering the host group overview by service custom variables
refs #9009
2015-06-05 09:14:26 +02:00
Eric Lippmann
28b1cf5762 monitoring: Support joining the service status query by service groups
refs #9009
2015-06-05 09:13:17 +02:00
Eric Lippmann
b409609df7 monitoring: Use sub query count when joining service related tables to the host query
Fixes count problems.

refs #9009
2015-06-05 09:11:10 +02:00
Eric Lippmann
f8b49864bb monitoring: Restrict the services overview
refs #9009
2015-06-03 14:59:20 +02:00
Eric Lippmann
f479ea1da8 monitoring: Restrict the service status summary
refs #9009
2015-06-03 14:44:36 +02:00
Eric Lippmann
7ffa1b93a3 monitoring: Add service status summary data view
refs #9009
2015-06-03 14:44:16 +02:00
Eric Lippmann
fc2a50a9ff monitoring: Add missing restrictable filter columns to the host status summary data view
refs #9009
2015-06-03 14:39:43 +02:00
Eric Lippmann
f2f3fe2c07 monitoring: Add missing restrictable filter columns to the host status data view
refs #9009
2015-06-03 14:39:10 +02:00
Johannes Meyer
5dd3950594 Ldap\Connection: Disable server side sorting as it's not working
refs #9364
2015-06-03 14:24:48 +02:00
Johannes Meyer
1a0d1702c9 Ldap\Connection: Do not sort *after* the result has been limited
fixes #9352
2015-06-03 14:22:38 +02:00
Eric Lippmann
8f111406f3 monitoring: Restrict the host overview and the host status summary
refs #9009
2015-06-03 14:16:22 +02:00
Eric Lippmann
e9308e847a monitoring: Add host status summary data view
refs #9009
2015-06-03 14:15:09 +02:00
Eric Lippmann
131af8e818 monitoring: Add host status summary query
refs #9009
2015-06-03 14:14:55 +02:00
Eric Lippmann
ae78613443 lib: Add sub query mode to the DbQuery
refs #9009
2015-06-03 14:13:15 +02:00
Eric Lippmann
8e88864f4a monitoring: Fix host columns of the service status query
refs #9009
2015-06-03 12:54:51 +02:00