From 5bace87720edf1f68b0a6637b8af724e37cef6bd Mon Sep 17 00:00:00 2001
From: Yoshify <xyoshify@gmail.com>
Date: Mon, 9 Oct 2023 09:57:51 +1000
Subject: [PATCH] Use Config in alerts to optionally send tenant ID if
 includeTenantId is true

---
 Scheduler_Alert/run.ps1 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Scheduler_Alert/run.ps1 b/Scheduler_Alert/run.ps1
index 8200da2479e9..aeb7ea354d98 100644
--- a/Scheduler_Alert/run.ps1
+++ b/Scheduler_Alert/run.ps1
@@ -11,6 +11,9 @@ try {
     }
     $Alerts = Get-AzDataTableEntity @Table -Filter $Filter
 
+    $ConfigFilter = "RowKey eq 'CippNotifications' and PartitionKey eq 'CippNotifications'"
+    $Config = [pscustomobject](Get-AzDataTableEntity @Table -Filter $ConfigFilter)
+    
     $DeltaTable = Get-CIPPTable -Table DeltaCompare
     $LastRunTable = Get-CIPPTable -Table AlertLastRun
 
@@ -379,7 +382,12 @@ try {
 
     $ShippedAlerts | ForEach-Object {
         if ($_ -notin $currentlog.Message) {
-            Write-LogMessage -message $_ -API 'Alerts' -tenant $tenant.tenant -sev Alert -tenantid $Tenant.tenantid
+            if ($Config.includeTenantId) {
+                Write-LogMessage -message $_ -API 'Alerts' -tenant $tenant.tenant -sev Alert -tenantid $Tenant.tenantid
+            }
+            else {
+                Write-LogMessage -message $_ -API 'Alerts' -tenant $tenant.tenant -sev Alert
+            }
         }
     }
     [PSCustomObject]@{