Commit Graph

354 Commits

Author SHA1 Message Date
Alexander Klimov 967a2e82dc Use (only) "@return $this" in fluent interfaces' documentation 2015-04-07 14:24:11 +02:00
Eric Lippmann a4731ebbb3 Select is_reachable from host and service status
refs #6875
2015-03-13 00:25:08 +01:00
Eric Lippmann 53626ccfeb Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-12 16:40:16 +01:00
Eric Lippmann 29b5e4fd43 Add host_name and service_description columns w/o collation to the comment query
refs #8614
2015-03-12 16:38:32 +01:00
Eric Lippmann 112f8eb2f9 Remove COLLATE from host_name and service_description in the Contactgroup query
refs #8614
refs #8613
2015-03-12 16:33:28 +01:00
Eric Lippmann 7212434856 Remove COLLATE from host_name and service_description in the Contact query
refs #8614
refs #8613
2015-03-12 16:32:05 +01:00
Thomas Gelf 16ca8d0654 StatusQuery: fix join on wrong alias
Looks like a copy & paste error, resulted in hosts been shown multiple
times.

fixes #8699
2015-03-12 09:46:38 +01:00
Eric Lippmann ea32d3dfb3 Add PHPDoc to the EventHistory query
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann c69a46d005 Add PHPDoc to the Downtime query
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann 6d43673754 Do not always join host and service status in the DowntimeQuery
Now the hoststatus and servicestatus tables are only joined if necessary.

refs #8614
2015-03-06 13:13:02 +01:00
Eric Lippmann 2b91ec7f2c Comment out unused query in the ContactgroupQuery
refs #8614
2015-03-06 09:54:12 +01:00
Eric Lippmann fc403e693b Fix array indentation in the ContactQuery
refs #8614
2015-03-06 09:46:47 +01:00
Eric Lippmann dc223128bb Remove host_- and service_object_id from ContactQuery's columnMap
We do not use these columns.

refs #8614
2015-03-05 17:18:52 +01:00
Johannes Meyer e588ea2714 Fix filter expression handling when lowering to achieve case-insensitivity
fixes #8435
2015-02-16 13:05:24 +01:00
Eric Lippmann 6bae2e0a53 Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Eric Lippmann 5b4fab0750 Add license header
This time without syntax errors hopefully :)
2015-02-03 16:27:59 +01:00
Eric Lippmann 5fa2e3cfdc Revert "Add license header"
This reverts commit 338d067aba.
2015-02-03 16:16:26 +01:00
Johannes Meyer 04edf0d075 Fix that the search is case-sensitive in case of a PostgreSQL backend
fixes #8083
2015-02-03 16:15:59 +01:00
Eric Lippmann 338d067aba Add license header
fixes #7788
2015-02-03 15:51:04 +01:00
Eric Lippmann f9047e85c5 monitoring: Fix wrong unhandled service problems count in the hosts overview
The query was missing the is_active = 1 condition. I'll open an issue for the other
affected queries.

fixes #8013
2015-02-02 11:12:27 +01:00
Eric Lippmann 405e18a46f monitoring: Fix PHPDoc for MonitoringBackend::from() 2015-01-27 13:37:28 +01:00
Eric Lippmann a1fbb3d937 monitoring: Fix host and service groups overviews when using PostgreSQL
fixes #8268
2015-01-23 15:47:18 +01:00
Eric Lippmann 7500dd9c68 Revert "GroupSummary/Postgres: Fix group by in initial join query"
This reverts commit f47bc46654.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php

