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 |
Marius Hein
|
e8e3b940af
|
Use CustomVariable names case insensitive
refs #8696
|
2015-05-21 14:42:09 +02:00 |
Marius Hein
|
0002c0be26
|
Provide default config name for Module::getConfig()
|
2015-05-21 14:40:52 +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
|
c47465a732
|
lib/filter: Fix check against unset search columns
refs #8241
|
2015-05-21 14:04:04 +02:00 |
Eric Lippmann
|
57328aa6ed
|
monitoring: Make host group and service group alias columns case insensitive
The alias columns should be case insenstive because we now support them when searching.
refs #8241
|
2015-05-21 13:58:54 +02:00 |
Johannes Meyer
|
10b158a182
|
LdapUserBackend: Fix sorting when sorting by user_name
refs #8826
|
2015-05-21 13:53:27 +02:00 |
Johannes Meyer
|
4d79731646
|
DbUserBackend: Fix sorting when sorting by user_name
refs #8826
|
2015-05-21 13:53:18 +02:00 |
Johannes Meyer
|
ba31be9695
|
RepositoryQuery: Disim.. Fix sort order handling
refs #8826
|
2015-05-21 13:52:43 +02:00 |
Johannes Meyer
|
9278d708d7
|
IniUserGroupBackend: Do not sort by parent when sorting by group_name
refs #8826
|
2015-05-21 13:51:24 +02:00 |
Johannes Meyer
|
6369643145
|
DbUserGroupBackend: Do not sort by parent when sorting by group_name
refs #8826
|
2015-05-21 13:51:15 +02:00 |
Eric Lippmann
|
0c72686ba1
|
monitoring: Make display_name columns case insensitive
The display_name columns should be case insenstive because we now support them when searching.
refs #8241
|
2015-05-21 12:46:47 +02:00 |
Eric Lippmann
|
ad5ab16b3f
|
monitoring: Drop the Groupsummary data view
We have Hostgroupsummary and Servicegroupsummary now.
refs #8241
|
2015-05-21 12:43:27 +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
|
1a1f93db23
|
monitoring: Add sort rules to the service group summary
refs #8241
|
2015-05-21 12:41:29 +02:00 |
Eric Lippmann
|
e7396ea49c
|
monitoring: Add services_severity to the service group summary data view
refs #8241
|
2015-05-21 12:38:58 +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
|
73eb8cc805
|
monitoring: Add sort rule for total services to the host group summary
refs #8241
|
2015-05-21 12:37:53 +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 |
Eric Lippmann
|
58b3192ce3
|
monitoring: Add sort rules to the host group summary
refs #8241
|
2015-05-21 12:26:27 +02:00 |
Eric Lippmann
|
195275a716
|
monitoring: Don't hardcode sort direction of the severity columns
fixes #9059
|
2015-05-21 12:20:18 +02:00 |
Eric Lippmann
|
82f9425b90
|
Revert "Make ascending sort by host or service severity initiatable"
This reverts commit 386d4db851 .
The commit introduced the bug that changing the sort direction no longer changed the sort direction :)
refs #9059
|
2015-05-21 12:20:18 +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
|
37abc724de
|
monitoring: Let the host group summary provide the column hosts_severity
refs #8241
|
2015-05-21 11:24:31 +02:00 |
Eric Lippmann
|
bbed2cffae
|
monitoring: Add column hosts_severity to the group summary query
refs #8241
|
2015-05-21 11:23:55 +02:00 |
Eric Lippmann
|
ce463d16ef
|
Reorder group summary query's columns by name
refs #8241
|
2015-05-21 11:19:58 +02:00 |
Eric Lippmann
|
970d4d7a4a
|
Fix that time-until doesn't show negative partial time in the dashboard
refs #6778
|
2015-05-21 10:19:07 +02:00 |
Eric Lippmann
|
1e9337846a
|
ui: Fix refreshing partial time counters
refs #6778
|
2015-05-21 10:16:54 +02:00 |
Eric Lippmann
|
cfb819ec61
|
monitoring: Add missing column to the host group summary data view
refs #8241
|
2015-05-20 17:03:23 +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 |
Johannes Meyer
|
ed166d6eb7
|
GroupController: Add showAction
refs #8826
|
2015-05-20 16:17:37 +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 |
Johannes Meyer
|
94cd4b91e5
|
GroupController: Just show a group's name when listing groups
refs #8826
|
2015-05-20 15:54:47 +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 |
Johannes Meyer
|
2cec4a6d67
|
UserController: Add showAction
refs #8826
|
2015-05-20 15:41:02 +02:00 |
Eric Lippmann
|
2493535ac7
|
Revert "Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery"
This reverts commit 9b4f08eb43 .
There's DataView::getQueryName() for this.
refs #8241
|
2015-05-20 15:29:45 +02:00 |
Johannes Meyer
|
9891dc4491
|
UserController: Just show a user's name when listing users
Any additional information will be shown in the detail view soon.
refs #8826
|
2015-05-20 15:00:29 +02:00 |
Johannes Meyer
|
9fdcadaa97
|
UserController: Allow to add new users in case no users were found
refs #8826
|
2015-05-20 14:13:55 +02:00 |
Johannes Meyer
|
4a48997f47
|
GroupController: Add links to add and remove groups to the list action's view
refs #8826
|
2015-05-20 14:07:24 +02:00 |
Johannes Meyer
|
66611d4887
|
GroupController: Use proper redirect urls when adding and removing groups
refs #8826
|
2015-05-20 14:06:59 +02:00 |
Johannes Meyer
|
f86a05e0c3
|
UserController: Use proper redirect urls when adding and removing users
refs #8826
|
2015-05-20 13:54:05 +02:00 |
Johannes Meyer
|
fecf7a52b0
|
UserController: Add links to add and delete users to the list action's view
refs #8826
|
2015-05-20 13:53:19 +02:00 |