Commit Graph

666 Commits

Author SHA1 Message Date
Eric Lippmann 47b3019940 Add MonitoringBackend::isIcinga2()
This function is for the many places where we have to distinguish between Icinga 1.x and Icinga 2.x.

refs #11100
2016-02-25 17:45:51 +01:00
Alexander A. Klimov 474803fee4 Change all license headers to only reflect a file's year of creation
refs #11000
2016-02-08 15:41:00 +01:00
Thomas Gelf b643c97fb0 IdoQuery: pass ourselves to hook, not back to us 2015-11-13 18:01:39 +01:00
Thomas Gelf fd7165329a IdoQuery: provide ourselves to the hook 2015-11-13 17:37:03 +01:00
Thomas Gelf cd16206c7e IdoQuery: fix typo 2015-11-13 17:37:03 +01:00
Thomas Gelf 2589fbcf04 IdoQuery::joinHookedVirtualTable: missing method 2015-11-13 17:37:03 +01:00
Thomas Gelf b7352105d2 IdoQueryExtensionHook: "just a new hook" 2015-11-13 17:37:03 +01:00
Johannes Meyer 26e6acf9af ListController: Fix servicegrid grouping when applying group restrictions #2
PostgreSQL had still issues with it. Quickfix only, again.

refs #10316
2015-11-13 14:42:28 +01:00
Johannes Meyer 5e37f7758b ServicecommenthistoryQuery: Add missing group origin "servicegroups"
refs #10316
2015-11-13 12:55:06 +01:00
Johannes Meyer 005ec27cea IdoQuery: Fix method isTimestamp() not handling customvars properly
refs #10316
2015-11-13 12:13:02 +01:00
Johannes Meyer cc37ca37d9 ListController: Fix servicegrid grouping when applying group restrictions
Quickfix only.

refs #10316
2015-11-13 11:40:51 +01:00
Johannes Meyer 140e288c0b IdoQuery: Fix incorrect GROUP BY for MySQL SELECTs with joined columns
refs #10316
2015-11-12 16:02:41 +01:00
Johannes Meyer 89d8126226 Revert "Fix grouping of host- and servicegroup queries"
This reverts commit 35c7ed81a7.
2015-11-12 09:26:11 +01:00
Johannes Meyer 689cae8701 Merge branch 'master' into bugfix/hot-all-hostgroups-are-shown-10316 2015-11-12 09:23:49 +01:00
Johannes Meyer 39f4d869b7 IdoQuery: Fix that PostgreSQL queries do not apply LOWER() on order cols
refs #10364
refs #9955
2015-11-11 15:25:40 +01:00
Johannes Meyer 0b2b1c5d1e IdoQuery: Fix that PostgreSQL queries use LOWER() on non-CI columns
refs #10364
refs #9954
2015-11-11 14:33:00 +01:00
Johannes Meyer 3d735693db IdoQuery: Fix method isCaseInsensitive() returning true for .. everything ..
..with a PostgreSQL backend.

refs #10364
2015-11-10 16:05:05 +01:00
Johannes Meyer 52606eb2e7 Revert "monitoring: Fix handling of collated columns w/ PostgreSQL"
This reverts commit f5ffa8047c.

refs #10364
refs #9954
refs #9955
2015-11-10 15:59:16 +01:00
Johannes Meyer ad5a43ce7b HostserviceproblemsummaryQuery: Group by "so.name1"
fixes #10589
refs #10490
2015-11-10 15:04:00 +01:00
Eric Lippmann ba55ad7c5a monitoring: Fix unhandled service counter in the hosts overview
Group by was wrong.

fixes #10490
2015-11-09 09:55:17 +01:00
Johannes Meyer 35c7ed81a7 Fix grouping of host- and servicegroup queries
It's a rather quick fix but fixes the problem. We should take another look whether
a more sophisticated solution can be found.

