Commit Graph

575 Commits

Author SHA1 Message Date
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
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