Commit Graph

645 Commits

Author SHA1 Message Date
Eric Lippmann 7ed7343587 monitoring: Reorder query columns in the ContactQuery 2015-09-27 12:57:34 +02:00
Eric Lippmann faa9b41fb8 monitoring: Clear order of the HoststatusQuery used in the HostserviceproblemsummaryQuery 2015-09-27 12:57:34 +02:00
Matthias Jentsch 3b135c6b6f Fix PostgreSQL queries that use GROUP BY
Add missing instance_id to getGroup query functions to avoid query errors in PostgreSQL.

fixes #10160
2015-09-17 16:29:00 +02:00
Eric Lippmann 8cea292745 monitoring: Fix grouping of host and service status when filtering for group columns
refs #9956
2015-09-17 16:22:24 +02:00
Matthias Jentsch 32b4715130 Remove unused joins and conform to coding guidelines 2015-09-14 12:05:15 +02:00
Matthias Jentsch b2c486bf80 Add Backend queries for host and service time periods
refs #9888
2015-09-11 16:31:19 +02:00
Eric Lippmann a569b19153 monitoring: Increase time before a check result is marked as late
refs #8378
2015-09-07 11:12:25 +02:00
Eric Lippmann 30a5f57b7d monitoring: Remove next_update_is_late column from the service status query
refs #8378
2015-09-07 11:06:02 +02:00
Eric Lippmann 8347e126b8 monitoring: Remove next_update_is_late column from the host status query
refs #8378
2015-09-07 11:05:36 +02:00
Eric Lippmann e5ff81aa84 monitoring/hoststatus: Add columns host_next_update and host_next_update_is_late
refs #8378
2015-09-04 16:20:23 +02:00
Eric Lippmann 562fec68cf monitoring/servicestatus: Add columns service_next_update and service_next_update_is_late
refs #8378
2015-09-04 16:18:41 +02:00
Eric Lippmann 748eb69d89 monioring/lib: Reorder query columns in the ServicestatusQuery 2015-09-04 13:45:27 +02:00
Eric Lippmann 89ff47e761 monitoring: Remove duplicate array key 'service_last_hard_state_change' 2015-09-04 13:07:37 +02:00
Eric Lippmann b28f1c4038 Merge branch 'bugfix/monitoring-ack-comments-display-9674'
fixes #9674
2015-09-04 13:04:39 +02:00
Eric Lippmann 620c1fa6e0 monitoring: Fix alphabetical order of query columns in the CommentQuery 2015-09-03 16:21:01 +02:00
Matthias Jentsch ddde37e225 Remove acknowledgement view temporarily
Implementation of acknowledgement view temporarily delayed until v2.1.0.

refs #10032
2015-09-03 16:08:55 +02:00
Matthias Jentsch 8f545dd0d6 Fix acknowledgement query for PGSQL
refs #10032
2015-09-02 11:25:52 +02:00
Matthias Jentsch 985f6ab85e Fix acknowledgement count query
refs #10032
2015-09-01 17:42:51 +02:00
Matthias Jentsch bcdbf413a6 Add acknowledgement view and query
Add backend queries and the controller to inspect active acknowledgements.

refs #10032
2015-09-01 16:39:08 +02:00
Eric Lippmann c294283636 Merge branch 'bugfix/service-grid-grouping-postgres-9333'
Conflicts:
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php

fixes #9333
fixes #9538
2015-08-27 12:58:49 +02:00
Eric Lippmann f35aec1c5c monitoring: Fix default select columns of the instance query 2015-08-27 11:54:20 +02:00
Johannes Meyer 66570c95e0 monitoring: Ensure to ask subqueries whether to allow custom vars
fixes #9998
2015-08-27 08:53:46 +02:00
Johannes Meyer ffcd33ee7e Introduce query InstanceQuery
refs #9945
2015-08-26 10:54:42 +02:00
Johannes Meyer 819d20f17a Hostservice...Query: Add query column `instance_name'
refs #9943
2015-08-25 16:38:54 +02:00
Johannes Meyer 6906ea89b7 *historyQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:37:58 +02:00
Johannes Meyer 344dcf2cf7 ServicestatusQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:35:48 +02:00
Johannes Meyer ced671a408 HoststatusQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:35:35 +02:00
Johannes Meyer 780ac16be1 NotificationQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:35:16 +02:00
Johannes Meyer 5c2fd63347 ServicegroupQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:34:48 +02:00
Johannes Meyer fedd2c3b18 HostgroupQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:34:37 +02:00
Johannes Meyer f70a861ff4 DowntimeQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:34:18 +02:00
Johannes Meyer edb83c8b41 CustomvarQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:33:41 +02:00
Johannes Meyer 7916c149b9 ContactQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:32:27 +02:00
Johannes Meyer ab628338c2 ContactgroupQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:32:15 +02:00
Johannes Meyer 91fe6913d8 CommentQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:31:39 +02:00
Eric Lippmann c8790fad93 Merge branch 'bugfix/service-grid-display_name-9538' into bugfix/service-grid-grouping-postgres-9333
Conflicts:
	library/Icinga/Data/PivotTable.php
	modules/monitoring/application/controllers/ListController.php
2015-08-25 15:51:20 +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 9ea3f73e83 monitoring: Fix query class names not matching the file name 2015-08-19 12:52:38 +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
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 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 84ac316cde IdoQuery: Allow check if a column is case insensitive compared
refs #9029
2015-08-17 15:05:44 +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 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 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 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
Johannes Meyer 03d4386763 Introduce HostservicestatussummaryQuery class
refs #9864
2015-08-07 15:36:24 +02:00
Johannes Meyer c891b9d356 HostgroupsummaryQuery: Fix group statement ambiguity 2015-08-06 07:54:03 +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 998610bafa ProgramstatusQuery: Provide a(nother) fallback for older IDO installations
fixes #9168
2015-07-24 15:46:12 +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 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 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 a7498ca0d8 HostcommentQuery: Fix grouping when services are being joined
fixes #9503
2015-06-25 13:03:33 +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 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 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 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