From 7f0aaf9b79fb97442bbeb8f78a02cf92e4e9827d Mon Sep 17 00:00:00 2001
From: Silas <67681686+Tqnsls@users.noreply.github.com>
Date: Mon, 13 Mar 2023 12:47:39 +0100
Subject: [PATCH] Update commands.conf

---
 etc/icinga2/conf.d/commands.conf | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/etc/icinga2/conf.d/commands.conf b/etc/icinga2/conf.d/commands.conf
index bd511cebc..5e1035018 100644
--- a/etc/icinga2/conf.d/commands.conf
+++ b/etc/icinga2/conf.d/commands.conf
@@ -43,6 +43,9 @@ object NotificationCommand "mail-host-notification" {
       required = true
       value = "$notification_hoststate$"
     }
+    "-X" = {
+      required = false
+      value = "$notification_hostnotes$"
     "-t" = {
       required = true
       value = "$notification_type$"
@@ -62,6 +65,7 @@ object NotificationCommand "mail-host-notification" {
     notification_hostoutput = "$host.output$"
     notification_hoststate = "$host.state$"
     notification_useremail = "$user.email$"
+    notification_hostnotes = $host.notes$"
   }
 }
 
@@ -110,6 +114,14 @@ object NotificationCommand "mail-service-notification" {
       required = true
       value = "$notification_type$"
     }
+    "-X" = {
+      required = false
+      value = "$notification_hostnotes$"
+    }
+    "-x" = {
+      required = false
+      value = "$notification_servicenotes$"
+    }
     "-u" = {
       required = true
       value = "$notification_servicedisplayname$"
@@ -131,6 +143,8 @@ object NotificationCommand "mail-service-notification" {
     notification_servicestate = "$service.state$"
     notification_useremail = "$user.email$"
     notification_servicedisplayname = "$service.display_name$"
+    notification_hostnotes = "$host.notes$"
+    notification_servicenotes = "$service.notes$"
   }
 }
 
@@ -160,6 +174,7 @@ object NotificationCommand "mail-host-notification" {
     NOTIFICATIONCOMMENT = "$notification.comment$"
     HOSTDISPLAYNAME = "$host.display_name$"
     USEREMAIL = "$user.email$"
+    HOSTNOTES = "$host.notes$"
   }
 }
 
@@ -180,6 +195,8 @@ object NotificationCommand "mail-service-notification" {
     HOSTDISPLAYNAME = "$host.display_name$"
     SERVICEDISPLAYNAME = "$service.display_name$"
     USEREMAIL = "$user.email$"
+    HOSTNOTES = "$host.notes$"
+    SERVICENOTES = "$service.notes$"
   }
 }