Commit Graph

3556 Commits

Author SHA1 Message Date
Eric Lippmann 54a45ff338 monitoring: Fix PHPDoc of MonitoredObject::resolveAllStrings() 2015-09-03 14:08:43 +02:00
Eric Lippmann dc5e86002b monitoring: Reorder code in MonitoredObject 2015-09-03 14:07:38 +02:00
Eric Lippmann 4d2675659c monitoring: Optimize imports in MonitoredObject 2015-09-03 13:47:51 +02:00
Eric Lippmann e5c9eb1d20 monitoring: Don't show ack comments in the comments area of a host or service
refs #9674
2015-09-03 10:52:05 +02:00
Eric Lippmann 96f8afa6f1 monitoring/menu: Move Notifications beneath History
resolves #8884
2015-09-03 10:41:47 +02:00
Matthias Jentsch 1b7b0c7232 Merge branch 'feature/provide-acknowledgement-view-10032' 2015-09-02 11:31:15 +02:00
Matthias Jentsch fde51fe27b Display message on empty result sets
refs #10032
2015-09-02 11:30:12 +02:00
Matthias Jentsch 8f545dd0d6 Fix acknowledgement query for PGSQL
refs #10032
2015-09-02 11:25:52 +02:00
Davide Demuru 41ab03accb Update locale it_IT
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-09-01 23:02:52 +02:00
Matthias Jentsch 1964cc53d5 Revert "Provide dashlets for sticky-comments"
This reverts commit 6ada9ce047.
2015-09-01 17:59:04 +02:00
Matthias Jentsch 985f6ab85e Fix acknowledgement count query
refs #10032
2015-09-01 17:42:51 +02:00
Matthias Jentsch fd8824e157 Cleanup 2015-09-01 17:42:33 +02:00
Matthias Jentsch bcdbf413a6 Add acknowledgement view and query
Add backend queries and the controller to inspect active acknowledgements.