No need to reintroduce group columns.
2015-01-23 15:27:52 +01:00
Eric Lippmann 30eed015ba monitoring: Support selecting host group and service group alias in the GroupsummaryQuery
refs #8266
2015-01-23 11:21:29 +01:00
Eric Lippmann 74a0c1e274 monitoring: Support selecting host group and service group alias in the HoststatusQuery
refs #8266
2015-01-23 11:21:10 +01:00
Eric Lippmann e15c085f19 monitoring: Support selecting host group and service group alias in the StatusQuery
refs #8266
2015-01-23 11:20:35 +01:00
Eric Lippmann 5ac1eaa513 monitoring: Fix indents in the GroupsummaryQuery 2015-01-23 11:11:34 +01:00
Eric Lippmann a91a2eba68 monitoring: Support host and service display_name columns in the CommentQuery
refs #7843
2015-01-21 16:09:13 +01:00
Eric Lippmann d8b1e63231 monitoring: Support host and service display_name in the NotificationQuery
refs #7843
2015-01-21 15:47:10 +01:00
Eric Lippmann 0bcca651b2 monitoring: Remove useless PHPDoc in the NotificationQuery 2015-01-21 13:12:26 +01:00
Eric Lippmann 85aa447516 monitoring: Support host and service display_name in the DowntimeQuery
refs #7843
2015-01-21 12:52:29 +01:00
Eric Lippmann d528ddc641 monitoring: Fix that host_display_name is NULL when the object is a service in the evenhistory overview
refs #7843
2015-01-21 12:51:47 +01:00
Eric Lippmann e881a0de33 monitoring: Remove useless PHPDoc in the DowntimeQuery 2015-01-21 10:35:10 +01:00
Eric Lippmann 25c2e99122 monitoring: Fix duplicate array key 'service_description' in the EventHistoryQuery 2015-01-21 10:26:12 +01:00
Eric Lippmann aa976c4198 monitoring: Support host and service display_name in the EventHistoryQuery
This adds two left joins to the query when selecting host_display_name and service_display_name.
If performance suffers badly, we have to evaluate whether to support the display_name column for displaying
the host and service name in the eventhistory overview.

refs #7843
2015-01-21 10:24:24 +01:00
Eric Lippmann 1bba0b3d0f monitoring: Fix coding style in the EventHistoryQuery 2015-01-21 10:15:58 +01:00
Eric Lippmann 7d967d25b3 monitoring: Fix code style in the StatehistoryQuery 2015-01-21 10:12:14 +01:00
Eric Lippmann 10571c3178 monitoring: Fix duplicate array key 'service_description' in the StatehistoryQuery 2015-01-21 10:10:07 +01:00
Eric Lippmann b0e27c4fe6 monitoring: Remove duplicate array key 'host_check_command' in the StatusQuery 2015-01-20 13:43:53 +01:00
Eric Lippmann 56640fa64f postgres: Use timestamp comparison instead of timezone offset comparison for detecting the default timestamp
refs #7919
2015-01-19 13:50:03 +01:00
Eric Lippmann 09d5ec6b7a postgres: Return 0 if a timestamp looks like the default timestamp
The PostgreSQL IDO schema sets the default value for timestamps with time zone
to the epoch time w/o giving the time zone +00. Thus default timestamps are always
wrong when using a time zone other than 'UTC'.

