From 48fc88084276099143a67fdfc7d26f4df87163c2 Mon Sep 17 00:00:00 2001
From: Sukhwinder Dhillon <sukhwinder33445@gmail.com>
Date: Thu, 9 Jan 2025 12:12:29 +0100
Subject: [PATCH 1/2] Macros: Add missing support for `DateTime` type macro

---
 library/Icingadb/Common/Macros.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library/Icingadb/Common/Macros.php b/library/Icingadb/Common/Macros.php
index c7f0e1549..0ace2a9e1 100644
--- a/library/Icingadb/Common/Macros.php
+++ b/library/Icingadb/Common/Macros.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Icingadb\Common;
 
+use DateTime;
 use Icinga\Application\Logger;
 use Icinga\Module\Icingadb\Compat\CompatHost;
 use Icinga\Module\Icingadb\Compat\CompatService;
@@ -120,6 +121,10 @@ public function resolveMacro(string $macro, $object): string
             $value = null;
         }
 
-        return $value !== null ? $value : $macro;
+        if ($value instanceof DateTime) {
+            $value = $value->getTimestamp();
+        }
+
+        return $value ?? $macro;
     }
 }

From c824addbd75353eeb0eaef37799f541fdf95da7c Mon Sep 17 00:00:00 2001
From: Sukhwinder Dhillon <sukhwinder33445@gmail.com>
Date: Thu, 9 Jan 2025 12:24:35 +0100
Subject: [PATCH 2/2]  Macros: Add missing support for `bool` type macro

---
 library/Icingadb/Common/Macros.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/Icingadb/Common/Macros.php b/library/Icingadb/Common/Macros.php
index 0ace2a9e1..c23420e52 100644
--- a/library/Icingadb/Common/Macros.php
+++ b/library/Icingadb/Common/Macros.php
@@ -123,6 +123,8 @@ public function resolveMacro(string $macro, $object): string
 
         if ($value instanceof DateTime) {
             $value = $value->getTimestamp();
+        } elseif (is_bool($value)) {
+            $value = $value ? 'y' : 'n';
         }
 
         return $value ?? $macro;