Commit Graph

3333 Commits

Author SHA1 Message Date
Eric Lippmann 1eed806edf monitoring: Optimize imports in the AlertsummaryController 2015-08-27 15:18:57 +02:00
Eric Lippmann 4070f6c75b Merge branch 'master' into feature/namespaced-controllers-5786 2015-08-27 15:05:44 +02:00
Eric Lippmann 31cb1ceb93 doc: Fix PHPDoc of IcingawebController::getPath() 2015-08-27 14:40:49 +02:00
Eric Lippmann 7ea559e6be doc: Namespace the IcingawebController
refs #5786
2015-08-27 14:40:10 +02:00
Eric Lippmann 2f1d6d7a95 doc: Add PHPDoc to IndexController 2015-08-27 14:40:10 +02:00
Eric Lippmann 77b9881a38 doc: Namespace IndexController
refs #5786
2015-08-27 14:40:02 +02:00
Eric Lippmann 26c403832e doc: Namespace the ModuleController
refs #5786
2015-08-27 14:36:26 +02:00
Eric Lippmann 66e50ad341 doc: Remove unused alias in the ModuleController
Thanks for not reviewing commits!
2015-08-27 14:35:26 +02:00
Eric Lippmann ad389d1696 doc: Fix PHPDoc of SearchController::getWebPath() 2015-08-27 14:24:25 +02:00
Eric Lippmann f0f24bee94 doc: Namespace the SearchController
refs #5786
2015-08-27 14:23:35 +02:00
Eric Lippmann 8981f2cc26 doc: Optimize imports in the SearchController 2015-08-27 14:22:59 +02:00
Eric Lippmann 5fadb647e2 doc: Namespace the StyleController
refs #5786
2015-08-27 14:22:35 +02:00
Eric Lippmann ee7e0e80d2 setup: Namespace the IndexController
refs #5786
2015-08-27 14:21:29 +02:00
Eric Lippmann 1888f1a0a4 setup: Optimize imports in the IndexController 2015-08-27 14:20:53 +02:00
Eric Lippmann c294283636 Merge branch 'bugfix/service-grid-grouping-postgres-9333'
Conflicts:
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php

fixes #9333
fixes #9538
2015-08-27 12:58:49 +02:00
Eric Lippmann f35aec1c5c monitoring: Fix default select columns of the instance query 2015-08-27 11:54:20 +02:00
Johannes Meyer 66570c95e0 monitoring: Ensure to ask subqueries whether to allow custom vars
fixes #9998
2015-08-27 08:53:46 +02:00
Johannes Meyer 1317a6eaf8 Show an object's instance only if there are multiple instances
refs #9945
2015-08-26 10:55:18 +02:00
Johannes Meyer ffcd33ee7e Introduce query InstanceQuery
refs #9945
2015-08-26 10:54:42 +02:00
Johannes Meyer 241f73f229 Show the instance's name of a host or service in the detail view
refs #9945
2015-08-26 10:54:01 +02:00
Johannes Meyer 592a79cd93 Service: Fetch the name of the instance the service belongs to
refs #9945
2015-08-26 10:52:56 +02:00
Johannes Meyer 8a1114bf65 Host: Fetch the name of the instance the host belongs to
refs #9945
2015-08-26 10:52:28 +02:00
Johannes Meyer 91315738c8 monitoring: Allow `instance_name' as restriction column
refs #9934
2015-08-25 16:39:40 +02:00
Johannes Meyer 819d20f17a Hostservice...Query: Add query column `instance_name'
refs #9943
2015-08-25 16:38:54 +02:00
Johannes Meyer 94693fe3e7 DataView\*summary: Add query column `instance_name'
refs #9943
2015-08-25 16:38:23 +02:00
Johannes Meyer 6906ea89b7 *historyQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:37:58 +02:00
Johannes Meyer 344dcf2cf7 ServicestatusQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:35:48 +02:00
Johannes Meyer ced671a408 HoststatusQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:35:35 +02:00
Johannes Meyer 780ac16be1 NotificationQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:35:16 +02:00
Johannes Meyer 5c2fd63347 ServicegroupQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:34:48 +02:00
Johannes Meyer fedd2c3b18 HostgroupQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:34:37 +02:00
Johannes Meyer f70a861ff4 DowntimeQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:34:18 +02:00
Johannes Meyer edb83c8b41 CustomvarQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:33:41 +02:00
Johannes Meyer 7916c149b9 ContactQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:32:27 +02:00
Johannes Meyer ab628338c2 ContactgroupQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:32:15 +02:00
Johannes Meyer 91fe6913d8 CommentQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:31:39 +02:00
Eric Lippmann c8790fad93 Merge branch 'bugfix/service-grid-display_name-9538' into bugfix/service-grid-grouping-postgres-9333
Conflicts:
	library/Icinga/Data/PivotTable.php
	modules/monitoring/application/controllers/ListController.php
2015-08-25 15:51:20 +02:00
Eric Lippmann c5fe641c43 monitoring: Rewrite service-grid view script
refs #9538
2015-08-25 14:55:02 +02:00
Eric Lippmann bf7d1ba878 monitoring: Set display names as axis headers for the service grid
refs #9538
2015-08-25 14:54:15 +02:00
Eric Lippmann 1f7c8c712f monitoring: Load colors.less and service-grid.less
refs #9538
2015-08-25 14:53:46 +02:00
Eric Lippmann 83a0e53a46 monitoring: Add service-grid.less
Rewritten CSS for the service grid.

refs #9538
2015-08-25 14:48:32 +02:00
Eric Lippmann d8c7c216f1 monitoring: Add colors.less
Colors.less includes atomic definitions for background-colors related to different states at the moment. These definitions should be used when coloring backgrounds according to host and service states.

refs #9538
2015-08-25 14:47:16 +02:00
Eric Lippmann cc7eab6746 monitoring: Remove CSS for the service grid
Will be rewritten.

refs #9538
2015-08-25 14:44:27 +02:00
Eric Lippmann 6ab61ba8e0 Merge branch 'bugfix/format-lacks-restriction-9965'
fixes #9965
2015-08-25 09:19:00 +02:00
Johannes Meyer 0c47aececc Allow to disable stack traces globally
refs #9113
2015-08-24 14:44:54 +02:00
Eric Lippmann cfad85cce1 monitoring: Collect display names as table headers for the service grid
refs #9538
2015-08-24 09:23:46 +02:00
Matthias Jentsch 8a4e4ecf49 Fix indentation level of module.js 2015-08-21 14:36:57 +02:00
Matthias Jentsch 77e237304a Do not push timeline extends to history
fixes #9932
2015-08-21 14:21:33 +02:00
Johannes Meyer 9ca278d7b2 Merge branch 'master' into feature/activity-indicators-for-form-submits-8369 2015-08-21 13:37:54 +02:00
Johannes Meyer a11705a3fc monitoring: Show the autosubmit warning when toggling object features
refs #8369
2015-08-21 11:46:39 +02:00