refs #10316
2015-10-10 20:04:04 +02:00
Eric Lippmann 54bb99a96d Merge branch 'feature/dope-layout-5543'
refs #5543
2015-10-02 11:16:35 +02:00
Eric Lippmann 61357da35c Merge branch 'bugfix/group-by-9956'
fixes #9956
2015-10-01 23:05:27 +02:00
Eric Lippmann 231c63b703 Merge branch 'master' into feature/dope-layout-5543 2015-09-30 18:52:52 +02:00
Eric Lippmann 527b146054 monitoring: Remove unnecessary columns in the GROUP BY list for MySQL
refs #9956
2015-09-30 09:45:52 +02:00
Eric Lippmann bcbe7640e7 monitoring: Fix typos in queries after removing ::getGroup()
refs #9956
2015-09-30 09:45:18 +02:00
Eric Lippmann 0f622fe10b monitoring: Fix renamed index in the ServicedowntimeendhistoryQuery
refs #9956
2015-09-30 09:33:53 +02:00
Eric Lippmann c4ac3cbc1a monitoring: Rearrange code in the ServicedowntimestarthistoryQuery
refs #9956
2015-09-30 09:33:10 +02:00
Eric Lippmann aa76925f69 monitoring: Remove ServicedowntimestarthistoryQuery::getGroup()
refs #9956
2015-09-30 09:32:36 +02:00
Eric Lippmann bd4216907e monitoring: Rearrange code in the ServicedowntimeQuery
refs #9956
2015-09-30 09:30:04 +02:00
Eric Lippmann f4e4dbe069 monitoring: Remove ServicedowntimeQuery::getGroup()
refs #9956
2015-09-30 09:29:34 +02:00
Eric Lippmann 690fc89d62 monitoring: Rearrange code in the ServicestatushistoryQuery
refs #9956
2015-09-30 09:28:27 +02:00
Eric Lippmann e96d0c26e3 monitoring: Remove ServicestatehistoryQuery::getGroup()
refs #9956
2015-09-30 09:27:58 +02:00
Eric Lippmann bbd59d4fbc monitoring: Rearrange code in the HoststatehistoryQuery
refs #9956
2015-09-30 09:25:44 +02:00
Eric Lippmann 178ebd215d monitoring; Remove HoststatehistoryQuery::getGroup()
refs #9956
2015-09-30 09:25:12 +02:00
Eric Lippmann 2f79c2f911 monitoring: Fix renamed index in the ServicecommentdeletionhistoryQuery, part 2
refs #9956
2015-09-30 09:06:51 +02:00
Eric Lippmann 58c630b7ef monitoring: Fix renamed index in the HostdowntimeendhistoryQuery
refs #9956
2015-09-29 23:04:47 +02:00
Eric Lippmann 185c0b43be monitoring: Rearrange code in the HostdowntimestarthistoryQuery
refs #9956
2015-09-29 23:04:01 +02:00
Eric Lippmann 956c86dcdb monitoring: Remove HostdowntimestarthistoryQuery::getGroup()
refs #9956
2015-09-29 23:03:13 +02:00
Eric Lippmann df69755056 monitoring: Rearrange code in the ServicegroupQuery
refs #9956
2015-09-29 22:54:45 +02:00
Eric Lippmann e22dd1d0b4 monitoring: Remove ServicegroupQuery::getGroup()
refs #9956
2015-09-29 22:54:08 +02:00
Eric Lippmann d18d606ad6 monitoring: Handle joined virtual table serviceobjects in IdoQuery::getGroup()
refs #9956
2015-09-29 22:53:41 +02:00
Eric Lippmann 944129d1e6 monitoring: Handle joined virtual table hostobjects in IdoQuery::getGroup()
refs #9956
2015-09-29 22:51:06 +02:00
Eric Lippmann 73152e9244 monitoring: Rearrange code in the HostgroupQuery
refs #9956
2015-09-29 22:50:49 +02:00
Eric Lippmann 6519b25ec1 monitoring: Remove HostgroupQuery::getGroup()
refs #9956
2015-09-29 22:50:12 +02:00
Eric Lippmann 844f80d2df monitoring: Rearrange code in the ServicestatusQuery
refs #9956
2015-09-29 22:47:07 +02:00
Eric Lippmann 6307af9e10 monitoring: Remove ServicestatusQuery::getGroup()
refs #9956
2015-09-29 22:46:02 +02:00
Eric Lippmann d0f11e10f6 monitoring: Rearrange code in the HoststatusQuery
refs #9956
2015-09-29 22:44:12 +02:00
Eric Lippmann 02eee7a603 monitoring: Remove HoststatusQuery::getGroup()
refs #9956
2015-09-29 22:43:09 +02:00
Eric Lippmann 70717169c2 monitoring: Rearrange code in the ServicecommentQuery
refs #9956
2015-09-29 22:42:44 +02:00