Commit Graph

1413 Commits

Author SHA1 Message Date
Eric Lippmann 96fb3b5d4b Merge branch 'master' into feature/api-9606 2015-08-25 09:25:59 +02:00
Eric Lippmann e9c7a5894a monitoring: Add DataView::$requiresFilter
refs #9606
2015-08-24 16:01:07 +02:00
Johannes Meyer 9ca278d7b2 Merge branch 'master' into feature/activity-indicators-for-form-submits-8369 2015-08-21 13:37:54 +02:00
Eric Lippmann 155191ca6f Revert "monitoring: Clone the filter before modyfing it in the IdoQuery"
This reverts commit d8f866c2bc.

Master branch contains the fix w/ the proper refs.
2015-08-21 11:24:56 +02:00
Eric Lippmann 90ef288362 monitoring: Clone the filter before modyfing it in the IdoQuery
fixes #9971
2015-08-21 11:24:02 +02:00
Eric Lippmann f722e242fd monitoring: Optimize method order in the DeleteCommentCommand 2015-08-21 10:33:18 +02:00
Eric Lippmann fbb16e5ea2 monitoring: Optimize method order in the DeleteDowntimeCommand 2015-08-21 10:30:41 +02:00
Matthias Jentsch 44271471e3 Allow declarative definitions of badge renderers and improve interface
Allow the data backend, columns and generated tooltips to be defined in the configuration instead of providing subclasses for every new configuration. Provide an abstract BadgeMenuItemRenderer that allows creating Badges with less boilerplate.

fixes #9694
2015-08-20 18:16:33 +02:00
Eric Lippmann d8f866c2bc monitoring: Clone the filter before modyfing it in the IdoQuery 2015-08-20 15:50:02 +02:00
Johannes Meyer 5602d57d0b Indicate that the configuration is being validated
refs #8369
2015-08-20 15:48:41 +02:00
Eric Lippmann 2229665ec6 monitoring: Return an empty filter in Controller::getRestriction() if the authenticated user is not restricted
This is because applyFilter requires a filter object.
2015-08-20 14:24:06 +02:00
Eric Lippmann 432abb1d33 monitoring: Fix call for getting the URL parameters in DataView::handleRequest()
refs #9967
2015-08-20 14:23:03 +02:00
Eric Lippmann dcb1502286 monitoring: Implement Controller::getRestriction()
Controller::applyRestriction() breaks fluent interfaces whereas Controller::getRestriction() doesn't.
2015-08-20 13:11:36 +02:00
Eric Lippmann 310dbdfde5 monitoring: Optimize imports in DataView 2015-08-20 13:11:36 +02:00
Eric Lippmann 4c1375834c monitoring: Add DataView::handleRequest() (WIP)
This method is work in progress as it's missing pagination, sorting and output format handling.

refs #9967
2015-08-20 13:11:18 +02:00
Eric Lippmann 9ea3f73e83 monitoring: Fix query class names not matching the file name 2015-08-19 12:52:38 +02:00
Johannes Meyer 65806fafbf MonitoredObject: Only select history entries for the respective object
And fix that the default sort order is not applied.

fixes #9963
2015-08-19 11:53:00 +02:00
Eric Lippmann 4ab20b9142 monitoring: Eliminate unncessary GROUP BY clauses in the HoststatusQuery
refs #9956
2015-08-19 11:40:37 +02:00
Eric Lippmann 6e12dd4d78 monitoring: Fix service status grouping when selecting group alias columns
refs #9956
2015-08-19 11:39:51 +02:00
Johannes Meyer 7812f6ddcc DataView: Remove obsolete $filter property 2015-08-19 11:23:40 +02:00
Eric Lippmann 18f720d31f monitoring: Eliminate unncessary GROUP BY clauses in the ServicestatusQuery
refs #9956
2015-08-18 16:37:14 +02:00
Eric Lippmann f5ffa8047c monitoring: Fix handling of collated columns w/ PostgreSQL
fixes #9954
fxies #9955
2015-08-18 16:36:00 +02:00
Eric Lippmann e904c26445 monitoring: Fix fetch function in the BackendAvailabilityMenuItemRenderer
fixes #9942
2015-08-18 13:09:34 +02:00
Eric Lippmann 00e206096d monitoring: Don't rely on Icinga updating the is_currently_running column
From version to version this column seems to be buggy as it's not being updated when stopping Icinga.

