From 5431eae116df92d0b856e7f856da24df5a948144 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 4 Dec 2018 17:44:42 +0100 Subject: [PATCH 1/2] Add and populate Downtime#authoritative_zone refs #6542 --- lib/icinga/downtime.cpp | 4 ++++ lib/icinga/downtime.ti | 1 + 2 files changed, 5 insertions(+) diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp index 336329bc2..47ef789cb 100644 --- a/lib/icinga/downtime.cpp +++ b/lib/icinga/downtime.cpp @@ -247,6 +247,10 @@ String Downtime::AddDowntime(const Checkable::Ptr& checkable, const String& auth attrs->Set("config_owner", scheduledDowntime); attrs->Set("entry_time", Utility::GetTime()); + if (!scheduledDowntime.IsEmpty()) { + attrs->Set("authoritative_zone", Zone::GetLocalZone()->GetName()); + } + Host::Ptr host; Service::Ptr service; tie(host, service) = GetHostService(checkable); diff --git a/lib/icinga/downtime.ti b/lib/icinga/downtime.ti index 17c8cfe91..fe80e0e77 100644 --- a/lib/icinga/downtime.ti +++ b/lib/icinga/downtime.ti @@ -84,6 +84,7 @@ class Downtime : ConfigObject < DowntimeNameComposer [state] int legacy_id; [state] bool was_cancelled; [config] String config_owner; + [config] String authoritative_zone; }; } From c98d6a52545bf0e10b9b0d644b0d15813ab7de48 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 4 Dec 2018 17:45:54 +0100 Subject: [PATCH 2/2] Downtime#HasValidConfigOwner(): respect Downtime#authoritative_zone refs #6542 --- lib/icinga/downtime.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp index 47ef789cb..549b721c1 100644 --- a/lib/icinga/downtime.cpp +++ b/lib/icinga/downtime.cpp @@ -211,7 +211,7 @@ bool Downtime::IsExpired() const bool Downtime::HasValidConfigOwner() const { String configOwner = GetConfigOwner(); - return configOwner.IsEmpty() || GetObject(configOwner); + return configOwner.IsEmpty() || Zone::GetByName(GetAuthoritativeZone()) != Zone::GetLocalZone() || GetObject(configOwner); } int Downtime::GetNextDowntimeID()