From 480e80709a9328bbb709113e9a21dc06565cd227 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 19 May 2016 16:06:06 +0200 Subject: [PATCH] IcingaService: simplify command endpoint rendering host.name doesn't work as of #11786. host_name should be fine for templates, objects and apply rules. I therefore also dropped the exception for service objects with use_agent and host_id. --- library/Director/Objects/IcingaService.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/library/Director/Objects/IcingaService.php b/library/Director/Objects/IcingaService.php index 02834aca..5dc2a826 100644 --- a/library/Director/Objects/IcingaService.php +++ b/library/Director/Objects/IcingaService.php @@ -173,11 +173,7 @@ class IcingaService extends IcingaObject return ''; } - if ($this->hasBeenAssignedToHostTemplate() || $this->object_type !== 'object') { - return c::renderKeyValue('command_endpoint', 'host.name'); - } else { - return $this->renderRelationProperty('host', $this->host_id, 'command_endpoint'); - } + return c::renderKeyValue('command_endpoint', 'host_name'); } /**