refs #9942
2015-08-18 13:08:03 +02:00
Johannes Meyer 8b8fb6379d DataView: Provide default labels for non-labelled filter columns
refs #9029
2015-08-17 15:06:52 +02:00
Johannes Meyer 84ac316cde IdoQuery: Allow check if a column is case insensitive compared
refs #9029
2015-08-17 15:05:44 +02:00
Johannes Meyer b061161979 DataView\Statussummary: Adjust how to handle filter columns
refs #9029
2015-08-17 14:07:07 +02:00
Johannes Meyer e20f78bba9 DataView\Servicestatussummary: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:58 +02:00
Johannes Meyer fe9c7a613c DataView\Servicestatus: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:48 +02:00
Johannes Meyer f0488dddf4 DataView\Servicegroupsummary: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:36 +02:00
Johannes Meyer 92cece92ab DataView\Servicegroup: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:26 +02:00
Johannes Meyer 833e177666 DataView\Servicedowntime: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:14 +02:00
Johannes Meyer 66d5513517 DataView\Servicecomment: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:05 +02:00
Johannes Meyer 5d2c389220 DataView\Notification: Adjust how to handle filter columns
refs #9029
2015-08-17 14:05:56 +02:00
Johannes Meyer ebbc2686c8 DataView\Hoststatussummary: Adjust how to handle filter columns
refs #9029
2015-08-17 14:05:49 +02:00
Johannes Meyer 25acebab77 DataView\Hostgroupsummary: Adjust how to handle filter columns
refs #9029
2015-08-17 14:05:37 +02:00
Johannes Meyer 9f8de333ec DataView\Hostgroup: Adjust how to handle filter columns
refs #9029
2015-08-17 14:05:24 +02:00
Johannes Meyer 4dce29e040 DataView\Hostdowntime: Adjust how to handle filter columns
refs #9029
2015-08-17 14:05:16 +02:00
Johannes Meyer a4422c5d94 DataView\Hostcomment: Adjust how to handle filter columns
refs #9029
2015-08-17 14:05:07 +02:00
Johannes Meyer 03a80b3e44 DataView\Eventhistory: Adjust how to handle filter columns
refs #9029
2015-08-17 14:04:59 +02:00
Johannes Meyer 31d67d8479 DataView\Eventgrid: Adjust how to handle filter columns
refs #9029
2015-08-17 14:04:51 +02:00
Johannes Meyer 89915196f2 DataView\Downtime: Adjust how to handle filter columns
refs #9029
2015-08-17 14:04:41 +02:00
Johannes Meyer c3cd63368b DataView\Contact: Adjust how to handle filter columns
refs #9029
2015-08-17 14:04:33 +02:00
Johannes Meyer 37b0b8bc84 DataView\Contactgroup: Adjust how to handle filter columns
refs #9029
2015-08-17 14:04:26 +02:00
Johannes Meyer 80b4d96e9f DataView\Comment: Adjust how to handle filter columns
refs #9029
2015-08-17 14:04:15 +02:00
Johannes Meyer fa1c971e51 DataView\Runtimevariables: Fix method documentation 2015-08-17 14:03:44 +02:00
Johannes Meyer 168819ca83 DataView\Runtimesummary: Fix method documentation 2015-08-17 14:03:34 +02:00
Johannes Meyer 12a1492740 DataView\Programstatus: Fix method documentation 2015-08-17 14:03:24 +02:00
Johannes Meyer 172cf6b3c6 DataView\Command: Fix method documentation 2015-08-17 14:03:05 +02:00
Johannes Meyer fa38998e3d DataView\Customvar: Adjust how to handle filter columns
refs #9029
2015-08-17 13:47:13 +02:00
Johannes Meyer 1643ec4358 DataView\Hoststatus: Adjust how to handle filter columns
refs #9029
2015-08-17 13:46:16 +02:00
Johannes Meyer 57ea5d6d5a DataView: Use a more flexible way to provide filter columns
refs #9029
2015-08-17 12:53:17 +02:00
Johannes Meyer 9faea7c883 DataView: Introduce method getDynamicFilterColumns()
refs #9029
2015-08-14 11:05:22 +02:00
Johannes Meyer 71fba8f7df IdoQuery: Allow to check whether joining custom vars is permitted
refs #9029
2015-08-14 10:05:09 +02:00
Johannes Meyer 40dd094af0 DataView: Implement interface FilterColumns
refs #9029
2015-08-13 14:24:24 +02:00
Johannes Meyer e4f331bff9 DataView: Drop init()
refs #7344
2015-08-13 13:27:28 +02:00
Johannes Meyer 2b049eb6f9 Drop the StatusQuery
refs #7344
2015-08-12 13:41:15 +02:00
Johannes Meyer dc7d3a9c92 ServicestatusQuery: Respect an already set group clause
refs #7344
2015-08-12 13:40:17 +02:00
Johannes Meyer 5ae5b5e8d3 ServicestatusQuery: Add missing query columns
refs #7344
2015-08-12 13:39:30 +02:00
Johannes Meyer e1cec6a849 Drop everything related to join last comments in list views
refs #8616
2015-08-11 15:07:03 +02:00
Johannes Meyer fb3c98c585 Remove some more obsolete code to join service problems 2015-08-11 15:02:31 +02:00
Johannes Meyer b9ea25506e HoststatusQuery: Remove obsolete code to join service problems 2015-08-11 14:12:52 +02:00
Johannes Meyer 3f0d073f43 Merge branch 'master' into bugfix/slow-unhandled-service-summary-query-in-host-overview-9864 2015-08-11 14:01:27 +02:00
Johannes Meyer 00d143cb14 Fetch the service problem summary of a host with less redundant code
refs #9864
2015-08-11 13:52:21 +02:00
Johannes Meyer 78fdf85c7e ReFacTOR HostserviceproblemsummaryQuery
refs #9864
2015-08-11 13:51:30 +02:00
Johannes Meyer 41a1c7ce98 Drop DataView\Hostservicestatussummary
It's unnecessary bloat.

