added write hosts for troubleshooting

DChorn-ANS · Aug 7, 2023 · 0467f85 · 0467f85
1 parent c8cf8a4
commit 0467f85
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Modules/CIPPCore/Public/Invoke-CIPPWebhookProcessing.ps1 b/Modules/CIPPCore/Public/Invoke-CIPPWebhookProcessing.ps1
@@ -29,7 +29,7 @@ function Invoke-CippWebhookProcessing {
     if ($data.operation -eq "UserloggedIn" -and $data.UserType -eq 2) { $data.operation = "AdminLoggedIn" }
     if ($data.operation -eq "UserLoggedIn" -and $Country -notin $AllowedLocations) { $data.operation = "UserLoggedInFromUnknownLocation" }
     if ($data.operation -eq "UserLoggedIn" -and $Country -notin $PreviousLocations) { $data.operation = "UserLoggedInFromUnknownLocation" }
-
+    Write-Host "Selecting the Operation: $($data.operation)"
     switch ($data.Operation) {
         "New-InboxRule" { 
             $Title = "$($TenantFilter) - New Rule Detected for $($data.UserId)"
@@ -140,7 +140,7 @@ function Invoke-CippWebhookProcessing {
     }
     $HTML = "$HTML" -f $Title, $IntroText, $ButtonUrl, $ButtonText, $AfterButtonText
 
-    #Add IP and potential location to knownlocation db for this specific user
+    Write-Host "Add IP and potential location to knownlocation db for this specific user"
     if ($data.ClientIP) {
         $LocationInfo = @{
             RowKey          = [string]$data.ClientIP.Split(':')[0]
@@ -159,7 +159,10 @@ function Invoke-CippWebhookProcessing {
         PotentialCity    = $City
     } | ConvertTo-Json -Depth 15 -Compress
 
+    Write-Host "Sending alert to email"
     Send-CIPPAlert -Type 'email' -Title $title -HTMLContent $HTML
+    Write-Host "Sending alert to webhook"
     Send-CIPPAlert -Type 'webhook' -Title $title -JSONContent $JsonContent
+    Write-Host "Sending alert to PSA"
     Send-CIPPAlert -Type 'psa' -Title $title -HTMLContent $HTML
 }
diff --git a/Modules/CIPPCore/Public/Send-CIPPAlert.ps1 b/Modules/CIPPCore/Public/Send-CIPPAlert.ps1
@@ -10,11 +10,12 @@ function Send-CIPPAlert {
         $APIName = "Send Alert",
         $ExecutingUser
     )
-
+    Write-Host "Shipping Alert"
     $Table = Get-CIPPTable -TableName SchedulerConfig
     $Filter = "RowKey eq 'CippNotifications' and PartitionKey eq 'CippNotifications'"
     $Config = [pscustomobject](Get-AzDataTableEntity @Table -Filter $Filter)
     if ($Type -eq 'email') {
+        Write-Host "Trying to send email"
         try {
             if ($Config.email -like '*@*') {
                 $Recipients = $Config.email.split(",").trim() | ForEach-Object { if ($_ -like '*@*') { [pscustomobject]@{EmailAddress = @{Address = $_ } } } }
@@ -41,7 +42,10 @@ function Send-CIPPAlert {
         }
 
     }
+
     if ($Type -eq 'webhook') {
+        Write-Host "Trying to send webhook"
+
         try {
             if ($Config.webhook -ne '') {
                 switch -wildcard ($config.webhook) {
@@ -68,6 +72,8 @@ function Send-CIPPAlert {
             Write-LogMessage -API 'Alerts' -message "Could not send alerts to : $($_.Exception.message)" -sev info
         }
     }
+    Write-Host "Trying to send to PSA"
+
     if ($Type -eq 'psa') {
         if ($config.sendtoIntegration) {
             try {