Commit Graph

618 Commits

Author SHA1 Message Date
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
Eric Lippmann 3cbafe16f6 monitoring/security: Move applyRestriction() to the module's base controller 2015-01-27 14:22:37 +01:00
Eric Lippmann 405e18a46f monitoring: Fix PHPDoc for MonitoringBackend::from() 2015-01-27 13:37:28 +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 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
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 5ac1eaa513 monitoring: Fix indents in the GroupsummaryQuery 2015-01-23 11:11:34 +01:00
Eric Lippmann 5967d5fe04 monitoring/security: Hide delete downtime action if user lacks the respective permission 2015-01-22 17:35:34 +01:00
Eric Lippmann a19c155d9f monitoring/security: Hide delete comment action if user lacks the respective permission 2015-01-22 17:33:20 +01:00
Eric Lippmann 4226f06d5d monitoring: Remove unused variable in the MonitoredObjectController 2015-01-22 17:28:33 +01:00
Eric Lippmann f46a587266 monitoring/security: Hide 'Remove Problem Acknowledgement' action if user lacks the respective permission 2015-01-22 17:25:30 +01:00
Eric Lippmann a09ba15859 monitoring/security: Hide 'Check Now' action if user lacks the respective permission 2015-01-22 17:13:35 +01:00
Eric Lippmann 251030e1d8 monitoring: Rename remove-downtime to delete-downtime 2015-01-22 16:03:22 +01:00
Eric Lippmann ba7818db5f monitoring: Restrict delete downtime and delete comment to HTTP POST 2015-01-22 15:49:40 +01:00
Johannes Meyer 6845480b5f Fix that strtoupper can't handle non ascii chars
Fixed by not using strtoupper or by using it prior
to the translation of the corresponding string.

fixes #8163
2015-01-22 14:37:07 +01:00
Johannes Meyer afd58d52bf Merge branch 'master' into feature/more-intuitive-module-installation-8191 2015-01-22 13:33:45 +01:00
Eric Lippmann 1aa91f0228 monitoring: Select host and service display_name for an object's history
refs #7843
2015-01-22 10:57:15 +01:00
Eric Lippmann 4539462bc7 monitoring: Select host_display_name in the host and service object
refs #7843
2015-01-22 10:34:35 +01:00
Eric Lippmann 3055531e2d monitoring: Support sorting by host and service display name in the Comment data view
refs #7843
2015-01-21 16:15:09 +01:00
Eric Lippmann 94be58e121 monitoring: Support host and service display_name columns in the Comment data view
refs #7843
2015-01-21 16:09:36 +01:00
Eric Lippmann a91a2eba68 monitoring: Support host and service display_name columns in the CommentQuery
refs #7843
2015-01-21 16:09:13 +01:00
Eric Lippmann ad879b1ee6 monitoring: Select the host and service display_name columns in the Notification data view
refs #7843
2015-01-21 15:47:36 +01:00
Eric Lippmann d8b1e63231 monitoring: Support host and service display_name in the NotificationQuery
refs #7843
2015-01-21 15:47:10 +01:00
Johannes Meyer 96390d34bf Enable modules as part of the main installation routine
refs #8191
2015-01-21 15:03:34 +01:00
Eric Lippmann 0bcca651b2 monitoring: Remove useless PHPDoc in the NotificationQuery 2015-01-21 13:12:26 +01:00
Johannes Meyer 1f6a81aefb Add Wizard::skipPage()
Required to not to duplicate code in custom wizards and to avoid errors
when detecting the direction.

refs #8191
2015-01-21 13:07:08 +01:00
Eric Lippmann 91b7c31cda monitoring: Support sorting downtimes by host and service display_name
refs #7843
2015-01-21 13:06:03 +01:00
Eric Lippmann 5862fc98a5 monitoring: Sort by 'downtime_scheduled_start' too when sorting by 'Is In Effect' 2015-01-21 12:58:46 +01:00
Eric Lippmann 5f0b809619 monitoring: Support host and service display_name columns in the Downtime data view
refs #7843
2015-01-21 12:52:58 +01:00
Eric Lippmann 85aa447516 monitoring: Support host and service display_name in the DowntimeQuery
refs #7843
2015-01-21 12:52:29 +01:00
Eric Lippmann d528ddc641 monitoring: Fix that host_display_name is NULL when the object is a service in the evenhistory overview
refs #7843
2015-01-21 12:51:47 +01:00
Johannes Meyer 573c1046bb Ensure that the SummaryPage has a unique name when being utilized
refs #8191
2015-01-21 11:44:44 +01:00
Eric Lippmann e881a0de33 monitoring: Remove useless PHPDoc in the DowntimeQuery 2015-01-21 10:35:10 +01:00
Eric Lippmann 3e702ac255 monitoring: Support host and service display_name in the EventHistory data view
refs #7843
2015-01-21 10:28:21 +01:00
Eric Lippmann 25c2e99122 monitoring: Fix duplicate array key 'service_description' in the EventHistoryQuery 2015-01-21 10:26:12 +01:00
Eric Lippmann aa976c4198 monitoring: Support host and service display_name in the EventHistoryQuery
This adds two left joins to the query when selecting host_display_name and service_display_name.
If performance suffers badly, we have to evaluate whether to support the display_name column for displaying
the host and service name in the eventhistory overview.

refs #7843
2015-01-21 10:24:24 +01:00
Eric Lippmann 1bba0b3d0f monitoring: Fix coding style in the EventHistoryQuery 2015-01-21 10:15:58 +01:00
Eric Lippmann 7d967d25b3 monitoring: Fix code style in the StatehistoryQuery 2015-01-21 10:12:14 +01:00
Eric Lippmann 10571c3178 monitoring: Fix duplicate array key 'service_description' in the StatehistoryQuery 2015-01-21 10:10:07 +01:00