refs #9864
2015-08-11 13:48:41 +02:00
Johannes Meyer 95da3772ce Rename HostservicestatussummaryQuery...
...to HostserviceproblemsummaryQuery.

refs #9864
2015-08-11 13:48:08 +02:00
Johannes Meyer 589f0de063 HostdowntimeQuery: Fix services join 2015-08-11 11:29:48 +02:00
Johannes Meyer 542d7e2db3 HostcommentQuery: Fix services join 2015-08-11 11:29:25 +02:00
Alexander Fuhr 01ec2cd590 Merge branch 'master' into bugfix/downtimes-with-non-problem-state-time-caption-9266 2015-08-10 12:46:13 +02:00
Alexander Fuhr 18dae78d80 MonitoredObject: Add scheduled_end
refs #9266
2015-08-10 12:14:49 +02:00
Eric Lippmann cb0b3c8754 monitoring: Let PHP flush the writer buffer to the command file
refs #9570
2015-08-10 11:31:27 +02:00
Johannes Meyer 03d4386763 Introduce HostservicestatussummaryQuery class
refs #9864
2015-08-07 15:36:24 +02:00
Johannes Meyer 0695d5900c Merge branch 'master' into feature/less-costly-count-queries-for-history-views-8615 2015-08-06 13:11:28 +02:00
Johannes Meyer 7662545c2a SimpleQuery: Provide a getter for the current iterator position
refs #8615
2015-08-06 09:39:23 +02:00
Johannes Meyer c891b9d356 HostgroupsummaryQuery: Fix group statement ambiguity 2015-08-06 07:54:03 +02:00
Johannes Meyer e2e1692462 Wizard: Use IcingaException::describe() in the finish's log where appropriate
fixes #9791
2015-08-05 15:54:45 +02:00
Eric Lippmann bebff5b83e Merge branch 'bugfix/multiselect-restrictions-9574'
fixes #9574
2015-08-04 16:47:15 +02:00
Eric Lippmann 0e14cb48da monitoring: Ignore restrictions if user has the wildcard restriction
resolves #9830
2015-08-04 16:28:45 +02:00
Eric Lippmann 7403c67893 monitoring: Default to Filter::matchAll() in the ObjectList
refs #9574
2015-08-04 15:28:18 +02:00
Markus Frosch a14f800d9e Add support for IPv6 address
refs #9645
2015-08-04 14:02:54 +02:00
Alexander Fuhr dfbcc066a7 MonitoringBackend: Implement the getProgramVersion method
refs #9672
2015-08-04 13:28:32 +02:00
Johannes Meyer 9a0e47a3e1 SimpleQuery: Add method hasResult()
refs #9632
2015-08-03 14:49:33 +02:00
Johannes Meyer 5a3401cc28 monitoring: Reduce amount of default quick search columns
Entering an arbitrary pattern in the quick search field will now only search
for a host's and service's display name or a group's / contact's alias.

fixes #9751
2015-07-31 15:15:13 +02:00
Johannes Meyer 99c69cc461 SimpleQuery: Add support for peek aheads
refs #9661
2015-07-31 13:51:39 +02:00
Eric Lippmann a234852f32 Merge branch 'feature/basic-auth-9660'
resolves #9660
2015-07-30 15:05:07 +02:00
Johannes Meyer e8af4295b1 Allow to manually validate the configuration in the wizard as well
It's a mess...
2015-07-29 10:52:32 +02:00
Eric Lippmann 07849e0fea lib: Rename Authentication/Manager to Authentication/Auth
refs #9660
2015-07-28 17:08:55 +02:00
Eric Lippmann 919c7c52cf monitoring: Fix PHPDoc in DeleteDowntimeCommand 2015-07-28 13:33:56 +02:00
Eric Lippmann dd7d078704 monitoring: Fix PHPDoc in DeleteCommentCommand 2015-07-28 13:33:56 +02:00
Eric Lippmann 901e6754eb monitoring: Define CommandTransportInterface::send() 2015-07-28 12:32:19 +02:00
Eric Lippmann b2fb0a836f monitoring: Move CommandTransportException to the monitoring's exception namespace 2015-07-28 12:32:19 +02:00
Eric Lippmann 4536eacd66 monitoring: Rename TransportException to CommandTransportException 2015-07-28 12:32:19 +02:00
Johannes Meyer d56b31fe5e DataView\Eventhistory: Fix sort rules
refs #6644
2015-07-28 11:42:55 +02:00
Johannes Meyer 247c0f3952 DataView\Customvar: Fix sort rules
refs #6644
2015-07-28 11:42:40 +02:00
Johannes Meyer 1f6bc8ea47 DataView: Implement interface SortRules
refs #6644
2015-07-28 11:41:25 +02:00
Johannes Meyer 998610bafa ProgramstatusQuery: Provide a(nother) fallback for older IDO installations
fixes #9168
2015-07-24 15:46:12 +02:00
Eric Lippmann 12856da971 Merge branch 'bugfix/filter-custom-variables-9692'
fixes #9692
2015-07-24 09:27:05 +02:00
Eric Lippmann a75b1a35c6 monitoring: Don't fail when selecting custom variables while having a group by clause
refs #9692
2015-07-22 13:47:52 +02:00
Eric Lippmann 15cb24c6dc Throw an exception in IdoQuery::getCustomvarColumnName() in case the custom variable has not been joined
Queries extending IdoQuery and using the method getCustomvarColumnName() must be notified in case the custom variable has not been joined.

