Commit Graph

1248 Commits

Author SHA1 Message Date
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 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 8a1592fd12 monitoring/lib: Add Acknowledgement object
refs #9674
2015-09-03 16:27:50 +02:00
Eric Lippmann a14b1ce8f7 monitoring/service: Fetch acknowledgement type
refs #9674
2015-09-03 16:23:27 +02:00
Eric Lippmann df72825617 monitoring/host: Fetch acknowledgement type
refs #9674
2015-09-03 16:23:04 +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
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
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
Johannes Meyer 1c51735629 Merge branch 'master' into feature/rename-monitoring-instances-to-command-transports-and-allow-to-link-them-with-a-monitoring-instance-9651
Conflicts:
	modules/monitoring/application/controllers/ConfigController.php
2015-08-31 13:05:10 +02:00
Johannes Meyer b7cdfcfae0 CommandTransport: Respect instance association
refs #9651
2015-08-31 12:19:42 +02:00
Johannes Meyer 1d6d4f0b10 RemoteCommandFile: Accept option `instance'
refs #9651
2015-08-31 12:19:00 +02:00
Johannes Meyer 04ef3f1244 LocalCommandFile: Accept option `instance'
refs #9651
2015-08-31 12:18:25 +02:00
Johannes Meyer fcbd24e28e CommandTransport: Add fallback mechanism
refs #8981
refs #9651
2015-08-31 09:21:59 +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 8c887ee450 monitoring: Rename all command transport related classes
refs #9651
2015-08-26 15:52:36 +02:00
Johannes Meyer ec8567cbbf monitoring: It's now a command transport, not an instance anymore
refs #9651
2015-08-26 15:43:30 +02:00
Johannes Meyer 6651d31481 CommandTransport: Use commandtransports as config file name
refs #9651
2015-08-26 14:17:23 +02:00
Johannes Meyer 1317a6eaf8 Show an object's instance only if there are multiple instances
refs #9945
2015-08-26 10:55:18 +02:00
Johannes Meyer ffcd33ee7e Introduce query InstanceQuery
refs #9945
2015-08-26 10:54:42 +02:00
Johannes Meyer 592a79cd93 Service: Fetch the name of the instance the service belongs to
refs #9945
2015-08-26 10:52:56 +02:00
Johannes Meyer 8a1114bf65 Host: Fetch the name of the instance the host belongs to
refs #9945
2015-08-26 10:52:28 +02:00
Johannes Meyer 91315738c8 monitoring: Allow `instance_name' as restriction column
refs #9934
2015-08-25 16:39:40 +02:00
Johannes Meyer 819d20f17a Hostservice...Query: Add query column `instance_name'
refs #9943
2015-08-25 16:38:54 +02:00
Johannes Meyer 94693fe3e7 DataView\*summary: Add query column `instance_name'
refs #9943
2015-08-25 16:38:23 +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
Johannes Meyer 9ca278d7b2 Merge branch 'master' into feature/activity-indicators-for-form-submits-8369 2015-08-21 13:37:54 +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
Matthias Jentsch 44271471e3 Allow declarative definitions of badge renderers and improve interface
Allow the data backend, columns and generated tooltips to be defined in the configuration instead of providing subclasses for every new configuration. Provide an abstract BadgeMenuItemRenderer that allows creating Badges with less boilerplate.

fixes #9694
2015-08-20 18:16:33 +02:00