Commit Graph

3409 Commits

Author SHA1 Message Date
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
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