Johannes Meyer
9f075e0691
HostgroupQuery: Remove COLLATE from query column `hostgroup_name'
...
refs #8613
2015-04-10 15:19:55 +02:00
Johannes Meyer
92634a1921
DowntimeQuery: Provide case-insensitive filter column `service_host'
...
refs #8613
2015-04-10 14:25:53 +02:00
Johannes Meyer
5ccf6a7efa
DowntimeQuery: Remove redundant query columns
...
refs #8613
2015-04-10 14:25:26 +02:00
Johannes Meyer
0f0727491e
DowntimeQuery: Make query column `author' case-insensitive
...
refs #8613
2015-04-10 14:24:53 +02:00
Johannes Meyer
1c32d8ebe5
DowntimeQuery: Add _name suffix to the query column `downtime_author'
...
...to indicate that it's a case-sensitive column.
refs #8613
2015-04-10 14:23:05 +02:00
Johannes Meyer
b8efe01170
CustomvarQuery: Remove COLLATE from query columns
...
...and provide case-insensitive filter columns alternatively.
refs #8613
2015-04-10 12:56:18 +02:00
Johannes Meyer
0628efb4cd
ContactgroupQuery: Make query column `contact_email' case-insensitive
...
refs #8613
2015-04-10 12:27:44 +02:00
Johannes Meyer
638eda7773
ContactgroupQuery: Make query column `contact_alias' case-insensitive
...
refs #8613
2015-04-10 12:27:24 +02:00
Johannes Meyer
0fe59aa519
Revert "ContactQuery: Provide ci query columns for aliases and email addresses"
...
This reverts commit f00adc2138
.
Conflicts:
modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
2015-04-10 12:23:35 +02:00
Johannes Meyer
03c8de5d7b
ContactgroupQuery: Provide case-insensitive filter column `service_host'
...
refs #8613
2015-04-10 12:20:28 +02:00
Johannes Meyer
31a05a3ec0
DataView\Contactgroup: Add missing query columns
2015-04-10 12:19:19 +02:00
Johannes Meyer
a51b93ebfb
DataView\Contactgroup: Do not permit querying case-insensitive columns
...
refs #8163
2015-04-10 12:17:52 +02:00
Johannes Meyer
71c013178e
ContactgroupQuery: Make query column `contactgroup_alias' case-insensitive
...
refs #8613
2015-04-10 12:14:11 +02:00
Johannes Meyer
6536878d5d
ContactgroupQuery: Remove COLLATE from query column `contact_name'
...
refs #8613
2015-04-10 12:13:23 +02:00
Johannes Meyer
1dc16a1ab6
ContactgroupQuery: Remove COLLATE from query column `contactgroup_name'
...
refs #8613
2015-04-10 12:12:50 +02:00
Johannes Meyer
3d7e418032
ContactQuery: Provide case insensitive filter column `service_host'
...
refs #8613
2015-04-10 09:50:26 +02:00
Johannes Meyer
6d03b2fe8f
DataView\Contact: Add missing filter columns
...
refs #8613
2015-04-10 09:49:47 +02:00
Johannes Meyer
0ec1a18844
ContactQuery: Fix query column `service' not referencing a service's name
...
refs #8613
2015-04-10 09:48:22 +02:00
Johannes Meyer
52dcecfd08
ContactQuery: Change query column `contact_name' to be case sensitive
...
...and provide `contact' as case-insensitive alternative.
refs #8613
2015-04-10 09:46:41 +02:00
Johannes Meyer
f00adc2138
ContactQuery: Provide ci query columns for aliases and email addresses
...
refs #8613
2015-04-10 09:45:23 +02:00
Johannes Meyer
ea874f8402
*historyQuery: Remove COLLATE from `host_name' and `service_description'
...
refs #8613
2015-04-09 15:29:01 +02:00
Johannes Meyer
51bf5cfbc8
*historyQuery: Drop redundant query columns
...
refs #8613
2015-04-09 15:13:59 +02:00
Johannes Meyer
9e79419eb1
EventHistoryQuery: Provide `hostgroup_name' as alternative to `hostgroup'
...
This can't be queried though until #7274 has been resolved.
refs #8613
2015-04-09 14:44:10 +02:00
Johannes Meyer
ec67c28629
DataView\EventHistory: Do not permit `host' and `service' to be queried
...
refs #8613
2015-04-09 14:41:10 +02:00
Johannes Meyer
b7e1c2d518
EventHistoryQuery: Remove COLLATE from the column `service_description'
...
refs #8613
2015-04-09 14:40:12 +02:00
Johannes Meyer
ae10e01ed6
EventHistoryQuery: Remove COLLATE from the column `host_name'
...
refs #8613
2015-04-09 14:39:47 +02:00
Johannes Meyer
2c38ccda5c
EventHistoryQuery: Drop column `service_host_name'
...
refs #8613
2015-04-09 14:19:31 +02:00
Johannes Meyer
bc6a086ff8
DataView\Comment: Do not permit `comment_author' to be queried
...
refs #8163
2015-04-09 13:08:49 +02:00
Johannes Meyer
5372dfb7f1
Fetch a comment's author using `comment_author_name'
...
refs #8613
2015-04-09 13:07:50 +02:00
Johannes Meyer
21c76010d4
CommentQuery: Add `comment_author_name' as additional query column
...
refs #8613
2015-04-09 13:06:38 +02:00
Johannes Meyer
8ed1c8eeb6
DataView\Comment: Add `service_host_name' as allowed query column
...
refs #8613
2015-04-09 12:56:31 +02:00
Johannes Meyer
002b820835
CommentQuery: Provide `service_host' additionally to `service_host_name'
...
refs #8613
2015-04-09 12:55:57 +02:00
Johannes Meyer
480f5516d6
DataView\Comment: Do not permit querying `host' and `service'
...
refs #8613
2015-04-09 12:53:28 +02:00
Johannes Meyer
cb95f53dba
CommentQuery: Fetch and display object names with their initial collation
...
i.e. `host_name' instead of `comment_host' alias `host'
and `service_description' instead of `comment_service' alias `service'.
refs #8613
2015-04-09 12:49:06 +02:00
Johannes Meyer
f7550f55c1
Permit to filter hosts and services by hostgroup_name and servicegroup_name
...
refs #8613
2015-04-09 11:41:56 +02:00
Matthias Jentsch
878ef05896
Fix "show all downtimes" links
...
refs #8565
2015-04-09 11:19:13 +02:00
Johannes Meyer
09ab601942
Require `service_description' instead of `service' to show a particular service
...
`service' implies that it is possible to provide case-less identifiers which is
*not* possible.
refs #8613
2015-04-08 16:49:52 +02:00
Johannes Meyer
b93d18a0fc
Require `host_name' instead of `host' to show or list particular objects
...
`host' implies that it is possible to provide case-less identifiers which is
*not* possible.
refs #8613
2015-04-08 16:25:29 +02:00
Alexander A. Klimov
20b09d3bda
Inherit from Icinga\Web\Controller rather than from Icinga\Web\Controller\ModuleActionController
2015-04-08 15:13:59 +02:00
Johannes Meyer
c56c5655bd
Do not permit querying columns with changed collation and a valid alternative
...
refs #8613
2015-04-08 14:51:04 +02:00
Johannes Meyer
9557585f6a
Add an additional column for servicegroup names with unchanged collation
...
refs #8613
2015-04-08 14:49:18 +02:00
Johannes Meyer
c476ee6855
Add an additional column for hostgroup names with unchanged collation
...
refs #8613
2015-04-08 14:42:57 +02:00
Johannes Meyer
98c76a693e
Do not adjust the collation when querying service descriptions
...
refs #8613
2015-04-08 14:41:13 +02:00
Johannes Meyer
b449127680
Do not adjust the collation when querying host names
...
refs #8613
2015-04-08 14:40:34 +02:00
Matthias Jentsch
9ac89edb86
Add filter to summary links
...
Add the multiselection filter as a base filter to the state summary, to ensure that the summary links only selected services.
refs #8565
2015-04-07 18:00:36 +02:00
Matthias Jentsch
46da404452
Add docstrings to ObjectList and coding style
2015-04-07 16:34:20 +02:00
Matthias Jentsch
1c5a091584
Generate filter in host and service lists
...
refs #8565
2015-04-07 16:29:10 +02:00
Alexander Klimov
967a2e82dc
Use (only) "@return $this" in fluent interfaces' documentation
2015-04-07 14:24:11 +02:00
Matthias Jentsch
5619ac960c
Add inline pies to host and service back to multi-select views
...
Add old inline pie code and visualize handled/unhandled state.
refs #8565
2015-04-02 16:25:20 +02:00
Eric Lippmann
06d9e4113c
Fix that sending multiple commands over SSH failed
...
The config object has to cloned before unsetting the transport because else the
transport is removed for all subsequent calls to CommandTransport::fromConfig().
fixes #8815
2015-04-01 13:53:44 +02:00
Matthias Jentsch
b0b0ae157c
Turn prepareStateName into more generic string utility function
...
refs #8565
2015-03-31 16:45:21 +02:00
Eric Lippmann
ab1dc1faa0
Do not translate format strings
2015-03-30 11:28:05 +02:00
Eric Lippmann
0a7e76d190
Fix typo in Perfdata::formatLabel()'s PHPDoc
2015-03-30 11:27:17 +02:00
Eric Lippmann
f1cdc8c904
Sort host and service overview by display_name by default
...
refs #8716
2015-03-13 17:19:56 +01:00
Eric Lippmann
dbb5aba737
Sort by host_display_name too when sorting by host_severity
...
refs #8716
2015-03-13 17:14:14 +01:00
Eric Lippmann
03d85ac6ae
Sort by service_display_name too when sorting by service_severity
...
refs #8716
2015-03-13 17:13:52 +01:00
Eric Lippmann
7ddd8d7ad2
Add support for order next to the column to DataView::getSortRules()
...
refs #8716
2015-03-13 17:12:16 +01:00
Eric Lippmann
e17f9d7ebe
Sort host overview by severity by default ...
...
... as indicated by the sort control.
2015-03-13 17:08:36 +01:00
Eric Lippmann
32487e4e21
Ignore settings from instances.ini that don't have a setter on the transport class used
...
fixes #8543
2015-03-13 03:41:33 +01:00
Eric Lippmann
1c8c49e732
Select service_is_reachable in the service detail view
...
refs #6875
2015-03-13 00:26:02 +01:00
Eric Lippmann
37823f0415
Select host_is_reachable in the host detail view
...
refs #6875
2015-03-13 00:25:44 +01:00
Eric Lippmann
a4731ebbb3
Select is_reachable from host and service status
...
refs #6875
2015-03-13 00:25:08 +01:00
Eric Lippmann
be041435d3
Merge branch 'bugfix/unnecessary-joins-8614'
...
fixes #8614
2015-03-12 16:47:10 +01:00
Marius Hein
cb28f00c4d
Merge branch 'master' into feature/custom-notification-command-8644
2015-03-12 16:45:57 +01:00
Eric Lippmann
53626ccfeb
Merge branch 'master' into bugfix/unnecessary-joins-8614
2015-03-12 16:40:16 +01:00
Eric Lippmann
7156bd7dfb
Fetch object comments by host_name and service_description
...
refs #8614
2015-03-12 16:39:20 +01:00
Eric Lippmann
29b5e4fd43
Add host_name and service_description columns w/o collation to the comment query
...
refs #8614
2015-03-12 16:38:32 +01:00
Eric Lippmann
112f8eb2f9
Remove COLLATE from host_name and service_description in the Contactgroup query
...
refs #8614
refs #8613
2015-03-12 16:33:28 +01:00
Eric Lippmann
7212434856
Remove COLLATE from host_name and service_description in the Contact query
...
refs #8614
refs #8613
2015-03-12 16:32:05 +01:00
Marius Hein
df3d81e181
SendCustomNotificationCommand: Update phpdoc strings
...
refs #8644
2015-03-12 16:30:11 +01:00
Eric Lippmann
8563d5ed3f
PHPDoc: Use @var instead of @type
...
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
2015-03-12 16:08:47 +01:00
Marius Hein
ddc8dd5d4c
Add command send custom notification to monitoring module
...
refs #8644
2015-03-12 16:08:22 +01:00
Thomas Gelf
16ca8d0654
StatusQuery: fix join on wrong alias
...
Looks like a copy & paste error, resulted in hosts been shown multiple
times.
fixes #8699
2015-03-12 09:46:38 +01:00
Eric Lippmann
361afdcf13
Use ! empty in favor of count > 0 in the MonitoredObjectController
...
refs #8614
2015-03-11 14:08:43 +01:00
Eric Lippmann
2286ab1846
Merge branch 'master' into bugfix/unnecessary-joins-8614
2015-03-11 13:38:07 +01:00
Eric Lippmann
0286641369
Don't fetch comments and downtimes twice in an object's detail view
...
The controller counts comments and downtimes on the object, which will automatically fetch comments and downtimes.
After that came a call to MonitoredObject::populate() which again fetched comments and downtimes.
Now the object is populated before counting comments and dowtimes.
refs #8614
2015-03-11 13:32:54 +01:00
Eric Lippmann
b501fef62b
Rearrange columns in the Host object
...
refs #8614
2015-03-11 13:10:55 +01:00
Eric Lippmann
ef4970c0c1
Don't select host_process_performance_data twice in the host detail view
...
refs #8614
2015-03-11 13:08:53 +01:00
Eric Lippmann
84f56f4e51
Don't select host_problem in the host detail view
...
The column host_problem is not used in the host detail view.
refs #8614
2015-03-11 13:08:11 +01:00
Eric Lippmann
37d09511c6
Don't select host_modified_host_attributes in the host detail view
...
The column host_modified_host_attributes is not used in the host detail view.
refs #8614
2015-03-11 13:07:33 +01:00
Eric Lippmann
e72670cb75
Use default sorting for an object's event history
...
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann
ea32d3dfb3
Add PHPDoc to the EventHistory query
...
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann
c69a46d005
Add PHPDoc to the Downtime query
...
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann
132ae9e44c
Use {@inheritdoc} in the Comment data view ...
...
... instead of duplicating method documentation.
refs #8614
2015-03-11 12:57:43 +01:00
Eric Lippmann
5ed6838f50
Don't select host_display_name twice in the service detail view
...
refs #8614
2015-03-10 14:18:08 +01:00
Eric Lippmann
e6949eaab4
Reorder columns to select in the Service object
...
refs #8614
2015-03-10 14:17:09 +01:00
Eric Lippmann
fcb94af93c
Don't select service_process_performance_data twice in the service detail view
...
refs #8614
2015-03-10 14:11:50 +01:00
Eric Lippmann
e0acebf474
Don't select service_host_name in the service detail view
...
We already select the host_name.
refs #8614
2015-03-10 14:09:53 +01:00
Eric Lippmann
62f0f5b6a4
Don't select service_modified_service_attributes in the service detail view
...
The column service_modified_service_attributes is not used in the service detail view.
refs #8614
2015-03-10 14:00:17 +01:00
Eric Lippmann
87e5bdfa4c
Do not select columns for check attempt twice in the service detail view
...
The column service_attempt is used in favor of service_current_check_attempt and service_max_check_attempts.
refs #8614
2015-03-10 13:47:20 +01:00
Eric Lippmann
0cc6b5d0c2
Don't select service_last_time_* in the service detail view
...
The columns service_last_time_ ok, warning, critical and unknown are not used in the service detail view.
refs #8614
2015-03-10 13:46:09 +01:00
Eric Lippmann
70ef6263b2
Don't select service_last_hard_state* in the service detail view
...
The columns service_last_hard_state and service_last_hard_state_change are not used in the service detail view.
refs #8614
2015-03-10 13:45:20 +01:00
Eric Lippmann
88dce0c1f4
Don't select host and service columns in the service detail view
...
The columns host and service are not used in the service detail view.
refs #8614
2015-03-10 13:42:53 +01:00
Eric Lippmann
3bbd68dc95
Don't select service_problem in the service detail view
...
The column service_problem is not used in the service detail view.
refs #8614
2015-03-10 13:38:12 +01:00
Eric Lippmann
4e308016bf
Don't select service_hard_state in the service detail view
...
The column service_hard_state is not used in the service detail view.
refs #8614
2015-03-10 13:37:40 +01:00
Eric Lippmann
d65aa39ebd
Don't select host_modified_host_attributes in the service detail view
...
The column host_modified_host_attributes is not used in the service detail view.
refs #8614
2015-03-10 13:33:17 +01:00
Eric Lippmann
34ad174f89
Don't select host_last_time_* in the service detail view
...
The columns host_last_time_ up, down and unreachable are not used in the service detail view.
refs #8614
2015-03-10 13:32:28 +01:00
Eric Lippmann
2cbeab55da
Don't select host_last_hard_state* in the service detail view
...
The columns host_last_hard_state and host_last_hard_state_change are not used in the service detail view.
refs #8614
2015-03-10 13:31:32 +01:00
Eric Lippmann
232b3d3a9f
Don't select host_perfdata in the service detail view
...
The column host_perfdata is not used in the service detail view.
refs #8614
2015-03-10 13:30:03 +01:00
Eric Lippmann
e1dbe0b9a7
Don't select host_severity in the service detail view
...
The column host_severity is not used in the service detail view.
refs #8614
2015-03-10 13:29:39 +01:00
Eric Lippmann
9146a62573
Don't select host_ipv4 in the service detail view
...
The column host_ipv4 is not used in the service detail view.
refs #8614
2015-03-10 13:28:44 +01:00
Eric Lippmann
5f57e290c7
Don't select host_notes_url in the service detail view
...
The column host_notes_url is not used in the service detail view.
refs #8614
2015-03-10 13:27:07 +01:00
Eric Lippmann
0f65f83374
Don't select host_action_url in the service detail view
...
The column host_action_url is not used in the service detail view.
refs #8614
2015-03-10 13:26:47 +01:00
Eric Lippmann
b9ec2844f5
Don't select host_unhandled_services in the service detail view
...
The column host_unhandled_services is not used in the service detail view.
refs #8614
2015-03-10 13:25:25 +01:00
Eric Lippmann
4102ee290b
Don't select host_last_check in the service detail view
...
The column host_last_check is not used in the service detail view.
refs #8614
2015-03-10 13:22:28 +01:00
Eric Lippmann
151d87f38c
Don't select host_is_flapping in the service detail view
...
The column host_is_flapping is not used in the service detail view.
refs #8614
2015-03-10 13:19:37 +01:00
Eric Lippmann
da7f959db5
Don't select host_long_output in the service detail view
...
The column host_long_output is not used in the service detail view.
refs #8614
2015-03-10 13:09:59 +01:00
Eric Lippmann
9dc6e65e5f
Don't select host_output column in the service detail view
...
The column host_output is not used in the service detail view
refs #8614
2015-03-10 13:05:54 +01:00
Eric Lippmann
6d78ab69ef
Don't select service_severity column in the service detail view
...
The column service_severity is not used in the service detail view.
refs #8614
2015-03-10 13:03:55 +01:00
Eric Lippmann
2ba5e8eb0c
Don't select service_unhandled column in the service detail view
...
The column service_unhandled is not used in the service detail view.
refs #8614
2015-03-10 13:02:57 +01:00
Eric Lippmann
b2bb5af0a7
Don't select host_problem in the service detail view
...
The column host_problem is not used in the service detail view.
refs #8614
2015-03-10 13:01:41 +01:00
Johannes Meyer
f4446cbade
Add todo to the MonitoringWizard related to the livestatus backend type
...
The requirement should be added to the OR-set that has currently both
ido requirement sets so that livestatus may the only choice again.
refs #8254
2015-03-10 11:00:51 +01:00
Eric Lippmann
af4bce3557
Do not select icon_image columns in the service detail view
...
The columns host_icon_image and service_icon_image are not used in the service detail view.
refs #8665
refs #8614
2015-03-10 10:00:07 +01:00
Eric Lippmann
330b575c7c
Remove duplicate service_last_check column from the service detail view select
...
refs #8614
2015-03-10 09:58:36 +01:00
Eric Lippmann
2d3fec9a42
Do not select host_state_type in the service detail view
...
The column host_state_type is not used in the service detail view.
refs #8614
2015-03-10 09:57:51 +01:00
Johannes Meyer
bc450c573d
Refactor and fix requirement evaluation
...
refs #8508
2015-03-10 09:12:06 +01:00
Johannes Meyer
e80786d63d
Rename Requirements to RequirementSet
...
refs #8508
2015-03-09 09:05:56 +01:00
Matthias Jentsch
266e781a93
Deduplicate Hosts and Services-Controller
...
Create functions in abstract class for filtering hosts and services, instead of reimplementing it in the controller.
2015-03-06 17:52:06 +01:00
Matthias Jentsch
1cfcb934b0
Deduplicate state summary
...
Use existing partials for rendering the state summary instead of a new one.
refs #8565
2015-03-06 17:30:59 +01:00
Eric Lippmann
7317aa7158
Do not join hosts when fetching a service's downtimes
...
refs #8614
2015-03-06 13:14:20 +01:00
Eric Lippmann
db99c323cc
Add host and service name columns to the Downtime data view
...
refs #8614
2015-03-06 13:13:48 +01:00
Eric Lippmann
6d43673754
Do not always join host and service status in the DowntimeQuery
...
Now the hoststatus and servicestatus tables are only joined if necessary.
refs #8614
2015-03-06 13:13:02 +01:00
Eric Lippmann
64d1d12c73
Do not join icinga_hosts when fetching a service's contact groups
...
refs #8614
2015-03-06 10:02:20 +01:00
Eric Lippmann
2b91ec7f2c
Comment out unused query in the ContactgroupQuery
...
refs #8614
2015-03-06 09:54:12 +01:00
Eric Lippmann
fc403e693b
Fix array indentation in the ContactQuery
...
refs #8614
2015-03-06 09:46:47 +01:00
Eric Lippmann
dc223128bb
Remove host_- and service_object_id from ContactQuery's columnMap
...
We do not use these columns.
refs #8614
2015-03-05 17:18:52 +01:00
Johannes Meyer
551207b5b8
Add grouped database dependencies to the monitoring wizard
...
refs #8508
2015-02-26 10:50:45 +01:00
Johannes Meyer
04630a20be
Implement all known requirements as object
...
refs #8508
2015-02-25 13:39:59 +01:00
Johannes Meyer
f6cbc17ff7
Add proper titles to all host/service tabs
...
refs #8458
2015-02-23 16:56:49 +01:00
Johannes Meyer
e588ea2714
Fix filter expression handling when lowering to achieve case-insensitivity
...
fixes #8435
2015-02-16 13:05:24 +01:00
Eric Lippmann
6bae2e0a53
Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL
2015-02-04 10:52:27 +01:00
Eric Lippmann
5b5ad0acb9
monitoring/security: Add missing permission checks of command actions
2015-02-03 17:36:53 +01:00
Eric Lippmann
49e96b7200
Revert "monitoring/security: Guard delete comment action"
...
This reverts commit 4ef5f0c813
.
2015-02-03 16:51:00 +01:00
Eric Lippmann
5b4fab0750
Add license header
...
This time without syntax errors hopefully :)
2015-02-03 16:27:59 +01:00
Eric Lippmann
5fa2e3cfdc
Revert "Add license header"
...
This reverts commit 338d067aba
.
2015-02-03 16:16:26 +01:00
Johannes Meyer
04edf0d075
Fix that the search is case-sensitive in case of a PostgreSQL backend
...
fixes #8083
2015-02-03 16:15:59 +01:00
Eric Lippmann
4ef5f0c813
monitoring/security: Guard delete comment action
2015-02-03 16:11:56 +01:00
Eric Lippmann
d701f9a354
monitoring/security: Guard delete downtime action
2015-02-03 16:11:29 +01:00
Eric Lippmann
338d067aba
Add license header
...
fixes #7788
2015-02-03 15:51:04 +01:00
Thomas Gelf
b54a12c2d5
HostActionsHook: document the new hook
2015-02-02 18:17:30 +01:00
Thomas Gelf
45bf071db6
HostActionsHook: initial very simple implementation
...
refs #8208
2015-02-02 17:44:29 +01:00
Johannes Meyer
8b377cd651
Use the new command-view scripts
2015-02-02 16:30:52 +01:00
Eric Lippmann
f9047e85c5
monitoring: Fix wrong unhandled service problems count in the hosts overview
...
The query was missing the is_active = 1 condition. I'll open an issue for the other
affected queries.
fixes #8013
2015-02-02 11:12:27 +01:00
Johannes Meyer
bf470125c3
Merge branch 'master' into feature/create-missing-directories-when-creating-inis-8219
...
Conflicts:
modules/monitoring/library/Monitoring/MonitoringWizard.php
2015-01-30 16:21:42 +01:00
Johannes Meyer
6416fc421c
Do not create directories which are created automatically if necessary
...
refs #8219
2015-01-30 15:43:39 +01:00
Johannes Meyer
e8619686ae
Add the sockets module as optional requirement of the monitoring module
2015-01-30 13:01:51 +01:00
Johannes Meyer
63305fdf9a
Add Icinga\Application\Config::saveIni()
...
Simplifies saving INI files. Icinga\File\Ini\IniWriter does already require an
instance of Icinga\Application\Config so it's obvious to give "Config" the
task to initialize the writer.. We do also have a central place to handle
creating missing ancestor directories now.
refs #8219
2015-01-30 09:32:08 +01:00
Eric Lippmann
7bf6bd39e9
monitoring: Implement Filterable in MonitoredObject
2015-01-27 14:54:21 +01:00
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
b2f93abb12
monitoring/security: Require a Filterable instead of a DataView in applyRestriction()
2015-01-27 14:24:56 +01:00