Force removing obsolete downtimes owned by a ScheduledDowntime

Icinga · May 15, 2024 · 81aec89 · 81aec89
1 parent 393b6ca
commit 81aec89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/icinga/downtime.cpp b/lib/icinga/downtime.cpp
@@ -399,8 +399,8 @@ void Downtime::RemoveDowntime(const String& id, bool includeChildren, bool cance
 
 	if (downtime->IsExpired()) {
 		reason = "expired at " + Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", downtime->GetEndTime());
-	} else if (cancelled && !removedBy.IsEmpty()) {
-		reason = "cancelled by user '" + removedBy + "'";
+	} else if (cancelled && (!removedBy.IsEmpty() || !config_owner.IsEmpty())) {
+		reason = "cancelled by " + (!removedBy.IsEmpty() ? "user '" + removedBy : "'" + config_owner) + "'";
 	} else {
 		reason = force ? "cancelled forcibly" : "<unknown>";
 	}

diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp
@@ -323,7 +323,7 @@ void ScheduledDowntime::RemoveObsoleteDowntimes()
 			auto configOwnerHash (downtime->GetConfigOwnerHash());
 
 			if (!configOwnerHash.IsEmpty() && configOwnerHash != downtimeOptionsHash)
-				Downtime::RemoveDowntime(downtime->GetName(), false, true);
+				Downtime::RemoveDowntime(downtime->GetName(), false, true, true);
 		}
 	}
 }