Merge pull request #8706 from Icinga/bugfix/icingadb-endpoint-zone

Icinga DB: dump the correct icinga:config:endpoint#zone_id
Icinga · Apr 26, 2021 · 7f5225e · 7f5225e
2 parents 52c8444 + 7dcf48f
commit 7f5225e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/icingadb/icingadb-objects.cpp b/lib/icingadb/icingadb-objects.cpp
@@ -1088,14 +1088,20 @@ bool IcingaDB::PrepareObject(const ConfigObject::Ptr& object, Dictionary::Ptr& a
 	attributes->Set("environment_id", m_EnvironmentId);
 	attributes->Set("name", object->GetName());
 
-	Zone::Ptr ObjectsZone = static_pointer_cast<Zone>(object->GetZone());
+	Zone::Ptr ObjectsZone;
+	Type::Ptr type = object->GetReflectionType();
+
+	if (type == Endpoint::TypeInstance) {
+		ObjectsZone = static_cast<Endpoint*>(object.get())->GetZone();
+	} else {
+		ObjectsZone = static_pointer_cast<Zone>(object->GetZone());
+	}
+
 	if (ObjectsZone) {
 		attributes->Set("zone_id", GetObjectIdentifier(ObjectsZone));
 		attributes->Set("zone", ObjectsZone->GetName());
 	}
 
-	Type::Ptr type = object->GetReflectionType();
-
 	if (type == Endpoint::TypeInstance) {
 		return true;
 	}