refs #7919
2015-01-16 17:05:50 +01:00
Eric Lippmann dae3ccd90c monitoring: Take status_update_time into account when is_currently_running is 1
fixes #8210
2015-01-16 17:02:35 +01:00
Eric Lippmann a6861789bb lib: Remove superfluous return false from IdoQuery 2015-01-16 17:01:52 +01:00
Johannes Meyer f513e7959e Consider also the host's state when counting its service problems
refs #8013
2014-12-22 16:20:12 +01:00
Johannes Meyer 2b14dbaff3 Fix the groupsummarie's grouping in case of PostgreSQL
fixes #7859
2014-12-01 14:36:46 +01:00
Johannes Meyer e23a794844 There is no "highest" severity, just "some" severity 2014-11-20 12:49:10 +01:00
Johannes Meyer 2fdc1f4322 Sort the hostgroup- and servicegroupsummary by service severity 2014-11-20 09:48:47 +01:00
Johannes Meyer c74f7531dc Do not display host- and servicegroups as boxes but as table instead 2014-11-19 11:53:45 +01:00
Johannes Meyer 7621f6642d Adjust usages of Icinga\Application\Config
refs #7147
2014-11-18 13:11:52 +01:00
Thomas Gelf 10ec0446e0 Livestatus\DowntimeQuery: first basic version 2014-11-16 18:55:48 +01:00
Thomas Gelf 8bd9a966e1 Livestatus\ServicegroupQuery: initial commit 2014-11-16 18:54:08 +01:00
Thomas Gelf 92c059a0d7 Livestatus\HostgroupQuery: initial commit 2014-11-16 18:53:41 +01:00
Thomas Gelf 42efbf0892 Livestatus\StatusSummaryQuery: initial implementation 2014-11-16 17:12:25 +01:00
Thomas Gelf 7eb960ea0b Livestatus\StatusQuery: a couple of munge methods 2014-11-16 16:40:15 +01:00
Thomas Gelf b494476ebc Livestatus\StatusQuery: make use of new filter flags
NIIIIICEEEE!!
2014-11-16 16:39:41 +01:00
Thomas Gelf b6b78e4fcd Livestatus\StatusQuery: add LOTS of columns...
...still a little bit ugly, I'm in a hurry right now
2014-11-16 16:39:01 +01:00
Thomas Gelf 1a4bf609a2 Livestatus\StatusQuery: remove obsolete method 2014-11-16 16:37:33 +01:00
Thomas Gelf 6d362b0606 Livestatus\StatusQuery: should know about it's table 2014-11-16 16:36:47 +01:00
Thomas Gelf 7b73215868 Livestatus\StatusQuery: add terribly setMode method 2014-11-16 15:18:10 +01:00
Thomas Gelf fa20ced0c2 LiveStatus\StatusQuery: should be a Livestatus\Query 2014-11-16 15:05:36 +01:00
Thomas Gelf e89d4642e3 Merge remote-tracking branch 'origin/master' into feature/livestatus-playground-4787 2014-11-16 10:12:34 +01:00
Alexander Fuhr 038964a325 Add tinystatesummary for hosts overview 2014-11-14 16:50:34 +01:00
Matthias Jentsch 022d89254f Fix tab, navigation and menu names 2014-11-13 18:38:42 +01:00
Johannes Meyer 7aae291f69 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 10:08:28 +01:00
Thomas Gelf e96ecc5271 LivestatusBackend: just an empty backend 2014-11-11 18:06:50 +01:00
Thomas Gelf 1ca83c001f MonitoringBackend: just a few comments
fixes #7635
2014-11-11 17:33:31 +01:00
Thomas Gelf 78fd5109ac MonitoringBackend: fix variable name in exception
refs #7635
2014-11-11 17:23:49 +01:00
Thomas Gelf 9431a3432f MonitoringBackend: remove comment for SOLID fanboys 2014-11-11 17:21:32 +01:00
Thomas Gelf 8faf81dad5 MonitoringBackend: add clearInstances()
refs #7635
2014-11-11 16:57:34 +01:00
Thomas Gelf 6c0aa8dcc5 MonitoringBackend: handle null name in a nice way
When we get null as a backend name, we load the default one. While we
want to cache that null backend, it should still know about it's real
name.
2014-11-11 16:49:56 +01:00
Thomas Gelf 50b0ef45ff IdoBackend: concrete backend implementation
Nothing special to be found here. Not yet.

refs #7635
2014-11-11 15:44:39 +01:00
Thomas Gelf 19ab8237d4 Backend\MonitoringBackend: base class for backends
refs #7635
2014-11-11 15:40:38 +01:00
Johannes Meyer 9d292269b1 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/LdapResourceForm.php
	test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
2014-11-11 09:44:11 +01:00
Thomas Gelf 816c309193 Ido\CustomvarQuery: add is_json
This has to be done in a backward compatible way, we check for IDO
>= 1.12.0.