refs #9692
2015-07-22 12:03:34 +02:00
Eric Lippmann 3ed13366a8 Remove duplicate line in IdoQuery
I introduced this w/ 4522cf5090.
2015-07-22 12:03:34 +02:00
Eric Lippmann 163911ffd7 Indicate empty icinga_programstatus table as problem
fixes #9695
2015-07-21 16:47:17 +02:00
Eric Lippmann 4522cf5090 Add missing return to IdoQuery::getCustomvarColumnName()
Some filter combinations still seem to not work properly.

refs #9692
2015-07-21 15:27:01 +02:00
Johannes Meyer fc8b51c4be ObjectList: Register columns to select even if we're only counting
We should never apply any pseudo optimizations on a higher level if
already the lower level applies them, as the optimization might not
be valid in every circumstance.

fixes #9573
2015-07-07 15:50:40 +02:00
Johannes Meyer c8c0e13184 Wizard: Show a textarea on the finish page instead of multiple paragraphs
refs #7911
2015-07-03 16:31:11 +02:00
Johannes Meyer 74a916d72a Hide feature commands which are not supported by Icinga 2 from the user
fixes #7930
2015-07-03 14:17:06 +02:00
Johannes Meyer 3b63868ed9 MonitoringWizard: Prefer our form error implementation 2015-07-02 09:45:00 +02:00
Johannes Meyer d69ab427a6 MonitoringWizard: Fix documentation 2015-07-02 09:42:59 +02:00
Johannes Meyer 7795ad4f95 WebWizard: Drop preferences page and include ApplicationConfigForm instead
refs #8709
2015-07-01 16:02:40 +02:00
Johannes Meyer f615db01fe WebWizard: Show db resource config right after choosing db as auth type
refs #8709
2015-07-01 14:24:48 +02:00
Johannes Meyer 9c82a24083 ServicestatussummaryQuery: Do not check a host's state twice
I was sure that this is necessary and that the query involved does
not handle this by itself, which it obviously does. I cannot find
another query I might have mistakenly associated with it though...
2015-06-29 16:19:33 +02:00
Johannes Meyer cfd43f251e Revert "Sortable: Allow to check for a particular sort rule"
This reverts commit ae21baa41e.
2015-06-26 15:13:46 +02:00
Johannes Meyer ae21baa41e Sortable: Allow to check for a particular sort rule 2015-06-26 14:54:15 +02:00
Johannes Meyer 86bdf81396 Downtime overview: Add support for quick searches
fixes #8620
2015-06-25 13:24:35 +02:00
Johannes Meyer 8f6bf7ff33 Notification overview: Add support for quick searches
fixes #9506
2015-06-25 13:21:43 +02:00
Johannes Meyer 52761e3f37 Contact overview: Add support for quick searches
fixes #9505
2015-06-25 13:17:36 +02:00
Johannes Meyer 2d4f956b48 Contactgroup overview: Add support for quick searches
fixes #9504
2015-06-25 13:12:54 +02:00
Johannes Meyer a7498ca0d8 HostcommentQuery: Fix grouping when services are being joined
fixes #9503
2015-06-25 13:03:33 +02:00
Johannes Meyer 8b4fb89a4b Comment overview: Add support for quick searches
fixes #9502
2015-06-25 12:59:57 +02:00
Johannes Meyer e3b432d463 Servicegroup overview: Allow to quick filter for services
fixes #9500
2015-06-25 12:48:50 +02:00
Johannes Meyer 5e90971f94 Hostgroup overview: Allow to quick filter for hosts
fixes #9499
2015-06-25 12:45:56 +02:00
Johannes Meyer 18497fee44 Service overview: Allow to quick search for hosts
fixes #9498
2015-06-25 12:24:52 +02:00
Johannes Meyer d29d423cc9 Eventhistory: Provide search columns for quick filters
fixes #9497
2015-06-25 12:22:56 +02:00
Johannes Meyer 20fd3d6758 Fix multiselect views of hosts and services
I've broke this with #9472.
2015-06-24 15:11:33 +02:00
Johannes Meyer 98b01207cf Show intersecting ok-states as well in the default servicegrid view
fixes #9360
2015-06-24 14:37:07 +02:00
Johannes Meyer eabcb6702f Fix incorrect count of unhandled services in the statistics
fixes #9473
2015-06-22 16:16:56 +02:00
Johannes Meyer 5166ede38f Fix that ghost groups are shown in the host- and servicegroup summary
fixes #9454
refs #9458
2015-06-19 14:08:32 +02:00
Johannes Meyer 3b05c62575 IdoQuery: Fix method addFilter() 2015-06-19 14:06:02 +02:00
Johannes Meyer f5554b6aa0 IdoQuery: Handle non translated customvars properly 2015-06-18 16:43:20 +02:00
Johannes Meyer fb9641fb3c Controller: Validate restriction columns 2015-06-18 16:43:20 +02:00
Johannes Meyer 2bffe56bd5 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-18 14:54:01 +02:00
Johannes Meyer dd81de39fd NotificationQuery: Do not fetch non-history related columns for history queries
refs #9009
2015-06-18 14:34:30 +02:00
Johannes Meyer f2425a97d5 Select -1 as `state' for history queries not providing a valid state
PostgreSQL does not seem to be able to union null values with
integers...

refs #9009
2015-06-18 14:33:41 +02:00
Johannes Meyer 77fe094870 ServicedowntimestarthistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:19:25 +02:00
Johannes Meyer dc66c24a1d HostdowntimestarthistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:19:14 +02:00
Johannes Meyer 11ed6d6cfa ServicecommenthistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:19:01 +02:00
Johannes Meyer f20193edb9 HostcommenthistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:18:52 +02:00
Johannes Meyer b56114c824 ServicestatehistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:18:40 +02:00
Johannes Meyer 5c19c05a8a HoststatehistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:18:21 +02:00
Johannes Meyer b25d8e2f34 ServicegroupsummaryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 12:35:41 +02:00
Johannes Meyer a43cae9eb8 HostgroupsummaryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 12:35:21 +02:00
Johannes Meyer 5ef56fc9b2 ServicestatusQuery: Group by host- and servicegroup pk's if required
refs #9009
2015-06-18 12:34:49 +02:00
Johannes Meyer b24b650a94 HoststatusQuery: Group by host- and servicegroup pk's if required
refs #9009
2015-06-18 12:34:30 +02:00
Johannes Meyer e181c57a70 ServicestatusQuery: PostgreSQL grouping...
refs #9009
2015-06-18 12:08:05 +02:00
Johannes Meyer 37103cf72d HoststatusQuery: PostgreSQL grouping...
refs #9009
2015-06-18 11:52:58 +02:00
Johannes Meyer b9479e7da4 ServicegroupQuery: PostgreSQL grouping...
refs #9009
2015-06-18 11:33:09 +02:00
Johannes Meyer b128bef8f0 HostgroupQuery: PostgreSQL grouping...
refs #9009
2015-06-18 11:29:26 +02:00
Johannes Meyer d66b7e85e7 ServicecommentQuery: PostgreSQL grouping...
refs #9009
2015-06-18 11:17:36 +02:00
Johannes Meyer 99b0d63e94 HostcommentQuery: PostgreSQL grouping...
refs #9009
2015-06-18 11:17:14 +02:00
Johannes Meyer 4f42da49a8 ServicenotificationQuery: PostgreSQL grouping...
refs #9009
2015-06-18 10:59:52 +02:00
Johannes Meyer 8ec494c962 HostnotificationQuery: PostgreSQL grouping...
refs #9009
2015-06-18 10:58:59 +02:00
Johannes Meyer 068c0b6ed2 ServicedowntimeQuery: PostgreSQL grouping...
refs #9009
2015-06-18 10:38:15 +02:00
Johannes Meyer 72de85ab7b HostdowntimeQuery: PostgreSQL grouping...
refs #9009
2015-06-18 10:37:54 +02:00
Johannes Meyer 6e40b79b0d DataView\Downtime: Add missing columns host_ and service_state 2015-06-18 10:37:27 +02:00
Johannes Meyer 535b740d0e ContactgroupQuery: PostgreSQL grouping...
refs #9009
2015-06-18 10:09:50 +02:00
Johannes Meyer 9cfca36f46 ContactQuery: PostgreSQL grouping..
refs #9009
2015-06-18 09:39:23 +02:00
Johannes Meyer 1169793213 IdoQuery: Add prototype for dynamic GROUP BY clauses 2015-06-18 09:36:04 +02:00
Johannes Meyer 4d72832933 MonitoredObject: Don't apply restrictions to comments and downtimes
They're already filtered by object_type and the object's name.

refs #9009
2015-06-17 10:11:59 +02:00
Johannes Meyer 5c1cdbc1c8 IdoQuery: Join hosts and services automatically if required for customvars
refs #9009
fixes #9426
2015-06-17 10:00:29 +02:00
Johannes Meyer 486fbd599b HoststatusQuery: Respect IDO schema version
refs #9009
fixes #9425
2015-06-17 09:05:32 +02:00
Matthias Jentsch 3caa5b428a Merge branch 'bugfix/don-t-show-more-than-the-five-worst-pies-in-list-views-8205'
fixes #8205
2015-06-16 18:40:03 +02:00
Johannes Meyer 670d6e93c7 MonitoredObject: Ensure that the filter is applied to all queries
refs #9009
2015-06-16 17:44:29 +02:00
Johannes Meyer d0a7c481c2 MonitoredObjectController: Restrict the historyAction
refs #9009
2015-06-16 17:16:59 +02:00
Johannes Meyer e8058c09c5 Merge branch 'master' into feature/monitoring-restrictions-9009
Conflicts:
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
2015-06-16 17:12:51 +02:00
Johannes Meyer 196450d8cf MonitoredObjectController: Add historyAction 2015-06-16 17:04:36 +02:00
Johannes Meyer e96c6958b2 MonitoredObjectController: Show the service tab, if it was already shown 2015-06-16 16:36:13 +02:00
Johannes Meyer c221e0c082 MonitoredObjectController: Fix link to show a host's services 2015-06-16 16:03:41 +02:00
Johannes Meyer ca678a57e9 Revert "monitoring: Remove the services tab when showing host or service details"
This reverts commit 646cffd62d.
2015-06-16 13:49:04 +02:00
Johannes Meyer bf70ec2802 ServicenotificationQuery: Ensure that notifications not sent to a contact are fetched
refs #9009
2015-06-16 13:29:31 +02:00
Johannes Meyer 42a1d8e56d HostnotificationQuery: Ensure that notifications not sent to a contact are fetched
refs #9009
2015-06-16 13:29:21 +02:00
Johannes Meyer 05e0568ef1 StatusQuery: Fix invalid joins
refs #9009
2015-06-16 09:42:24 +02:00
Johannes Meyer 73e9db3704 ServicestatusQuery: Fix invalid joins
refs #9009
2015-06-16 09:42:13 +02:00
Johannes Meyer c11bd6d7ee ServicestatehistoryQuery: Fix invalid joins
refs #9009
2015-06-16 09:42:04 +02:00
Johannes Meyer 7a5156b0ad ServicenotificationQuery: Fix invalid joins
refs #9009
2015-06-16 09:41:52 +02:00
Johannes Meyer 1dd21c2969 ServicegroupQuery: Fix invalid joins
refs #9009
2015-06-16 09:41:43 +02:00
Johannes Meyer 755da0c210 ServicedowntimestarthistoryQuery: Fix invalid joins
refs #9009
2015-06-16 09:41:36 +02:00
Johannes Meyer 0cc693810b ServicedowntimeQuery: Fix invalid joins
refs #9009
2015-06-16 09:41:26 +02:00
Johannes Meyer 1983c499b0 ServicecommentQuery: Fix invalid joins
refs #9009
2015-06-16 09:41:11 +02:00
Johannes Meyer 13cb52b3cb ServicecommenthistoryQuery: Fix invalid joins
refs #9009
2015-06-16 09:40:59 +02:00
Johannes Meyer 72e5c07da1 HoststatusQuery: Fix invalid joins
refs #9009
2015-06-16 09:40:49 +02:00
Johannes Meyer 627e681e74 HoststatehistoryQuery: Fix invalid joins
refs #9009
2015-06-16 09:40:40 +02:00
Johannes Meyer 379e80b21f HostnotificationQuery: Fix invalid joins
refs #9009
2015-06-16 09:40:30 +02:00
Johannes Meyer 6745b0b677 HostgroupQuery: Fix invalid joins
refs #9009
2015-06-16 09:40:20 +02:00
Johannes Meyer fee6c2f330 HostdowntimestarthistoryQuery: Fix invalid joins
refs #9009
2015-06-16 09:40:10 +02:00
Johannes Meyer ba9d4538f9 HostdowntimeQuery: Fix invalid joins
refs #9009
2015-06-16 09:39:56 +02:00
Johannes Meyer 9a020f0218 HostcommentQuery: Fix invalid joins
refs #9009
2015-06-16 09:39:47 +02:00
Johannes Meyer a70524417e HostcommenthistoryQuery: Fix invalid joins
refs #9009
2015-06-16 09:39:37 +02:00
Johannes Meyer d4f659c544 Revert "NotificationhistoryQuery: Improve JOIN performance"
This reverts commit a6d1115d0f.
Accidentally commited..
2015-06-16 08:13:28 +02:00
Johannes Meyer 10a65f1e27 ServicestatehistoryQuery: Improve JOIN performance
refs #9009
2015-06-16 08:12:16 +02:00
Johannes Meyer 7d9b09fdc8 ServicenotificationQuery: Improve JOIN performance
refs #9009
2015-06-16 08:12:08 +02:00
Johannes Meyer 8bf269c2b3 ServicegroupQuery: Improve JOIN performance
refs #9009
2015-06-16 08:12:00 +02:00
Johannes Meyer c0552b092a ServicedowntimestarthistoryQuery: Improve JOIN performance
refs #9009
2015-06-16 08:11:54 +02:00
Johannes Meyer 39f692e240 ServicedowntimeQuery: Improve JOIN performance
refs #9009
2015-06-16 08:11:45 +02:00
Johannes Meyer bf7e6b3591 ServicecommentQuery: Improve JOIN performance
refs #9009
2015-06-16 08:11:38 +02:00
Johannes Meyer 104c8e7a2b ServicecommenthistoryQuery: Improve JOIN performance
refs #9009
2015-06-16 08:11:29 +02:00
Johannes Meyer a6d1115d0f NotificationhistoryQuery: Improve JOIN performance
refs #9009
2015-06-16 08:11:18 +02:00
Johannes Meyer 4c3592a82e HoststatusQuery: Improve JOIN performance
refs #9009
2015-06-16 08:11:09 +02:00
Johannes Meyer b774b2565f HoststatehistoryQuery: Improve JOIN performance
refs #9009
2015-06-16 08:11:03 +02:00
Johannes Meyer 326013428e HostnotificationQuery: Improve JOIN performance
refs #9009
2015-06-16 08:10:55 +02:00
Johannes Meyer 55a6b79ee5 HostgroupQuery: Improve JOIN performance
refs #9009
2015-06-16 08:10:49 +02:00
Johannes Meyer 0a98cb0255 HostdowntimestarthistoryQuery: Improve JOIN performance
refs #9009
2015-06-16 08:10:42 +02:00
Johannes Meyer e73409eb6d HostdowntimeQuery: Improve JOIN performance
refs #9009
2015-06-16 08:10:32 +02:00
Johannes Meyer 41f1d3307b HostcommentQuery: Improve JOIN performance
refs #9009
2015-06-16 08:10:24 +02:00
Johannes Meyer 1a32d289b8 HostcommenthistoryQuery: Improve JOIN performance
refs #9009
2015-06-16 08:10:16 +02:00
Johannes Meyer 988bc2cf44 ServicestatusQuery: Improve JOIN performance
refs #9009
2015-06-16 08:09:54 +02:00
Matthias Jentsch 42de13a2b9 Merge branch 'feature/ssh-remote-connection-resource-configuration-7595'
resolves #7595
2015-06-15 17:30:42 +02:00
Johannes Meyer 7cbcb91fd7 DataView\Eventhistory: Allow to filter for custom variables
refs #9009
2015-06-15 16:53:22 +02:00
Johannes Meyer 9876a53f8e DataView\Eventgrid: Allow to filter for custom variables
refs #9009
2015-06-15 16:53:13 +02:00
Johannes Meyer c6cf51b44c NotificationQuery: Force that the host and service subqueries are instantiated
Quick and dirty. I do not have enough time for a more proper version...

refs #9009
2015-06-15 16:24:57 +02:00
Johannes Meyer a32f505fdd ObjectList: Fix that setFilter() violates interface Filterable
refs #9009
2015-06-15 16:08:04 +02:00
Johannes Meyer a1e4e6e92b ObjectList: Implement interface Filterable
Allows to use instances of it for Controller::applyRestriction().

refs #9009
2015-06-15 16:05:37 +02:00
Johannes Meyer 09d9d00844 ContactgroupQuery: Do not use Zend_Select::group() but self::group()
Avoids duplicate GROUP BY expressions.
2015-06-15 15:10:58 +02:00
Johannes Meyer 548aec4233 DataView\Contactgroup: Add support for object restrictions
refs #9009
2015-06-15 15:08:04 +02:00
Johannes Meyer b8efe314a0 DbQuery: Ignore wildcard only filters
This increases query performance vastly, since LIKE '%' comparisons
prevent the dbms from utilizing an index.
2015-06-15 13:59:46 +02:00
Johannes Meyer 07ebf11a07 DataView\Contact: Add support for object restrictions
refs #9009
2015-06-15 13:47:48 +02:00
Johannes Meyer 470c4a54a3 Eventgrid: Add support for object restrictions
refs #9009
2015-06-12 16:27:13 +02:00
Johannes Meyer b6a7b43dd0 MonitoringBackend: Enforce that views and queries are of a particular naming scheme
I'm adding this mainly to not to break support with modules which are
utilizing our queries.
2015-06-12 14:46:46 +02:00
Johannes Meyer 4996f569fe monitoring: Ensure that views and queries are all named using the same scheme
That's "SomesuperQuery" and not "SomeSuperQuery", according to most
of the existing queries.
2015-06-12 14:42:49 +02:00
Johannes Meyer 528df1b26a EventHistory: Add support for object restrictions
refs #9009
2015-06-12 12:52:07 +02:00
Johannes Meyer c35be4023b DowntimeendhistoryQuery: Use subqueries to fetch host and service downtimes
refs #9009
2015-06-12 12:45:59 +02:00
Johannes Meyer dadb3853d7 DowntimestarthistoryQuery: Use subqueries to fetch host and service downtimes
refs #9009
2015-06-12 12:45:49 +02:00
Johannes Meyer 95b5bba65c Introduce query ServicedowntimeendhistoryQuery
refs #9009
2015-06-12 12:45:02 +02:00
Johannes Meyer 3ed858269c Introduce query ServicedowntimestarthistoryQuery
refs #9009
2015-06-12 12:44:49 +02:00
Johannes Meyer 7afa4dac9a Introduce query HostdowntimeendhistoryQuery
refs #9009
2015-06-12 12:44:35 +02:00
Johannes Meyer 18d3fcbbf7 Introduce query HostdowntimestarthistoryQuery
refs #9009
2015-06-12 12:44:25 +02:00
Johannes Meyer 51434c7255 CommentdeletionhistoryQuery: Use subqueries to fetch removed host and service comments
refs #9009
2015-06-11 16:16:17 +02:00
Johannes Meyer b7a26c599d Introduce query ServicecommentdeletionhistoryQuery
refs #9009
2015-06-11 16:15:50 +02:00
Johannes Meyer 7ea9051d43 Introduce query HostcommentdeletionQuery
refs #9009
2015-06-11 16:15:29 +02:00
Johannes Meyer 7358eefed8 CommenthistoryQuery: Use subqueries to fetch host and service comments
refs #9009
2015-06-11 15:29:36 +02:00
Johannes Meyer bf85fd62b5 Introduce query ServicecommenthistoryQuery
refs #9009
2015-06-11 15:28:57 +02:00
Johannes Meyer 26e895aedb Introduce query HostcommenthistoryQuery
refs #9009
2015-06-11 15:28:38 +02:00
Johannes Meyer f17e9162eb StatehistoryQuery: Use subqueries for host and service state records
refs #9009
2015-06-11 12:36:10 +02:00
Johannes Meyer 5083301dea Introduce query ServicestatehistoryQuery
refs #9009
2015-06-11 12:35:29 +02:00
Johannes Meyer 0ead8d4821 Introduce query HoststatehistoryQuery
refs #9009
2015-06-11 12:35:15 +02:00
Johannes Meyer ed66c1f2e4 ServicenotificationQuery: Apply query optimization from NotificationhistoryQuery
refs #9009
2015-06-11 12:34:55 +02:00
Johannes Meyer f9948f5513 HostnotificationQuery: Apply query optimization from NotificationhistoryQuery
refs #9009
2015-06-11 12:34:40 +02:00
Johannes Meyer b235bb6982 NotificationQuery: Select placeholder values when joining hosts, again
I've missed that our notification list-view detects based on a attribute's
value of which type a returned row is...

refs #9009
2015-06-10 17:04:00 +02:00
Johannes Meyer 5ad93d138c ServicenotificationQuery: Fix grouping when *all* tables are being joined
refs #9009
2015-06-10 17:01:58 +02:00
Johannes Meyer 0ccb765954 HostnotificationQuery: Fix grouping when *all* tables are being joined
refs #9009
2015-06-10 17:01:46 +02:00
Johannes Meyer 51a3213fca NotificationQuery: Add support for history related queries
refs #9009
2015-06-10 13:10:28 +02:00
Johannes Meyer 41ee39d48f EventHistoryQuery: Do not fetch columns which only exist in one subquery
Uses the same technique as the NotificationhistoryQuery for the output.
2015-06-10 13:08:57 +02:00
Johannes Meyer db816e4a5c ServicegroupsummaryQuery: Fix that the service severity is not being fetched 2015-06-09 12:48:15 +02:00
Johannes Meyer a4ad4e2372 CommentQuery: Fix grouping
There was only one comment for each host or service being fetched.

refs #9009
2015-06-08 18:01:16 +02:00
Johannes Meyer 83c21f08e3 DowntimeQuery: Fix grouping
There was only one downtime for each host or service being fetched.

refs #9009
2015-06-08 18:00:54 +02:00
Johannes Meyer 75c5aab1b9 NotificationQuery: Do not use a placeholder if it's possible to select a real value
refs #9009
2015-06-08 17:23:36 +02:00
Johannes Meyer 9229e460d1 NotificationQuery: Use subqueries to fetch host- and service-notifications
refs #9009
2015-06-08 17:09:24 +02:00
Johannes Meyer 70e3434f33 Introduce class ServicenotificationQuery
refs #9009
2015-06-08 17:07:55 +02:00
Johannes Meyer c0ffe4d690 Introduce class HostnotificationQuery
refs #9009
2015-06-08 17:07:34 +02:00
Eric Lippmann d4a884b233 monitoring: Fix filter columns of the service group summary
refs #9009
2015-06-05 15:49:48 +02:00
Eric Lippmann 382007a8bd monitoring: Add missing filter columns to the service status data view
refs #9009
2015-06-05 15:49:26 +02:00