Commit Graph

598 Commits

Author SHA1 Message Date
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
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
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 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 66d76e7ad9 monitoring: Add host_notes to the host status query
refs #9009
2015-06-05 15:30:49 +02:00
Eric Lippmann 8cbb83d630 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-05 15:29:16 +02:00
Eric Lippmann 4dc2eb9f4a monitoring: Use soft states in the host status summary query again
refs #9009
2015-06-05 15:01:08 +02:00
Eric Lippmann 2e059a9bb7 monitoring: Use soft states in the host group summary again
refs #9009
2015-06-05 15:00:14 +02:00
Eric Lippmann 80c80436cf monitoring: Support restricting service groups of a service
refs #9009
2015-06-05 14:42:49 +02:00
Eric Lippmann bbcd6e3a2b monitoring: Support restricting host groups of a host
refs #9009
2015-06-05 14:42:11 +02:00
Eric Lippmann c735ee799c monitoring: Remove unnecessary group call in the host downtime query
refs #9009
2015-06-05 14:41:25 +02:00
Eric Lippmann 52a0ad363f monitoring: Remove unnecessary group call in the host comment query
refs #9009
2015-06-05 14:40:17 +02:00
Eric Lippmann 2b3acc99e2 monitoring: Use host and service status queries in the status summary query
refs #9009
2015-06-05 12:42:27 +02:00
Eric Lippmann b69b47277e monitoring: Add columns the to host status query required by the tactical overview
refs #9009
2015-06-05 12:37:29 +02:00
Eric Lippmann 99b5c7b243 monitoring: Add columns the to service status query required by the tactical overview
refs #9009
2015-06-05 12:36:56 +02:00
Eric Lippmann 55921b4854 monitoring: Fix service status query regarding handled/unhandled and using distinct
refs #9009
2015-06-05 11:49:00 +02:00
Eric Lippmann c08a98f6ac monitoring: Use grouping instead of distinct in the host status query
refs #9009
2015-06-05 11:48:33 +02:00
Eric Lippmann c993ee63b7 monitoring: Use grouping instead of distinct in the service downtime query
refs #9009
2015-06-05 11:48:03 +02:00
Eric Lippmann c3c1993870 monitoring: Use grouping instead of distinct in the service comment query
refs #9009
2015-06-05 11:47:39 +02:00
Eric Lippmann 2539e51549 monitoring: Use grouping instead of distinct in the host downtime query
refs #9009
2015-06-05 11:47:07 +02:00
Eric Lippmann 044027772d monitoring: Use grouping instead of distinct in the host comment query
refs #9009
2015-06-05 11:46:45 +02:00
Eric Lippmann e0b117915a monitoring: Use a sub select in the service status summary
refs #9009
2015-06-05 10:28:50 +02:00
Eric Lippmann 76e2d8f5ee monitoring: Add service_last_state_change to the service status query
refs #9009
2015-06-05 10:17:54 +02:00
Eric Lippmann 3f02197891 monitoring: Remove allowCustomVars form the host status summary query
allowCustomVars is not needed on this query because all filters are passed to the underlying query.

refs #9009
2015-06-05 10:17:07 +02:00
Eric Lippmann 480becd3d6 monitoring: Fix pagination of the host group overview
refs #9009
2015-06-05 10:16:41 +02:00
Eric Lippmann 7b176261f8 monitoring: Add query for service group summaries
refs #9009
2015-06-05 10:16:17 +02:00
Eric Lippmann 1ea7335b96 monitoring: Support filtering the service group summary by service custom variables
refs #9009
2015-06-05 09:15:09 +02:00
Eric Lippmann 28b1cf5762 monitoring: Support joining the service status query by service groups
refs #9009
2015-06-05 09:13:17 +02:00
Eric Lippmann b409609df7 monitoring: Use sub query count when joining service related tables to the host query
Fixes count problems.

