Eric Lippmann
e086905384
monitoring: Deprecate DataView::addFilter() and DataView::setFilter()
...
The from now on deprecated interface Filterable has proven that it sucks in the DataView.
Because of requiring us to implement trillion stupid methods, only DataView::applyFilter()
does not forget to handle column validation. Thus only DataView::applyFilter() must be used in order
to apply filters.
For setFilter() a wrapping Filter::matchAny() for the IdoQuery (or the DbQuery or the SimpleQuery I didn't have a look)
is required for the filter to work properly.
The deprecation is just for the records. I guess we do not use the other methods.
2015-01-27 14:52:13 +01:00
Eric Lippmann
c53b1d27e9
lib: Deprecate Data\Filterable because of ...
...
addFilter and applyFilter do the same in all usages.
addFilter could be replaced w/ getFilter()->add().
We must no require classes implementing this interface to implement redundant methods over and over again.
The interface must be moved to the namespace Icinga\Data\Filter.
It lacks documentation.
2015-01-27 14:33:46 +01:00
Eric Lippmann
b2f93abb12
monitoring/security: Require a Filterable instead of a DataView in applyRestriction()
2015-01-27 14:24:56 +01:00
Eric Lippmann
3cbafe16f6
monitoring/security: Move applyRestriction() to the module's base controller
2015-01-27 14:22:37 +01:00
Eric Lippmann
f37cd0cb95
monitoring/security: Apply hosts restriction in the hosts overview
2015-01-27 13:51:15 +01:00
Eric Lippmann
c8084dde92
monitoring/security: Apply services restriction in the services overview
2015-01-27 13:49:51 +01:00
Eric Lippmann
f8aa9eb05c
monitoring/security: Replace 'monitoring/filter' restrictions with filter for the hosts and the services view
2015-01-27 13:48:33 +01:00
Eric Lippmann
405e18a46f
monitoring: Fix PHPDoc for MonitoringBackend::from()
2015-01-27 13:37:28 +01:00
Eric Lippmann
08795e7cf4
monitoring/security: Expect restriction name in ListController::applyRestriction()
...
Before, the restriction was hard coded to 'monitoring/filter'.
This restriction will be removed because we can not use the very same filter for all views.
2015-01-27 13:33:52 +01:00
Johannes Meyer
45408e45af
Relax database permission checks in the setup wizard
...
The wizard considered all permissions being exclusively associated to their
most important context, which is, in the most common case, incorrect.
Permissions assigned on database level do not need to be assigned on
table level as well.
refs #8267
2015-01-26 15:51:47 +01:00
Eric Lippmann
917e5b81ba
rpm: Fix bad %if condition
2015-01-26 15:33:16 +01:00
Johannes Meyer
7006bbf8b2
Suggest "icingaweb2" as group instead of the webserver's user
...
..and note that it is necessary to create this group.
2015-01-26 14:13:10 +01:00
Eric Lippmann
555ab77c3d
Fix "Undefined property: stdClass::$service_display_name" in the alert summary
...
fixes #8284
2015-01-26 13:42:05 +01:00
Johannes Meyer
0b73dbdd6d
Fix exception "Undefined index: type" in the WebWizard's page logic
...
refs #8275
2015-01-26 10:32:33 +01:00
Johannes Meyer
fb97e74453
Use the correct element identifier for the preference storage type selection
...
Used to be `type' but has changed to `store'
to get a more clear INI structure.
fixes #8275
2015-01-26 07:39:31 +01:00
Johannes Meyer
113658a23c
Merge branch 'bugifx/add-none-preferences-store-8234'
...
fixes #8234
2015-01-23 16:25:41 +01:00
Johannes Meyer
55c20abddc
Only show the "save to session" button in case preferences store = none
...
refs #8234
2015-01-23 16:25:24 +01:00
Johannes Meyer
d452f3218d
Use "ini" as preferences store in case preferences are not configured
...
refs #8234
2015-01-23 16:25:24 +01:00
Johannes Meyer
359336243c
Save "none" instead of "null" when choosing to not to store preferences
...
refs #8234
2015-01-23 16:25:24 +01:00
Johannes Meyer
2a543bb5ae
Rename the preference setting `type' to `store'
...
refs #8234
2015-01-23 16:25:23 +01:00
Eric Lippmann
5fe5e22395
doc: Support any link having a fragment except http(s) links for linking between headings
2015-01-23 16:00:15 +01:00
Eric Lippmann
53a4f10253
monitoring: Sort host groups and service groups by their alias
...
refs #7843
2015-01-23 15:47:18 +01:00
Eric Lippmann
910065436b
monitoring: Support hostgroup_alias and servicegroup_alias filter
2015-01-23 15:47:18 +01:00
Eric Lippmann
a1fbb3d937
monitoring: Fix host and service groups overviews when using PostgreSQL
...
fixes #8268
2015-01-23 15:47:18 +01:00
Johannes Meyer
a07bff490f
Fix that the monitoring module's config directory is not being created
...
Forgot to re-add this when reverting a temporary change while adjusting
the module installation as part of #8191 .
2015-01-23 15:31:45 +01:00
Eric Lippmann
7bd42b476f
bootstrap: Load setup module in case the setup token exists
...
The web setup may write the config.ini even if it errors. Thus our bootstrap
has to load the setup module whenever the setup.token exists.
Another approach would to write the config.ini in our web setup at the very end.
2015-01-23 15:27:52 +01:00
Eric Lippmann
7500dd9c68
Revert "GroupSummary/Postgres: Fix group by in initial join query"
...
This reverts commit f47bc46654
.
Conflicts:
modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
No need to reintroduce group columns.
2015-01-23 15:27:52 +01:00
Johannes Meyer
14a4aaeb77
Revert "Fix that when chosing to not to store preferences an invalid config is created"
...
This reverts commit 6284da451e
.
2015-01-23 15:23:43 +01:00
Johannes Meyer
6284da451e
Fix that when chosing to not to store preferences an invalid config is created
...
fixes #8234
2015-01-23 14:42:09 +01:00
Eric Lippmann
c78d4aa0bd
monitoring/security: Provide permissions for the feature commands
2015-01-23 13:29:47 +01:00
Eric Lippmann
4be7f09a38
Merge branch 'bugfix/use-display_name-for-groups-too-8266'
...
fixes #8266
2015-01-23 11:25:28 +01:00
Eric Lippmann
86ac09d7b1
monitoring: Use the service group alias for displaying service group names in the servicegroups overview
...
refs #8266
2015-01-23 11:24:39 +01:00
Eric Lippmann
7e05de1255
monitoring: Select the service group alias in the servicegroups ovweview
...
refs #8266
2015-01-23 11:23:59 +01:00
Eric Lippmann
9fe720e715
monitoring: Escape the service group name in the servicegroups overview
2015-01-23 11:23:42 +01:00
Eric Lippmann
257186fb92
monitoring: Use hostgroup alias for displaying the host group's name in the hostgroups overview
...
refs #8266
2015-01-23 11:22:35 +01:00
Eric Lippmann
42071118af
monitoring: Select hostgroup_alias in the hostgroups overview
...
refs #8266
2015-01-23 11:22:20 +01:00
Eric Lippmann
30eed015ba
monitoring: Support selecting host group and service group alias in the GroupsummaryQuery
...
refs #8266
2015-01-23 11:21:29 +01:00
Eric Lippmann
74a0c1e274
monitoring: Support selecting host group and service group alias in the HoststatusQuery
...
refs #8266
2015-01-23 11:21:10 +01:00
Eric Lippmann
e15c085f19
monitoring: Support selecting host group and service group alias in the StatusQuery
...
refs #8266
2015-01-23 11:20:35 +01:00
Eric Lippmann
b54564eb5c
monitoring: Escape the host group's name in the hostgroups overview
2015-01-23 11:20:00 +01:00
Eric Lippmann
5ac1eaa513
monitoring: Fix indents in the GroupsummaryQuery
2015-01-23 11:11:34 +01:00
Eric Lippmann
3cb2dd0e8b
monitoring/security: Hide 'Acknowledge' link if user lacks the respective permission
2015-01-23 11:01:47 +01:00
Eric Lippmann
08e8d5d742
monitoring/security: Hide 'Process check result' link if user lacks the respective permission
2015-01-23 10:48:21 +01:00
Eric Lippmann
2535d802b1
monitoring: Add missing td closing tag
2015-01-23 10:45:10 +01:00
Eric Lippmann
27c1500295
monitoring: Do not translate brackets
2015-01-23 10:41:42 +01:00
Eric Lippmann
a166234e6d
monitoring/security: Hide 'Reschedule check' link if user lacks the respective permission
2015-01-23 10:40:48 +01:00
Eric Lippmann
af2698b075
monitoring: Do not generate 'Schedule downtime' and 'Add comment' links if user lacks the respective permissions
2015-01-23 10:15:55 +01:00
Eric Lippmann
d07e1329e8
monitoring: Use nl2br instead of str_replace for downtime comment and comment text
2015-01-23 09:45:43 +01:00
Eric Lippmann
f47dae1092
monitoring/security: Hide 'Schedule downtime' link if user lacks the respective permission
2015-01-23 09:43:16 +01:00
Eric Lippmann
67be1b329b
monitoring/security: Hide 'Add comment' link if user lacks the respective permission
2015-01-23 09:41:06 +01:00