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
71e932bcf9
ShowController: Deprecate historyAction
2015-06-16 17:05:41 +02:00
4a2a17aba1
HostController: Do not permit to filter the servicesAction
2015-06-16 16:34:45 +02:00
d81e637ae9
HostController: Add action to show a host's services
2015-06-16 16:04:45 +02:00
c05594b124
ShowController: Fix link to show a host's services
2015-06-16 16:03:17 +02:00
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
4db9629268
AlertsummaryController: Apply object restrictions
...
refs #9009
2015-06-15 16:26:07 +02:00
5545b4a605
AlertsummaryController: Fix filter columns
2015-06-15 16:25:48 +02:00
bd41839a19
ServicesController: Restrict the display of multiple services
...
refs #9009
2015-06-15 16:06:13 +02:00
ce48f63ac6
HostsController: Restrict the display of multiple hosts
...
refs #9009
2015-06-15 16:05:56 +02:00
ede8cc5e83
TimelineController: Restrict the displayed entries
...
refs #9009
2015-06-15 16:04:43 +02:00
efc52e3342
ShowController: Restrict the display of single contacts
...
refs #9009
2015-06-15 16:04:14 +02:00
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
8b749521ba
DowntimesController: Restrict display of downtimes
...
refs #9009
2015-06-15 16:00:19 +02:00
9a6e3a7042
DowntimeController: Restrict display of single comments
...
refs #9009
2015-06-15 15:59:50 +02:00
8187135564
CommentsController: Restrict display of comments
...
refs #9009
2015-06-15 15:58:54 +02:00
b83abc4dbc
CommentController: Restrict display of single comments
...
refs #9009
2015-06-15 15:58:15 +02:00
1a08102531
ListController: Apply contactgroup restrictions after the filter editor
2015-06-15 15:14:09 +02:00
53e6d4cadc
ListController: Restrict the contactgroups view
...
refs #9009
2015-06-15 15:08:25 +02:00
2fceac9771
ListController: Fix contactgroup sorting
2015-06-15 14:15:51 +02:00
aabdfec03a
ListController: Restrict the contacts view
...
refs #9009
2015-06-15 13:48:13 +02:00
d5ade9ae74
ListController: Restrict the eventgridAction
...
refs #9009
2015-06-12 16:27:34 +02:00
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
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
76b17462f9
ListController: Restrict eventhistoryAction
...
refs 9009
2015-06-12 12:52:29 +02:00
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
2669d0e478
monitoring: Restrict the notification overview
...
refs #9009
2015-06-08 17:10:16 +02:00
6c07a4842b
monitoring: Fix controller function fetchHostStats()
...
refs #9009
2015-06-05 15:50:11 +02:00
8cbb83d630
Merge branch 'master' into feature/monitoring-restrictions-9009
2015-06-05 15:29:16 +02:00
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
1d775842f9
monitoring: Restrict the service grid
...
refs #9009
2015-06-05 15:06:34 +02:00
5bc611f772
monitoring: Use new restriction when viewing a service
...
refs #9009
2015-06-05 14:44:35 +02:00
5745790cdd
monitoring: Use new restriction when viewing a host
...
refs #9009
2015-06-05 14:44:03 +02:00
b7afec8f3c
monitoring: Restrict the tactical overview
...
refs #9009
2015-06-05 12:43:24 +02:00
f8b49864bb
monitoring: Restrict the services overview
...
refs #9009
2015-06-03 14:59:20 +02:00
f479ea1da8
monitoring: Restrict the service status summary
...
refs #9009
2015-06-03 14:44:36 +02:00
8f111406f3
monitoring: Restrict the host overview and the host status summary
...
refs #9009
2015-06-03 14:16:22 +02:00
fe488c7b77
monitoring: Restrict the service group overview
...
refs #9009
2015-06-03 12:54:25 +02:00
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
c1c8c1c005
monitoring: Restrict the host group summary
...
refs #9009
2015-06-03 11:49:31 +02:00
947b5436c3
monitoring: Fix host group summary select columns
...
refs #9009
2015-06-03 11:41:31 +02:00
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
42d9f05c0f
monitoring: Apply host and service restrctions to the comments overview
...
refs #9009
2015-05-29 15:39:41 +02:00
46fdaf4698
monitoring: Fix select columns for the comment data views
...
refs #9009
2015-05-29 15:38:03 +02:00
2cbadbf957
Revert "monitoring: Don't select host last ack, comment and downtime"
...
This reverts commit e240f7b955#7344
refs #9009
2015-05-29 15:09:21 +02:00
a93ef04d5d
Revert "Add new tab to switch between host and service multi-selection"
...
This reverts commit 45a0982beb
2015-05-29 13:30:02 +02:00
c17334deee
monitoring: Support restricting the downtimes overview
...
refs #9009
2015-05-29 11:42:05 +02:00
8309ab336d
Merge branch 'feature/resolve-runtime-macros-6392'
...
resolves #6392
2015-05-28 15:42:16 +02:00
c7261bd481
Add missing columns for macro expansion
...
refs #6392
2015-05-28 15:37:01 +02:00
5fdaa2cd7e
monitoring: Fix command links when showing multiple selected hosts
...
fixes #9327
2015-05-28 13:17:00 +02:00
8dbb215e27
monitoring: Remove services action from the ShowController
...
refs #7998
2015-05-28 12:25:31 +02:00
b3e0851b62
monitoring: Remove the services tab when showing an object's history
...
refs #7998
2015-05-28 12:24:00 +02:00
344e17a605
monitoring: Fix command links when showing multiple selected hosts
...
fixes #9327
2015-05-28 10:33:13 +02:00
0c1df335fc
monitoring: Fix select columns for downtimes, again
...
refs #9009
refs #9319
2015-05-26 17:15:03 +02:00
cd1ee3e306
monitoring: Fix select columns for downtimes
...
refs #9009
refs #9319
2015-05-26 17:07:58 +02:00
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
ea8c497539
Fix exception when following command links for multiple selected hosts
2015-05-22 16:51:23 +02:00
53ca68903a
Merge branch 'bugfix/time-formatting-6778'
...
fixes #6778
2015-05-22 11:34:43 +02:00
8d6d52f9db
monitoring: Fix date and time formatting in the timeline
...
refs #6778
2015-05-22 10:59:17 +02:00
2bdb725370
Merge branch 'bugfix/monitoring-controllers-response-codes-6281'
...
fixes #6281
2015-05-22 09:27:51 +02:00
e137263c4b
monitoring: Fix HTTP response code when showing an invalid comment
...
refs #6281
2015-05-22 09:20:27 +02:00
8f42d7a1d3
monitoring: Fix HTTP response code when showing an invalid downtime
...
refs #6281
2015-05-21 17:17:25 +02:00
0b81a1130f
monitoring: Fix HTTP response code when showing an invalid host
...
refs #6281
2015-05-21 16:18:09 +02:00
e8c704b98d
monitoring: Fix HTTP response code when showing an invalid service
...
refs #6281
2015-05-21 16:18:09 +02:00
ce9110d22d
Revert "Add proper respond http codes to service and host controller"
...
This reverts commit 6df031dc78#6281
2015-05-21 16:14:02 +02:00
8ce9989243
Merge branch 'feature/support-icon-image-alt-9300'
...
resolves #9300
2015-05-21 15:03:06 +02:00
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
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
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
e0c6ce58c3
monitoring: Fix sort control columns for the service group summary
...
refs #8241
2015-05-21 12:42:53 +02:00
0db7cfca88
monitoring: Default to the sort rules of the service group summary
...
refs #8241
2015-05-21 12:41:59 +02:00
89bac33595
monitoring: Fix sort control columns for the host group summary
...
refs #8241
2015-05-21 12:38:20 +02:00
4b9f7eb910
monitoring: Default to the sort rules of the host group summary
...
refs #8241
2015-05-21 12:36:05 +02:00
87a46ea5b1
Merge branch 'feature/show-icon-images-in-detail-view-8665'
...
fixes #8665
2015-05-21 11:42:57 +02:00
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
a52264aa32
monitoring: Sort by hosts_severity when sorting the host group summary by severity
...
refs #8241
2015-05-21 11:26:10 +02:00
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
f9952cf231
monitoring: Don't sort the service group summary by service severity
...
refs #8241
2015-05-20 16:15:38 +02:00
2dc6d5467d
monitoring: Don't select unnecessary columns in the host group summary
...
refs #8241
2015-05-20 16:07:49 +02:00
5efbad3a71
monitoring: Don't sort the host group summary by service severity
...
refs #8241
2015-05-20 15:50:13 +02:00
0b937c86dc
Get columns for FilterEditor::setSearchColumns() from DataView::getSearchColumns()
...
refs #8241
2015-05-19 18:17:41 +02:00
6ba07b089d
Implement and use Hostgroupsummary and Servicegroupsummary
...
refs #8241
2015-05-19 18:17:40 +02:00
c0cf6e4918
Display icon_images in all host and service detail views
...
refs #8665
2015-05-19 18:08:26 +02:00
36713fb519
Rename parameter $query of ::filterQuery() to $dataView
...
refs #8241
2015-05-19 17:36:23 +02:00
b1b2e3fc21
Revert "Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'"
...
This reverts commit 75b004dc42bd7c7f9636
2015-05-19 17:13:46 +02:00
0a8c9ad195
Merge branch 'feature/list-number-of-hosts-in-host-groups-8054'
...
resolves #8054
2015-05-19 15:10:20 +02:00
a2b262eab1
Take display_name into account when searching for host and service names
...
refs #8241
2015-05-19 14:04:23 +02:00
85dd496d35
Add parameter $searchColumns to ::filterQuery()
...
refs #8241
2015-05-19 14:01:18 +02:00
3296522d90
Merge branch 'feature/Allow-to-add-columns-to-monitoring-views-via-URL-4498'
...
resolves #4498
2015-05-19 13:35:04 +02:00
b5a0f7950e
Use PHP's DateTime instead of our DateTimeFactory in the TimeLineController
...
I'm about to drop the DateTimeFactory because date_default_timezone_set() in combination w/ PHP's DateTime is sufficient.
refs #6778
2015-05-19 11:17:00 +02:00
d539a0e017
Add PHPDoc to ::addColumns()
...
refs #4498
2015-05-19 10:11:54 +02:00
94555d7998
Streamline layout of all multi-views
...
Fix small inconsistencies between layout of downtime, comment, service and host multi-views.
2015-05-18 17:17:30 +02:00
0bde465295
Rename ::extraColumns() to ::addColumns()
...
refs #4498
2015-05-18 16:29:33 +02:00
592d5eadc1
Merge branch 'feature/improve-multi-select-view-8565'
2015-05-18 16:00:52 +02:00
c3129890aa
Improve multi-view tabs
...
Display the current object count next to the tab title, to clarify that those views display a summary of multiple items. Only display the current tab for hosts or services, to avoid confusion.
refs #8565
2015-05-18 15:25:12 +02:00
00bbb762a1
Integrate comments and downtimes into MonitoredObjectsController
...
Add option to list all related commends and downtimes into the specific hosts and serivces views.
refs #8565
2015-05-18 14:03:10 +02:00
fe2ee3617b
Remove pie charts from multi-views
...
refs #8565
2015-05-18 13:56:35 +02:00
62d8c441f8
Add ServiceActionsHook
...
refs #9284
2015-05-18 11:45:39 +02:00
d0cc2ae704
ShowController: Use a default limit of 50 for an object's history listing
...
refs #8337
2015-05-15 15:23:49 +02:00
fbf0ad4339
Drop interface Browsable
...
We're not required to handle objects of Zend_Paginator in any way, so
creating such as part of a query is not necessary since QueryAdapter
accepts any instance of QueryInterface. (gets enforced in the near future)
refs #8339
2015-05-15 14:37:41 +02:00
Johannes Meyer
Eric Lippmann
Matthias Jentsch
Alexander A. Klimov
Marius Hein