refs #10032
2015-09-01 16:39:08 +02:00
Eric Lippmann 5da88d0767 monitoring: Fix deprecated links
fixes #10056
2015-09-01 09:33:20 +02:00
Eric Lippmann 6007cc7f7b monitoring: Read "List all services" rather than "show all services" 2015-09-01 09:13:08 +02:00
Johannes Meyer 9bd3fc90f7 monitoring: Document the new restriction filter `instance_name' 2015-09-01 08:33:42 +02:00
Matthias Jentsch 6ada9ce047 Provide dashlets for sticky-comments
refs #6144
2015-08-31 17:03:10 +02:00
Johannes Meyer 2e7f3b941c LdapUserGroupBackendForm: Add missing form field..
..to configure the group_member_attribute option.

fixes #9903
2015-08-31 14:02:16 +02:00
Johannes Meyer 1c51735629 Merge branch 'master' into feature/rename-monitoring-instances-to-command-transports-and-allow-to-link-them-with-a-monitoring-instance-9651
Conflicts:
	modules/monitoring/application/controllers/ConfigController.php
2015-08-31 13:05:10 +02:00
Johannes Meyer d41b6d5112 commandtransports.ini: Document how transports are utilized
refs #9651
2015-08-31 12:57:41 +02:00
Johannes Meyer 5aee5836bb commandtransports.md: Document how instance linkage works
refs #9651
2015-08-31 12:57:07 +02:00
Johannes Meyer b7cdfcfae0 CommandTransport: Respect instance association
refs #9651
2015-08-31 12:19:42 +02:00
Johannes Meyer 1d6d4f0b10 RemoteCommandFile: Accept option `instance'
refs #9651
2015-08-31 12:19:00 +02:00
Johannes Meyer 04ef3f1244 LocalCommandFile: Accept option `instance'
refs #9651
2015-08-31 12:18:25 +02:00
Johannes Meyer ff54284401 TransportConfigForm: Use a select input for setting the instance
refs #9651
2015-08-31 12:17:57 +02:00
Johannes Meyer 6f6e991fd0 monitoring: Use the module's base controller in the ConfigController
refs #9651
2015-08-31 11:04:34 +02:00
Johannes Meyer e04c19a819 CommandForm: Use the CommandTransport class directly
Provides a fallback mechanism now and will check the instance's
name soon.

refs #8981
refs #9651
2015-08-31 09:28:42 +02:00
Johannes Meyer fcbd24e28e CommandTransport: Add fallback mechanism
refs #8981
refs #9651
2015-08-31 09:21:59 +02:00
Johannes Meyer ded6666897 wizard: Show a warning if the IDO is used for the internal database
resolves #9653
2015-08-28 15:25:40 +02:00
Eric Lippmann 85a4c67705 Merge branch 'feature/namespaced-controllers-5786'
resolves #5786
2015-08-28 15:09:49 +02:00
Johannes Meyer 6d77ade6ac setup: Ensure that the next-button double is always shown
fixes #9245
2015-08-28 10:49:26 +02:00
Eric Lippmann 6c067d49b7 monitoring: Add missing alias in the ListController after namespacing 2015-08-28 09:41:13 +02:00
Eric Lippmann 70554e766f monitoring: Namespace the ListController
refs #5786
2015-08-28 09:40:28 +02:00
Eric Lippmann 610675d3e9 monitoring: Optimize imports in the ListController
refs #5786
2015-08-28 09:39:48 +02:00
Eric Lippmann 9e83512dc6 monitoring: Add missing aliases in the TimelineController after namespacing 2015-08-28 09:39:12 +02:00
Eric Lippmann 0707d3f2a1 monitoring: Namespace the TimelineController
refs #5786
2015-08-28 09:37:56 +02:00
Eric Lippmann 45644fbde1 monitoring: Optimize imports in the TimelineController 2015-08-28 09:37:18 +02:00
Eric Lippmann e9f9073d90 monitoring: Namespace the TacticalController
refs #5786
2015-08-28 09:36:34 +02:00
Eric Lippmann acd5b9123c monitoring: Optimize imports in the TacticalController 2015-08-28 09:36:10 +02:00
Eric Lippmann cfab9d99ff monitoring: Don't use Monitoring\Controller as MonitoringController in the TacticalController 2015-08-28 09:35:25 +02:00
Eric Lippmann 411ad407b1 monitoring: Remove deprecated actions from the ShowController
Removed:

* show/service
* show/host
* show/history
2015-08-28 09:34:23 +02:00
Eric Lippmann 3c9e67eb46 monitoring: Don't throw exception manually in ShowController::contactAction() 2015-08-28 09:32:52 +02:00
Eric Lippmann 4cd0259eb2 monitoring: Namespace the ShowController
refs #5786
2015-08-28 09:32:04 +02:00
Eric Lippmann 54ad809bf1 monitoring: Optimize imports in the ShowController 2015-08-28 09:25:16 +02:00
Eric Lippmann 62d3eed989 monitoring: Remove ServicesController::deleteCommentAction()
Not in use.
2015-08-28 09:23:48 +02:00
Eric Lippmann dc5fddcbfe monitoring: Namespace the ServicesController
refs #5786
2015-08-28 09:22:13 +02:00
Eric Lippmann 48c625d54d monitoring: Optimize imports in the ServicesController 2015-08-28 09:21:23 +02:00
Eric Lippmann 33e64d9dc0 monitoring: Use @inheritdoc for ServiceController::$commandRedirectUrl 2015-08-28 09:20:33 +02:00
Eric Lippmann 67b22a56d2 monitoring: Namespace the ServiceController
refs #5786
2015-08-28 09:19:43 +02:00
Eric Lippmann 46f9256c82 monitoring: Remove ProcessController::performanceAction()
Not used.
2015-08-27 23:31:12 +02:00
Eric Lippmann b465bb000c monitoring: Namespace the ProcessController
refs #5786
2015-08-27 23:30:32 +02:00
Eric Lippmann 5ec338877c monitoring: Optimize impoerts in the ProcessController 2015-08-27 23:28:37 +02:00
Eric Lippmann acef9ce095 monitoring: Remove HostsController::deleteCommentAction()
Not used.
2015-08-27 23:27:29 +02:00
Eric Lippmann 6e2afe5d57 monitoring: Namespace the HostsController
refs #5786
2015-08-27 23:22:55 +02:00
Eric Lippmann 6931ad9411 monitoring: Optimize imports in the HostsController 2015-08-27 23:22:23 +02:00
Eric Lippmann c8927a36dc monitoring: Use @inheritdoc for HostController::$commandRedirectUrl 2015-08-27 23:21:48 +02:00
Eric Lippmann 1f922a7da6 monitoring: Namespace the HostController
refs #5786
2015-08-27 23:18:48 +02:00
Eric Lippmann 568c0f0955 monitoring: Fix mess in the downtimes-header view script 2015-08-27 23:17:57 +02:00
Eric Lippmann 2f47791a70 monitoring: Fix coding style in the comment-detail view script 2015-08-27 23:17:34 +02:00
Eric Lippmann 9ffe151628 monitoring: Omit full stop for tooltips in the comment-description view script 2015-08-27 23:17:11 +02:00
Eric Lippmann f72c8e30fe monitoring: Don't loop more than 5 comments in the comments-header view script
What the ...
2015-08-27 23:16:25 +02:00
Eric Lippmann d92f2cca0e monitoring: Fix coding style in the comments/show view script 2015-08-27 23:15:56 +02:00
Eric Lippmann aceae4cb6e monitoring: Fix coding style in the downtimes/show view script 2015-08-27 23:15:28 +02:00
Eric Lippmann 0f2a4ceac3 monitoring: Don't loop downtimes in the DowntimesController 2015-08-27 23:14:48 +02:00
Matthias Jentsch fa93b7e372 Move notifications up to avoid breaks between related dashlets
refs #6144
2015-08-27 17:16:01 +02:00
Matthias Jentsch 39513587d9 Remove event grid from activity stream
refs #6144
2015-08-27 17:13:22 +02:00
Matthias Jentsch fb8fbbe8f7 Provide new dashboard panes per default
refs #6144
2015-08-27 17:11:47 +02:00
Johannes Meyer 660540ee1a TransportConfigForm: Add `instance' form field
refs #9651
2015-08-27 16:33:10 +02:00
Eric Lippmann d68edc5149 Monitoring: Namespace the DowntimesController
refs #5786
2015-08-27 16:23:16 +02:00
Eric Lippmann e9380d2016 monitoring: Optimize imports in the DowntimesController
refs #5786
2015-08-27 16:21:59 +02:00
Eric Lippmann e2a4b51429 monitoring: Don't call getQuery() on the comment data view in the CommentController 2015-08-27 16:20:28 +02:00
Eric Lippmann b82306e2bb monitoring: Reduce DowntimeController complexity 2015-08-27 16:19:18 +02:00
Eric Lippmann a50d2110be monitoring: Namespace the DowntimeController
refs #5786
2015-08-27 16:08:09 +02:00
Eric Lippmann dce8afd5bd monitoring: Optimize imports in the DowntimeController
refs #5786
2015-08-27 16:07:30 +02:00
Eric Lippmann c3e6e47560 monitoring: Add missing alias in the ConfigController 2015-08-27 16:07:03 +02:00
Eric Lippmann 06c215f9a9 monitoring: Add missing alias in the ConfigController after namespacing 2015-08-27 16:06:26 +02:00
Eric Lippmann 15be844d76 monitoring: Namespace the ConfigController
refs #5786
2015-08-27 16:05:57 +02:00
Eric Lippmann f1c7f856cd monitoring: Optimize imports in ConfigController 2015-08-27 16:04:56 +02:00
Eric Lippmann 2533ebc8d5 monitoring: Fix mess in CommentsController and the related view script 2015-08-27 16:04:24 +02:00
Eric Lippmann 78701ab2b6 monitoring: Namespace the CommentsController
refs #5786
2015-08-27 15:54:44 +02:00
Eric Lippmann d1f7943ffb monitoring: Optimize imports in CommentsController 2015-08-27 15:54:12 +02:00
Eric Lippmann 6ff7882fc0 monitoring: Reduce complexity of the CommentController 2015-08-27 15:52:27 +02:00
Johannes Meyer cc49a289a2 monitoring: Restore view script for the securityAction 2015-08-27 15:49:59 +02:00
Eric Lippmann 98851236e8 monitoring: Namespace the CommentController
refs #5786
2015-08-27 15:42:27 +02:00
Eric Lippmann be021e6fa1 monitoring: Add fixing TODO to the ChartController
refs #10019
2015-08-27 15:41:15 +02:00
Eric Lippmann f83f56903e monitoring: Namespace the ChartController
refs #5786
2015-08-27 15:40:01 +02:00
Eric Lippmann 3af82547ac monitoring: Optimize imports in the ChartController 2015-08-27 15:37:42 +02:00
Eric Lippmann 9d926fb4c6 monitoring: Don't use absolute alias in the AlertsummaryController 2015-08-27 15:37:01 +02:00
Eric Lippmann 65a7365e1e monitoring: Add missing aliases in the AlertsummaryController after namespacing 2015-08-27 15:35:27 +02:00
Eric Lippmann d60fed23f7 monitoring: Namespace the Alertsummarycontroller
refs #5786
2015-08-27 15:19:43 +02:00
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 8c887ee450 monitoring: Rename all command transport related classes
refs #9651
2015-08-26 15:52:36 +02:00
Johannes Meyer ec8567cbbf monitoring: It's now a command transport, not an instance anymore
refs #9651
2015-08-26 15:43:30 +02:00
Johannes Meyer 6651d31481 CommandTransport: Use commandtransports as config file name
refs #9651
2015-08-26 14:17:23 +02:00
Johannes Meyer a1bd648d51 monitoring: Fix commandtransports.ini link in the config overview
refs #9651
2015-08-26 14:15:35 +02:00
Johannes Meyer b7feed86ea monitoring: Document how to assign instances to command transports
refs #9651
2015-08-26 14:05:13 +02:00
Johannes Meyer 5f66667828 monitoring: Update the command transport documentation
refs #9765
refs #9651
2015-08-26 13:35:11 +02:00
Johannes Meyer ae3910390b monitoring: Rename instances.md to commandtransports.md
refs #9651
2015-08-26 13:32:22 +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 96fb3b5d4b Merge branch 'master' into feature/api-9606 2015-08-25 09:25:59 +02:00
Eric Lippmann a0ff09da84 monitoring/API: Require a filter when scheduling host downtimes
refs #9606
2015-08-25 09:24:47 +02:00
Eric Lippmann 04ae298c0c monitoring/API: Require a filter when scheduling service downtimes
refs #9606
2015-08-25 09:23:36 +02:00
Eric Lippmann 146ea971c4 monitoring/API: Require a filter when removing service downtimes
refs #9606
2015-08-25 09:20:42 +02:00
Eric Lippmann 2c393afbeb monitoring/API: Require a filter when removing host downtimes
refs #9606
2015-08-25 09:19:49 +02:00
Eric Lippmann 6ab61ba8e0 Merge branch 'bugfix/format-lacks-restriction-9965'
fixes #9965
2015-08-25 09:19:00 +02:00
Eric Lippmann e9c7a5894a monitoring: Add DataView::$requiresFilter
refs #9606
2015-08-24 16:01:07 +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