refs #9009
2015-06-05 09:11:10 +02:00
Eric Lippmann 131af8e818 monitoring: Add host status summary query
refs #9009
2015-06-03 14:14:55 +02:00
Eric Lippmann 8e88864f4a monitoring: Fix host columns of the service status query
refs #9009
2015-06-03 12:54:51 +02:00
Eric Lippmann d1bb19d037 monitoring: Add service status summary query
refs #9009
2015-06-03 12:48:04 +02:00
Eric Lippmann 082f9b1edd monitoring: Don't provide unnecessary columns in the host group summary query
refs #9009
2015-06-03 12:26:01 +02:00
Eric Lippmann 71f19b2cc6 monitoring: Add missing columns to the service status query
refs #9009
2015-06-03 11:48:34 +02:00
Eric Lippmann 761de2eb33 monitoring: Fix a join condition in the host status query
refs #9009
2015-06-03 11:48:14 +02:00
Eric Lippmann 798f4adc34 monitoring: Add query for the host group summary
refs #9009
2015-06-03 11:40:03 +02:00
Johannes Meyer cd0c418854 Merge branch 'master' into feature/user-and-group-management-8826 2015-06-02 10:44:13 +02:00
Eric Lippmann 16ab26cb7c monitoring: Remove unused alias from the downtime query
refs #9009
2015-05-29 15:36:03 +02:00
Eric Lippmann 85c21b042d monitoring: Use the host and service comment queries in the comment query
refs #9009
2015-05-29 15:35:39 +02:00
Eric Lippmann 3c15b2b972 monitoring: Add service comment query
refs #9009
2015-05-29 15:34:52 +02:00
Eric Lippmann ebe8a409e3 monitoring: Add host comment query
refs #9009
2015-05-29 15:34:18 +02:00
Eric Lippmann 0729973045 monitoring: Add last *comment columns to the host status queries 2015-05-29 15:07:06 +02:00
Eric Lippmann e71682ffb3 monitoring: Don't join downtimes in the servicestatus query
refs #9009
2015-05-29 13:20:01 +02:00
Eric Lippmann ba07077ca8 monitoring: Don't join downtimes in the hoststatus query
refs #9009
2015-05-29 13:13:28 +02:00
Eric Lippmann 6e94755c4c monitoring: Use host and service downtime query in the downtime query
refs #9009
2015-05-29 13:12:34 +02:00
Eric Lippmann 02cabf3a50 monitoring: Add query for service downtimes
refs #9009
2015-05-29 13:11:48 +02:00
Eric Lippmann 3e53426ece monitoring: Add query for host downtimes
refs #9009
2015-05-29 13:10:20 +02:00
Eric Lippmann b1446fcb23 monitoring: Allow the hoststatus query to be filtered by restrictable columns
refs #9009
2015-05-29 11:43:41 +02:00
Eric Lippmann 4544653c2e monitoring: Don't apply restrictions in the downtime query
Restrictions should be applied from the controller.

refs #9009
2015-05-29 11:41:39 +02:00
Johannes Meyer 58d78f59f3 DbQuery: Initialize self::$select as early as possible
I'd like to use Zend's implementation instead of re-inventing the wheel just
because someone decided to only work with a copy of it in the frameworks
query but do exactly the opposite in the monitoring module's IDO query...
2015-05-28 13:49:36 +02:00
Eric Lippmann bb9b9bc754 monitoring: Apply host and service restrictions to downtimes
refs #9009
refs #9319
2015-05-26 17:05:47 +02:00
Eric Lippmann 788481e2b1 monitoring: Add Servicestatus query
refs #7344
refs #9009
2015-05-26 17:02:41 +02:00
Eric Lippmann 18499a4a59 monitoring: Support joining downtimes on the Hoststatus query
refs #7344
refs #9009
2015-05-26 17:02:13 +02:00
Eric Lippmann b0576d93de monitoring: Support selecting NULL as column
refs #9009
2015-05-26 17:00:56 +02:00
Eric Lippmann e9dd69267c monitoring: Prepare HoststatusQuery to be used when viewing hosts
The Hoststatusquery does not include the joins for last ack, comment and downtime as where unsure whether or not we will still support this.

