Commit Graph

706 Commits

Author SHA1 Message Date
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
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
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
Eric Lippmann c77996d5b9 monitoring: Sort the services overview by service severity by default 2015-01-21 09:37:45 +01:00
Eric Lippmann eb6591c176 Merge branch 'master' into bugfix/prefer-display_name-over-name1-name2-7843 2015-01-21 09:36:41 +01:00
Eric Lippmann 5df6828889 monitoring: Remove ununsed sort rule in the ServiceStatus 2015-01-21 09:31:38 +01:00
Eric Lippmann e602717bd9 monitoring: Sort by display_names instead of name1 and name2 by default in the services overview
refs #7843
2015-01-21 09:15:07 +01:00
Eric Lippmann 9e8c897d6f monitoring: Order a data view before dumping 2015-01-21 09:13:10 +01:00
Eric Lippmann ab7a5763a6 monitoring: Sort by host_display_name instead of name1 by default
refs #7843
2015-01-20 16:21:56 +01:00
Eric Lippmann 680b7e4eba monitoring: Prever 'Hostname' over 'Host name' in PHPDoc 2015-01-20 16:11:41 +01:00
Eric Lippmann b0e27c4fe6 monitoring: Remove duplicate array key 'host_check_command' in the StatusQuery 2015-01-20 13:43:53 +01:00
Eric Lippmann 0c35607e37 Merge branch 'bugfix/postgres-wrong-default-timestamps-7919'
fixes #7919
2015-01-19 13:51:19 +01:00
Eric Lippmann 56640fa64f postgres: Use timestamp comparison instead of timezone offset comparison for detecting the default timestamp
refs #7919
2015-01-19 13:50:03 +01:00
Eric Lippmann 64d4bb089c monitoring/setup: Remove function for getting the configuration directory
Getting the config directory is not a task for module wizards.
2015-01-19 11:43:39 +01:00
Eric Lippmann abc74c7fb5 monitoring/setup: Fix directory mode of the monitoring configuration directory
We should introduce a CreateConfigDirectoryStep because module developers must not
provide a directory mode but use our default.
2015-01-19 11:43:38 +01:00