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
Eric Lippmann
80b174f526
monitoring: Servicegroupsummary must not extend Groupsummary which is subject to remove
...
refs #8241
2015-05-20 16:16:21 +02:00
Eric Lippmann
f9952cf231
monitoring: Don't sort the service group summary by service severity
...
refs #8241
2015-05-20 16:15:38 +02:00
Eric Lippmann
a9d6a94957
monitoring: Use the groupsummary query for the service group summary view
...
refs #8241
2015-05-20 16:09:30 +02:00
Eric Lippmann
2dc6d5467d
monitoring: Don't select unnecessary columns in the host group summary
...
refs #8241
2015-05-20 16:07:49 +02:00
Eric Lippmann
d379b27c24
monitoring: Hostgroupsummary must not extend Groupsummary which is subject to remove
...
refs #8241
2015-05-20 15:50:19 +02:00
Eric Lippmann
5efbad3a71
monitoring: Don't sort the host group summary by service severity
...
refs #8241
2015-05-20 15:50:13 +02:00
Eric Lippmann
41e72396ee
monitoring: Use the groupsummary query for the host group summary view
...
refs #8241
2015-05-20 15:50:06 +02:00
Eric Lippmann
2493535ac7
Revert "Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery"
...
This reverts commit 9b4f08eb433879f520dc7f93a4e205ae9bc631b5.
There's DataView::getQueryName() for this.
refs #8241
2015-05-20 15:29:45 +02:00
Johannes Meyer
71fa736144
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-20 10:46:55 +02:00
Alexander A. Klimov
9b4f08eb43
Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery
...
Without this the Hostgroupsummary and Servicegroupsummary DataViews would not work
refs #8241
2015-05-20 10:43:54 +02:00
Alexander A. Klimov
0b937c86dc
Get columns for FilterEditor::setSearchColumns() from DataView::getSearchColumns()
...
refs #8241
2015-05-19 18:17:41 +02:00
Alexander A. Klimov
93db1d15cb
Override ::getSearchColumns()
...
refs #8241
2015-05-19 18:17:40 +02:00
Alexander A. Klimov
6ba07b089d
Implement and use Hostgroupsummary and Servicegroupsummary
...
refs #8241
2015-05-19 18:17:40 +02:00
Matthias Jentsch
c0cf6e4918
Display icon_images in all host and service detail views
...
refs #8665
2015-05-19 18:08:26 +02:00
Alexander A. Klimov
2ed1d6c66b
Implement ::getSearchColumns()
...
refs #8241
2015-05-19 17:36:24 +02:00
Alexander A. Klimov
36713fb519
Rename parameter $query of ::filterQuery() to $dataView
...
refs #8241
2015-05-19 17:36:23 +02:00
Alexander A. Klimov
b1b2e3fc21
Revert "Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'"
...
This reverts commit 75b004dc429a3ef32b113ebd0fb3791896ebf89b, reversing
changes made to bd7c7f963663cc570f378f395863d99e9a1c3d7d.
2015-05-19 17:13:46 +02:00
Eric Lippmann
0a8c9ad195
Merge branch 'feature/list-number-of-hosts-in-host-groups-8054'
...
resolves #8054
2015-05-19 15:10:20 +02:00
Johannes Meyer
fb07f0b94c
Merge branch 'master' into feature/user-and-group-management-8826
...
Conflicts:
library/Icinga/Authentication/Backend/LdapUserBackend.php
library/Icinga/Protocol/Ldap/Query.php
2015-05-19 14:14:03 +02:00
Alexander A. Klimov
a2b262eab1
Take display_name into account when searching for host and service names
...
refs #8241
2015-05-19 14:04:23 +02:00
Alexander A. Klimov
85dd496d35
Add parameter $searchColumns to ::filterQuery()
...
refs #8241
2015-05-19 14:01:18 +02:00
Johannes Meyer
4cedfce07f
DataView: Fix that method getOffset() calls parent::hasOffset()
2015-05-19 13:57:20 +02:00
Johannes Meyer
a629adb448
DataView: Remove method paginate()
2015-05-19 13:57:20 +02:00
Eric Lippmann
afe07f4814
Revert "Hostgroups view: reduce "Last Problem" column's width"
...
This reverts commit 8b084733413b74131100abf6a31efc02793695c5.
Common table style is subject of #8935 .
refs #8054
2015-05-19 13:45:20 +02:00
Eric Lippmann
3296522d90
Merge branch 'feature/Allow-to-add-columns-to-monitoring-views-via-URL-4498'
...
resolves #4498
2015-05-19 13:35:04 +02:00
Eric Lippmann
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
Eric Lippmann
979f16e5f6
Use date and time format view helper function in the monitoring health view
...
I'm about to drop the DateFormat view helper class.
refs #6778
2015-05-19 10:13:58 +02:00
Alexander A. Klimov
d539a0e017
Add PHPDoc to ::addColumns()
...
refs #4498
2015-05-19 10:11:54 +02:00
Eric Lippmann
8f40d76cca
Use date format view helper function in the event grid
...
I'm about to drop the DateFormat view helper class.
refs #6778
2015-05-19 10:11:12 +02:00
Eric Lippmann
7212c038f1
Don't show ago, since, ... for monitoring list views in the dashboard
...
refs #6778
2015-05-19 10:00:27 +02:00
Eric Lippmann
3fdf1d2a5c
Use timeAgo in the event history overview
...
refs #6778
2015-05-19 09:57:46 +02:00
Johannes Meyer
f305a334d5
DbConnection: Drop param $columnIndex in fetchColumn(), it's unused
2015-05-19 09:48:20 +02:00
Matthias Jentsch
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
Alexander A. Klimov
0bde465295
Rename ::extraColumns() to ::addColumns()
...
refs #4498
2015-05-18 16:29:33 +02:00
Alexander A. Klimov
52d1cb8c8f
Merge branch 'bugfix/Toggle-FeaturesCommandForm-make-notifications-more-verbose-9023'
...
fixes #9023
2015-05-18 16:09:07 +02:00
Alexander A. Klimov
7caba93a28
Replace ...' w/
..'
...
refs #9023
2015-05-18 16:07:28 +02:00
Johannes Meyer
0e0341f78a
It's the connection which provides a cursor, not the query
2015-05-18 16:01:58 +02:00
Matthias Jentsch
592d5eadc1
Merge branch 'feature/improve-multi-select-view-8565'
2015-05-18 16:00:52 +02:00
Matthias Jentsch
1f20ba1bc6
Fix state summary base target in multi views
...
refs #8565
2015-05-18 15:48:04 +02:00
Matthias Jentsch
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
Alexander A. Klimov
0d48ddcc06
ToggleObjectFeaturesCommandForm::onSuccess(): show a notification for each feature about whether it has been enabled or disabled
...
refs #9023
2015-05-18 15:18:26 +02:00
Johannes Meyer
742dfcaf41
Revert "Fetchable: Add method fetch() which returns an iterator"
...
This reverts commit 7a6837de0e331e19d09a22a8565ab0ea2e11a0cf.
2015-05-18 15:17:22 +02:00
Matthias Jentsch
342a8a39d1
Fix state summary in multi views
...
refs #8565
2015-05-18 14:58:51 +02:00
Alexander A. Klimov
729fb9a4d1
ToggleInstanceFeaturesCommandForm::onSuccess(): notifications: show which feature has been enabled or disabled
...
refs #9023
2015-05-18 14:51:22 +02:00
Matthias Jentsch
e84491d438
Improve multi view layout
...
refs #8565
2015-05-18 14:49:06 +02:00
Eric Lippmann
9ffeffdf09
Show when an object's dowtime was added
...
refs #6778
2015-05-18 14:39:36 +02:00
Eric Lippmann
13a38c9d18
Revert "Add new line between comment author and creation time in the detail views"
...
This reverts commit 229e266daf4d57a1052ff69ecb132575bcd40941.
The new line does not help for improving the layout but makes it more confusing.
2015-05-18 14:36:35 +02:00
Eric Lippmann
e49f938f56
Use timeSince and timeUntil when displaying object downtimes
...
refs #6778
2015-05-18 14:33:49 +02:00
Alexander A. Klimov
4fbadaea2c
ToggleInstanceFeaturesCommandForm::createElements(): make form labels shorter
...
refs #9023
2015-05-18 14:20:17 +02:00