refs #7344
refs #9009
2015-05-26 17:00:24 +02:00
Matthias Jentsch 4ac7557c2f Show host and service notes in the host and service detail view
refs #8235
2015-05-26 16:40:32 +02:00
Marius Hein 57abafd10b Merge branch 'master' into bugfix/customvars-case-insensitive-8696 2015-05-21 16:51:04 +02:00
Marius Hein 7c04664888 Make MySQL collation syntax default
Overwrite customVarsJoinTemplate for Postgres and Oracle.

refs #8696
2015-05-21 16:09:03 +02:00
Matthias Jentsch 8ce9989243 Merge branch 'feature/support-icon-image-alt-9300'
resolves #9300
2015-05-21 15:03:06 +02:00
Matthias Jentsch 598ef1e8f4 Add alt-text to icon_images
Print alt-text as title and alt-attribute in the helper class and add the alt-column to the backend query.

refs #9300
2015-05-21 14:59:12 +02:00
Marius Hein e8e3b940af Use CustomVariable names case insensitive
refs #8696
2015-05-21 14:42:09 +02:00
Eric Lippmann 57328aa6ed monitoring: Make host group and service group alias columns case insensitive
The alias columns should be case insenstive because we now support them when searching.

refs #8241
2015-05-21 13:58:54 +02:00
Eric Lippmann 0c72686ba1 monitoring: Make display_name columns case insensitive
The display_name columns should be case insenstive because we now support them when searching.

refs #8241
2015-05-21 12:46:47 +02:00
Eric Lippmann bbed2cffae monitoring: Add column hosts_severity to the group summary query
refs #8241
2015-05-21 11:23:55 +02:00
Eric Lippmann ce463d16ef Reorder group summary query's columns by name
refs #8241
2015-05-21 11:19:58 +02:00
Alexander A. Klimov ead0a64244 GroupsummaryQuery: add column `hosts_total'
refs #8054
2015-05-13 18:10:18 +02:00
Alexander A. Klimov 43d8968bd2 GroupsummaryQuery: add columns
hosts_up_last_state_change
hosts_pending_last_state_change
hosts_down_last_state_change_handled
hosts_unreachable_last_state_change_handled
hosts_down_last_state_change_unhandled
hosts_unreachable_last_state_change_unhandled

refs #8860
2015-05-13 16:22:47 +02:00
Alexander A. Klimov 7353c0d287 IdoQuery::initializeForPostgres(): cast only valid IP addresses to inet
fixes #7165
2015-05-12 16:35:14 +02:00
Michael Friedrich defda53ff5 Show icinga program version in Monitoring Health
Also emphasize on the backends used.

fixes #9207
2015-05-05 17:02:45 +02:00
Alexander Fuhr d1f1f5d7d7 ProgrammStatusQuery: Add fallback if ido_version is older than required
resolves #9223
2015-05-05 16:32:18 +02:00
Alexander Fuhr 0e4201a997 Add info about the active ido endpoint to monitoring health overview
resolves #9223
2015-05-05 15:20:25 +02:00
Johannes Meyer 923bc11b39 GroupsummaryQuery: Provide case insensitive filter columns for group names
I've renamed those and made them case sensitive as part of #8613 but
missed that they are required by the global search.

fixes #9056
2015-04-14 12:44:24 +02:00
Johannes Meyer 9cc5469305 NotificationQuery: Provide case-insensitive filter column `contact'
refs #8613
2015-04-13 15:33:33 +02:00
Johannes Meyer 29f05bf878 NotificationQuery: Provide case-insensitive filter column `service'
refs #8613
2015-04-13 15:33:19 +02:00
Johannes Meyer 3653ec810a NotificationQuery: Provide case-insensitive filter column `host'
refs #8613
2015-04-13 15:32:52 +02:00
Johannes Meyer 644a386bf8 NotificationQuery: Use query column `notification_contact_name'
...instead of `notification_contact'.

refs #8613
2015-04-13 15:26:06 +02:00
Johannes Meyer 15399d77ce NotificationQuery: Use query column `service_description' instead of `service'
refs #8613
2015-04-13 15:25:10 +02:00