refs #7569
2014-11-06 16:14:03 +01:00
Marius Hein cd9e3693e4 Downtime: Add filter editor and preview
resolves #7445
2014-11-06 13:22:38 +01:00
Johannes Meyer 170ded6510 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/File/Ini/IniWriter.php
2014-11-04 14:22:53 +01:00
Eric Lippmann 16352fc10c Move Logger to the Application namespace
fixes #7148
2014-10-31 10:27:17 +01:00
Johannes Meyer 437b41c6c1 Merge branch 'master' into feature/setup-wizard-7163 2014-10-13 08:18:43 +02:00
Johannes Meyer 1cbe2451a8 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/StatusdatResourceForm.php
2014-10-08 16:34:31 +02:00
Marius Hein 0825b2f071 AlertSummary: Add healing chart
refs #4076
2014-10-08 15:30:53 +02:00
Alexander Fuhr 4c23d98575 Merge branch 'master' into bugfix/monitoring-list-dup-entries-7057 2014-10-08 12:45:14 +02:00
Alexander Fuhr afc97b1cac Fix the duplicate entries in monitoring list shows
refs #7057
refs #7344
fixes #7057
2014-10-08 12:30:08 +02:00
Eric Lippmann 1b23fd7fbe monitoring: Don't support status.dat as backend
Icinga Web 2 will not support status.dat for now and maybe forever.
2014-10-07 13:22:07 +02:00
Eric Lippmann 2126b8c341 monitoring: Fix link to an object's contact in the detail views 2014-10-07 13:21:28 +02:00
Alexander Fuhr a0122763a6 Fix Queries: Summaries, Host, Service 2014-10-06 11:37:33 +02:00
Johannes Meyer cbadaa78d6 Merge branch 'master' into feature/setup-wizard-7163 2014-09-29 15:35:52 +02:00
Thomas Gelf d7f8a7823f GroupsummaryQuery: adjust queries to fix ZF woes
Some less brackets also here. Dropping COALESCE as the subquery will
never return NULL

fixes #7303
2014-09-24 19:50:43 +02:00
Thomas Gelf 98fa84bd17 StatusSummaryQuery: one more quickfix
Tactical overview works again right now

refs #7303
2014-09-24 19:47:02 +02:00
Thomas Gelf 45fc768813 StatusSummaryQuery: workaround for silly ZF fix
This brings the tiny summaries back. Host- and servicegroups and TO are
still broken.

refs #7303
2014-09-24 19:33:05 +02:00
Johannes Meyer c00dbf9f46 Write session on response
There should not be any necessity to write the session once changes are
being made to it. We now track whether changes were made and write
the session when responding to the user's request if so.
2014-09-24 10:46:35 +02:00
Eric Lippmann cde3ec6bc8 Merge branch 'master' into bugfix/commands-6593
Conflicts:
	modules/monitoring/application/controllers/TimelineController.php
2014-09-23 22:54:17 -07:00
Matthias Jentsch 44e5fe7e12 Join Host and Servicegroups for extended filtering 2014-09-19 17:41:44 +02:00
Eric Lippmann 4b7096bbbf monitoring: Support host and service filters for downtimes
refs #7278
2014-09-19 14:28:23 +02:00
Marius Hein 9c2cf0bd0f StateHistoryQuery: Make whereToSql robust
This fixes bugs is a array for expression comes in or types
does not exist.

fixes #7133
2014-09-10 10:07:03 +02:00
Thomas Gelf cbaa2d8ae9 StateHistoryQuery: tune type queries 2014-09-05 18:41:51 +02:00
Thomas Gelf 9ea377fd45 NotificationHistoryQuery: names instead of aliases
refs #7104
2014-09-05 18:16:59 +02:00
Thomas Gelf 38c6d6aaf8 StatusSummaryQuery: reorganize, add new columns
refs #6993
2014-09-05 18:16:58 +02:00
Thomas Gelf 1734f01040 CommentdeletionhistoryQuery: 1970-01-01 -> -02
refs #7000
2014-09-02 17:02:58 +02:00
Thomas Gelf a58b2aac00 Ido\StatusQuery: join ALL latest comment
And it was soooo fast :p

refs #7057
2014-09-02 15:31:06 +02:00
Marius Hein 19136b548a StatusQuery: Separate last comment fields
fixes #7057
2014-09-02 13:57:43 +02:00