Commit Graph

867 Commits

Author SHA1 Message Date
Eric Lippmann 4aa0af5dca monitoring: Apply restriction on services before calling filterQuery which also handles format
refs #9965
2015-08-21 11:15:32 +02:00
Eric Lippmann 67bbc3ed6a monitoring: Apply restriction on hosts before calling filterQuery which also handles format
refs #9965
2015-08-21 11:14:43 +02:00
Eric Lippmann fc28088dc0 monitoring: Remove deprecated method ListController::applyRestriction() 2015-08-21 11:09:54 +02:00
Eric Lippmann 0c43e4a36b monitoring: Sort by display_names in the service grid
refs #9538
2015-08-19 12:55:55 +02:00
Eric Lippmann d449ff661e monitoring/service grid: Set up the sort control for the pivot table instead of the service status query
refs #9333
2015-08-18 14:23:12 +02:00
Johannes Meyer 1e6c394693 Controller: Create the filter editor in setupFilterControl() ...
...instead of demanding a concrete controller to do so.
We still have to decide how to handle parameter preservation
properly.

refs #9029
2015-08-13 17:05:13 +02:00
Johannes Meyer ad20d35e78 Eventgrid: Fetch the user's filter directly from the URL
refs #9029
2015-08-13 12:11:01 +02:00
Johannes Meyer fc35f3e46b FilterEditor: Apply the filter on the query internally
refs #9029
2015-08-13 11:33:25 +02:00
Johannes Meyer e1cec6a849 Drop everything related to join last comments in list views
refs #8616
2015-08-11 15:07:03 +02:00
Johannes Meyer 00d143cb14 Fetch the service problem summary of a host with less redundant code
refs #9864
2015-08-11 13:52:21 +02:00
Johannes Meyer a4fdb30067 Host Overview: Use a dedicated query to fetch service summaries
refs #9864
2015-08-07 15:37:35 +02:00
Johannes Meyer 6560975fe2 Host overview: Do not select `host_unhandled_services'
It's implemented as horribly slow subquery.

refs #9864
2015-08-07 15:35:13 +02:00
Johannes Meyer 8cf3b99335 Eventhistory Overview: Remove pagination and provide a load more link instead
refs #8615
2015-08-06 10:23:44 +02:00
Eric Lippmann cdd13bc389 monitoring: Apply restrictions before filtering for multiple services
refs #9574
2015-08-04 15:30:07 +02:00
Eric Lippmann 10e50842b2 monitoring: Apply restrictions before filtering for multiple hosts
refs #9574
2015-08-04 15:28:51 +02:00
Alexander Fuhr 1c5bf36538 Host(s)-/Service(s)Controller: Set the form backend
refs #9672
2015-08-04 13:25:17 +02:00
Johannes Meyer f03b9e5769 Eventgrid: Use $query->hasResult() instead of $query->count()
* and do not use fetchAll()
* and do not use <? short tags
* and do not use curly braces if not absolutely necessary..

refs #9632
2015-08-03 16:06:21 +02:00
Eric Lippmann 63c51c01e0 monitoring: Auto-refresh tactical overview every 15 seconds
fixes #9626
2015-07-22 13:40:50 +02:00
Johannes Meyer db20f2d05a BackendConfigForm: Adjust how to process requests
refs #9516
2015-06-29 14:00:34 +02:00
Johannes Meyer 766ff8ed83 InstanceConfigForm: Adjust how to process requests
fixes #7486
fixes #7488
fixes #7489
fixes #7490
refs #9516
2015-06-29 12:01:43 +02:00
Johannes Meyer 20fd3d6758 Fix multiselect views of hosts and services
I've broke this with #9472.
2015-06-24 15:11:33 +02:00
Johannes Meyer 98b01207cf Show intersecting ok-states as well in the default servicegrid view
fixes #9360
2015-06-24 14:37:07 +02:00
Johannes Meyer 67e31c730a Fetch host and service statistics not until they are required
fixes #9472
2015-06-23 08:49:11 +02:00
Johannes Meyer e8058c09c5 Merge branch 'master' into feature/monitoring-restrictions-9009
Conflicts:
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
2015-06-16 17:12:51 +02:00
Johannes Meyer 71e932bcf9 ShowController: Deprecate historyAction 2015-06-16 17:05:41 +02:00
Johannes Meyer 4a2a17aba1 HostController: Do not permit to filter the servicesAction 2015-06-16 16:34:45 +02:00
Johannes Meyer d81e637ae9 HostController: Add action to show a host's services 2015-06-16 16:04:45 +02:00
Johannes Meyer c05594b124 ShowController: Fix link to show a host's services 2015-06-16 16:03:17 +02:00
Johannes Meyer c316e5ce8f Revert "monitoring: Remove the services tab when showing an object's history"
This reverts commit b3e0851b62.
2015-06-16 13:48:56 +02:00
Johannes Meyer 4db9629268 AlertsummaryController: Apply object restrictions
refs #9009
2015-06-15 16:26:07 +02:00
Johannes Meyer 5545b4a605 AlertsummaryController: Fix filter columns 2015-06-15 16:25:48 +02:00
Johannes Meyer bd41839a19 ServicesController: Restrict the display of multiple services
refs #9009
2015-06-15 16:06:13 +02:00
Johannes Meyer ce48f63ac6 HostsController: Restrict the display of multiple hosts
refs #9009
2015-06-15 16:05:56 +02:00
Johannes Meyer ede8cc5e83 TimelineController: Restrict the displayed entries
refs #9009
2015-06-15 16:04:43 +02:00
Johannes Meyer efc52e3342 ShowController: Restrict the display of single contacts
refs #9009
2015-06-15 16:04:14 +02:00
Johannes Meyer 32c5d5a1ee ShowController: Restrict the servicestatus summary
I doubt that this is necessary, since showing hosts and services by using
this controller is deprecated, but I've added it nonetheless..

refs #9009
2015-06-15 16:03:46 +02:00
Johannes Meyer 8b749521ba DowntimesController: Restrict display of downtimes
refs #9009
2015-06-15 16:00:19 +02:00
Johannes Meyer 9a6e3a7042 DowntimeController: Restrict display of single comments
refs #9009
2015-06-15 15:59:50 +02:00
Johannes Meyer 8187135564 CommentsController: Restrict display of comments
refs #9009
2015-06-15 15:58:54 +02:00
Johannes Meyer b83abc4dbc CommentController: Restrict display of single comments
refs #9009
2015-06-15 15:58:15 +02:00
Johannes Meyer 1a08102531 ListController: Apply contactgroup restrictions after the filter editor 2015-06-15 15:14:09 +02:00
Johannes Meyer 53e6d4cadc ListController: Restrict the contactgroups view
refs #9009
2015-06-15 15:08:25 +02:00
Johannes Meyer 2fceac9771 ListController: Fix contactgroup sorting 2015-06-15 14:15:51 +02:00
Johannes Meyer aabdfec03a ListController: Restrict the contacts view
refs #9009
2015-06-15 13:48:13 +02:00
Johannes Meyer d5ade9ae74 ListController: Restrict the eventgridAction
refs #9009
2015-06-12 16:27:34 +02:00
Johannes Meyer eb93886cc7 ListController: Do not apply restrictions before the filter editor is being set up
Might cause the restrictions being shown to the user..

refs #9009
2015-06-12 14:58:20 +02:00
Johannes Meyer 4996f569fe monitoring: Ensure that views and queries are all named using the same scheme
That's "SomesuperQuery" and not "SomeSuperQuery", according to most
of the existing queries.
2015-06-12 14:42:49 +02:00
Johannes Meyer 76b17462f9 ListController: Restrict eventhistoryAction
refs 9009
2015-06-12 12:52:29 +02:00
Johannes Meyer 41ee39d48f EventHistoryQuery: Do not fetch columns which only exist in one subquery
Uses the same technique as the NotificationhistoryQuery for the output.
2015-06-10 13:08:57 +02:00
Johannes Meyer 2669d0e478 monitoring: Restrict the notification overview
refs #9009
2015-06-08 17:10:16 +02:00
Eric Lippmann 6c07a4842b monitoring: Fix controller function fetchHostStats()
refs #9009
2015-06-05 15:50:11 +02:00
Eric Lippmann 8cbb83d630 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-05 15:29:16 +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 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 b7afec8f3c monitoring: Restrict the tactical overview
refs #9009
2015-06-05 12:43:24 +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 8f111406f3 monitoring: Restrict the host overview and the host status summary
refs #9009
2015-06-03 14:16:22 +02:00
Eric Lippmann fe488c7b77 monitoring: Restrict the service group overview
refs #9009
2015-06-03 12:54:25 +02:00
Eric Lippmann 8bc9e46757 monitoring: Don't select host counts in the service group overview
We're not showing the counts.

refs #9009
2015-06-03 12:21:29 +02:00
Eric Lippmann c1c8c1c005 monitoring: Restrict the host group summary
refs #9009
2015-06-03 11:49:31 +02:00
Eric Lippmann 947b5436c3 monitoring: Fix host group summary select columns
refs #9009
2015-06-03 11:41:31 +02:00
Matthias Jentsch 29cc92a3f3 Display acknowledgement action for all unacknowledged objects
Instead of displaying the ack for all unhandled problem host, make acknowledgement possible for all monitored objects in multi views.

fixes #7931
2015-06-01 12:24:29 +02:00
Eric Lippmann 42d9f05c0f monitoring: Apply host and service restrctions to the comments overview
refs #9009
2015-05-29 15:39:41 +02:00
Eric Lippmann 46fdaf4698 monitoring: Fix select columns for the comment data views
refs #9009
2015-05-29 15:38:03 +02:00
Eric Lippmann 2cbadbf957 Revert "monitoring: Don't select host last ack, comment and downtime"
This reverts commit e240f7b955.

refs #7344
refs #9009
2015-05-29 15:09:21 +02:00
Eric Lippmann a93ef04d5d Revert "Add new tab to switch between host and service multi-selection"
This reverts commit 45a0982beb.

Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php

The tab was removed w/ another commit I guess. This revert removes the related not yet removed crap.
2015-05-29 13:30:02 +02:00
Eric Lippmann c17334deee monitoring: Support restricting the downtimes overview
refs #9009
2015-05-29 11:42:05 +02:00
Matthias Jentsch 8309ab336d Merge branch 'feature/resolve-runtime-macros-6392'
resolves #6392
2015-05-28 15:42:16 +02:00
Matthias Jentsch c7261bd481 Add missing columns for macro expansion
refs #6392
2015-05-28 15:37:01 +02:00
Eric Lippmann 5fdaa2cd7e monitoring: Fix command links when showing multiple selected hosts
fixes #9327
2015-05-28 13:17:00 +02:00
Eric Lippmann 8dbb215e27 monitoring: Remove services action from the ShowController
refs #7998
2015-05-28 12:25:31 +02:00
Eric Lippmann b3e0851b62 monitoring: Remove the services tab when showing an object's history
refs #7998
2015-05-28 12:24:00 +02:00
Eric Lippmann 344e17a605 monitoring: Fix command links when showing multiple selected hosts
fixes #9327
2015-05-28 10:33:13 +02:00
Eric Lippmann 0c1df335fc monitoring: Fix select columns for downtimes, again
refs #9009
refs #9319
2015-05-26 17:15:03 +02:00
Eric Lippmann cd1ee3e306 monitoring: Fix select columns for downtimes
refs #9009
refs #9319
2015-05-26 17:07:58 +02:00
Eric Lippmann e240f7b955 monitoring: Don't select host last ack, comment and downtime
Where unsure whether or not we will still support this.

refs #7344
refs #9009
2015-05-26 17:00:39 +02:00
Eric Lippmann ea8c497539 Fix exception when following command links for multiple selected hosts 2015-05-22 16:51:23 +02:00
Eric Lippmann 53ca68903a Merge branch 'bugfix/time-formatting-6778'
fixes #6778
2015-05-22 11:34:43 +02:00
Eric Lippmann 8d6d52f9db monitoring: Fix date and time formatting in the timeline
refs #6778
2015-05-22 10:59:17 +02:00
Eric Lippmann 2bdb725370 Merge branch 'bugfix/monitoring-controllers-response-codes-6281'
fixes #6281
2015-05-22 09:27:51 +02:00
Eric Lippmann e137263c4b monitoring: Fix HTTP response code when showing an invalid comment
refs #6281
2015-05-22 09:20:27 +02:00
Eric Lippmann 8f42d7a1d3 monitoring: Fix HTTP response code when showing an invalid downtime
refs #6281
2015-05-21 17:17:25 +02:00
Eric Lippmann 0b81a1130f monitoring: Fix HTTP response code when showing an invalid host
refs #6281
2015-05-21 16:18:09 +02:00
Eric Lippmann e8c704b98d monitoring: Fix HTTP response code when showing an invalid service
refs #6281
2015-05-21 16:18:09 +02:00
Eric Lippmann ce9110d22d Revert "Add proper respond http codes to service and host controller"
This reverts commit 6df031dc78.

I revert this commit for the following reasons:
- MissingParameterException must not be thrown manually because we have UrlParams::getRequired() which was UrlParams::req() before.
- The commit introduces the untranslated string 'host or service'.
- 4xx are client, not server errors.
- Copy and paste code for the stack trace handling in the ErrorController.

refs #6281
2015-05-21 16:14:02 +02:00
Matthias Jentsch 8ce9989243 Merge branch 'feature/support-icon-image-alt-9300'
resolves #9300
2015-05-21 15:03:06 +02:00
Matthias Jentsch 598ef1e8f4 Add alt-text to icon_images
Print alt-text as title and alt-attribute in the helper class and add the alt-column to the backend query.

refs #9300
2015-05-21 14:59:12 +02:00
Eric Lippmann 54577d04bd Merge branch 'master' into bugfix/time-formatting-6778
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/hostgroups.phtml
	modules/monitoring/application/views/scripts/process/info.phtml
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
	modules/monitoring/public/css/module.less
2015-05-21 14:57:01 +02:00
Eric Lippmann 47f21eebaa Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'
fixes #8241
2015-05-21 14:05:49 +02:00
Eric Lippmann e0c6ce58c3 monitoring: Fix sort control columns for the service group summary
refs #8241
2015-05-21 12:42:53 +02:00
Eric Lippmann 0db7cfca88 monitoring: Default to the sort rules of the service group summary
refs #8241
2015-05-21 12:41:59 +02:00
Eric Lippmann 89bac33595 monitoring: Fix sort control columns for the host group summary
refs #8241
2015-05-21 12:38:20 +02:00
Eric Lippmann 4b9f7eb910 monitoring: Default to the sort rules of the host group summary
refs #8241
2015-05-21 12:36:05 +02:00
Matthias Jentsch 87a46ea5b1 Merge branch 'feature/show-icon-images-in-detail-view-8665'
fixes #8665
2015-05-21 11:42:57 +02:00
Matthias Jentsch ee6c669441 Deduplicate code and fix layout
Move icon rendering code into a separate for better maintainabillity.

refs #8665
2015-05-21 11:40:08 +02:00
Eric Lippmann a52264aa32 monitoring: Sort by hosts_severity when sorting the host group summary by severity
refs #8241
2015-05-21 11:26:10 +02:00
Eric Lippmann b9a6e1042d Merge branch 'master' into bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241
Conflicts:
	modules/monitoring/application/controllers/ListController.php
2015-05-20 17:02:49 +02:00