58 Commits

Author SHA1 Message Date
Johannes Meyer
40c2cb2d12 MonitoredObject: Support host- and servicegroup filters in method matches()
refs #5600
2015-09-23 13:03:41 +02:00
Johannes Meyer
e42548fc80 MonitoredObject: Allow to fetch servicegroups for host objects
refs #5600
2015-09-23 13:02:43 +02:00
Johannes Meyer
f4032988bf MonitoredObject: Add method matches()
refs #5600
2015-09-17 10:40:00 +02:00
Eric Lippmann
b585b92196 monitoring/lib: Add translate parameter to MonitoredObject::getType() 2015-09-04 13:01:49 +02:00
Eric Lippmann
f0e8340fbd monitoring/detail: Don't display the comment of the active acknowledgement in the comment list
refs #9674
2015-09-03 16:38:46 +02:00
Eric Lippmann
6a684a97df monitoring: Fix missing parameter initialization in MonitoredObject::parseAttributeUrls() 2015-09-03 14:09:16 +02:00
Eric Lippmann
54a45ff338 monitoring: Fix PHPDoc of MonitoredObject::resolveAllStrings() 2015-09-03 14:08:43 +02:00
Eric Lippmann
dc5e86002b monitoring: Reorder code in MonitoredObject 2015-09-03 14:07:38 +02:00
Eric Lippmann
4d2675659c monitoring: Optimize imports in MonitoredObject 2015-09-03 13:47:51 +02:00
Eric Lippmann
e5c9eb1d20 monitoring: Don't show ack comments in the comments area of a host or service
refs #9674
2015-09-03 10:52:05 +02:00
Johannes Meyer
65806fafbf MonitoredObject: Only select history entries for the respective object
And fix that the default sort order is not applied.

fixes #9963
2015-08-19 11:53:00 +02:00
Alexander Fuhr
18dae78d80 MonitoredObject: Add scheduled_end
refs #9266
2015-08-10 12:14:49 +02:00
Johannes Meyer
4d72832933 MonitoredObject: Don't apply restrictions to comments and downtimes
They're already filtered by object_type and the object's name.

refs #9009
2015-06-17 10:11:59 +02:00
Johannes Meyer
670d6e93c7 MonitoredObject: Ensure that the filter is applied to all queries
refs #9009
2015-06-16 17:44:29 +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
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
Eric Lippmann
8cbb83d630 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-05 15:29:16 +02:00
Eric Lippmann
dae35b9106 monitoring: Restrict host and service groups when viewing a host or service
refs #9009
2015-06-05 14:47:01 +02:00
Eric Lippmann
f3b84b7ae8 monitoring: Restrict service summary when viewing a host or service
refs #9009
2015-06-05 14:14:22 +02:00
Eric Lippmann
46fdaf4698 monitoring: Fix select columns for the comment data views
refs #9009
2015-05-29 15:38:03 +02:00
Matthias Jentsch
a66949162b Resolve macros when accessing getters on MonitoredObjects
refs #6392
2015-05-28 15:01:10 +02:00
Matthias Jentsch
6c44f6a11a Deduplicate url-attribute parsing code
Use function to fetch all host links in MonitoredObject instead.
2015-05-28 10:47:44 +02:00
Eric Lippmann
0c1df335fc monitoring: Fix select columns for downtimes, again
refs #9009
refs #9319
2015-05-26 17:15:03 +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
Johannes Meyer
f11ea04557 Revert "Require host_name' instead of host' to show or list particular objects"
This reverts commit b93d18a0fc2507d360f122afdfb27317b7708fd4.
2015-04-20 16:11:22 +02:00
Johannes Meyer
96fb0370a4 Revert "Require service_description' instead of service' to show a particular service"
This reverts commit 09ab6019423e858d222a570c65f247bfcb09e62f.
2015-04-20 16:09:14 +02:00
Johannes Meyer
1c32d8ebe5 DowntimeQuery: Add _name suffix to the query column `downtime_author'
...to indicate that it's a case-sensitive column.

refs #8613
2015-04-10 14:23:05 +02:00
Johannes Meyer
0fe59aa519 Revert "ContactQuery: Provide ci query columns for aliases and email addresses"
This reverts commit f00adc2138158dd2c5c75b881aff5fc34cae7d70.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
2015-04-10 12:23:35 +02:00
Johannes Meyer
f00adc2138 ContactQuery: Provide ci query columns for aliases and email addresses
refs #8613
2015-04-10 09:45:23 +02:00
Johannes Meyer
5372dfb7f1 Fetch a comment's author using `comment_author_name'
refs #8613
2015-04-09 13:07:50 +02:00
Johannes Meyer
09ab601942 Require service_description' instead of service' to show a particular service
`service' implies that it is possible to provide case-less identifiers which is
*not* possible.

refs #8613
2015-04-08 16:49:52 +02:00
Johannes Meyer
b93d18a0fc Require host_name' instead of host' to show or list particular objects
`host' implies that it is possible to provide case-less identifiers which is
*not* possible.

refs #8613
2015-04-08 16:25:29 +02:00
Eric Lippmann
53626ccfeb Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-12 16:40:16 +01:00
Eric Lippmann
7156bd7dfb Fetch object comments by host_name and service_description
refs #8614
2015-03-12 16:39:20 +01:00
Eric Lippmann
8563d5ed3f PHPDoc: Use @var instead of @type
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
2015-03-12 16:08:47 +01:00
Eric Lippmann
e72670cb75 Use default sorting for an object's event history
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann
7317aa7158 Do not join hosts when fetching a service's downtimes
refs #8614
2015-03-06 13:14:20 +01:00
Eric Lippmann
64d1d12c73 Do not join icinga_hosts when fetching a service's contact groups
refs #8614
2015-03-06 10:02:20 +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 338d067aba41dd6e9178cebec5433eecd614196e.
2015-02-03 16:16:26 +01:00
Eric Lippmann
338d067aba Add license header
fixes #7788
2015-02-03 15:51:04 +01:00
Eric Lippmann
7bf6bd39e9 monitoring: Implement Filterable in MonitoredObject 2015-01-27 14:54:21 +01:00
Eric Lippmann
1aa91f0228 monitoring: Select host and service display_name for an object's history
refs #7843
2015-01-22 10:57:15 +01:00
Eric Lippmann
e376bd6285 monitoring: Fix that exporting a object's history throws an exception
fixes #6586
2014-12-29 17:54:09 +01:00
Johannes Meyer
7621f6642d Adjust usages of Icinga\Application\Config
refs #7147
2014-11-18 13:11:52 +01:00
Thomas Gelf
a8a7da4ade Object\Host: not-so-nice workaround, LS contancts 2014-11-16 19:28:08 +01:00
Thomas Gelf
7f22afbc21 MonitoredObject: temporary livestatus workaround 2014-11-16 19:24:37 +01:00
Thomas Gelf
3f4110d33d MonitoredObject: use MonitoringBackend::instance
refs #7635
2014-11-11 16:43:51 +01:00
Thomas Gelf
6627b5ae6e Monitoring\Object: use MonitoringBackend
refs #7635
2014-11-11 16:29:07 +01:00