add excludedTenants

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-AddAlert.ps1

@@ -14,15 +14,17 @@ Function Invoke-AddAlert {
     $Tenants = $request.body.tenantFilter
     $Conditions = $request.body.conditions | ConvertTo-Json -Compress -Depth 10 | Out-String
     $TenantsJson = $Tenants | ConvertTo-Json -Compress -Depth 10 | Out-String
+    $excludedTenantsJson = $request.body.excludedTenants | ConvertTo-Json -Compress -Depth 10 | Out-String
     $Actions = $request.body.actions | ConvertTo-Json -Compress -Depth 10 | Out-String
     $RowKey = $Request.body.RowKey ? $Request.body.RowKey : (New-Guid).ToString()
     $CompleteObject = @{
-        Tenants      = [string]$TenantsJson
-        Conditions   = [string]$Conditions
-        Actions      = [string]$Actions
-        type         = $request.body.logbook.value
-        RowKey       = $RowKey
-        PartitionKey = 'Webhookv2'
+        Tenants         = [string]$TenantsJson
+        excludedTenants = [string]$excludedTenantsJson
+        Conditions      = [string]$Conditions
+        Actions         = [string]$Actions
+        type            = $request.body.logbook.value
+        RowKey          = $RowKey
+        PartitionKey    = 'Webhookv2'
     }
     $WebhookTable = get-cipptable -TableName 'WebhookRules'
     Add-CIPPAzDataTableEntity @WebhookTable -Entity $CompleteObject -Force

Modules/CIPPCore/Public/Webhooks/Test-CIPPAuditLogRules.ps1

@@ -34,6 +34,7 @@ function Test-CIPPAuditLogRules {
     $Configuration = $ConfigEntries | Where-Object { ($_.Tenants -match $TenantFilter -or $_.Tenants -match 'AllTenants') } | ForEach-Object {
         [pscustomobject]@{
             Tenants    = ($_.Tenants | ConvertFrom-Json)
+            Excluded   = ($_.excludedTenants | ConvertFrom-Json -ErrorAction SilentlyContinue)
             Conditions = $_.Conditions
             Actions    = $_.Actions
             LogType    = $_.Type
@@ -180,6 +181,9 @@ function Test-CIPPAuditLogRules {
         #write-warning "Creating filters - $(($ProcessedData.operation | Sort-Object -Unique) -join ',') - $($TenantFilter)"
 
         $Where = $Configuration | ForEach-Object {
+            if ($TenantFilter -In $_.Excluded.value) {
+                return
+            }
             $conditions = $_.Conditions | ConvertFrom-Json | Where-Object { $_.Input.value -ne '' }
             $actions = $_.Actions
             $conditionStrings = [System.Collections.Generic.List[string]]::new()