Merge pull request #602 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/GraphHelper/New-GraphGetRequest.ps1

@@ -165,6 +165,8 @@ function New-GraphGetRequest {
                     # Check for "Resource temporarily unavailable"
                     elseif ($Message -like '*Resource temporarily unavailable*') {
                         if ($RetryCount -lt $MaxRetries) {
+                            $WaitTime = Get-Random -Minimum 1.1 -Maximum 3.1  # Random sleep between 1-2 seconds
+                            Write-Warning "Resource temporarily unavailable. Waiting $WaitTime seconds before retry. Attempt $($RetryCount + 1) of $MaxRetries"
                             $ShouldRetry = $true
                         }
                     }

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

@@ -204,9 +204,9 @@ function Test-CIPPAuditLogRules {
             $LocationTable = Get-CIPPTable -TableName 'knownlocationdbv2'
             $ProcessedData = foreach ($AuditRecord in $SearchResults) {
                 $RecordStartTime = Get-Date
-                Write-Information "Processing RowKey $($AuditRecord.id)"
-                $RootProperties = $AuditRecord | Select-Object * -ExcludeProperty auditData
-                $Data = $AuditRecord.auditData | Select-Object *, CIPPAction, CIPPClause, CIPPGeoLocation, CIPPBadRepIP, CIPPHostedIP, CIPPIPDetected, CIPPLocationInfo, CIPPExtendedProperties, CIPPDeviceProperties, CIPPParameters, CIPPModifiedProperties, AuditRecord -ErrorAction SilentlyContinue
+                Write-Information "Processing RowKey $($AuditRecord.id) - $($TenantFilter)."
+                $RootProperties = $AuditRecord
+                $Data = $AuditRecord | Select-Object *, CIPPAction, CIPPClause, CIPPGeoLocation, CIPPBadRepIP, CIPPHostedIP, CIPPIPDetected, CIPPLocationInfo, CIPPExtendedProperties, CIPPDeviceProperties, CIPPParameters, CIPPModifiedProperties, AuditRecord -ErrorAction SilentlyContinue
                 try {
                     # Attempt to locate GUIDs in $Data and match them with their corresponding user, group, device, or service principal recursively by checking each key/value once located lets store these mapped values in a CIPP$KeyName property
                     Write-Information 'Checking Data for GUIDs to map to users, groups, devices, or service principals'