Merge pull request #905 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-OrchestratorBatchItems.ps1

@@ -14,7 +14,6 @@ function Push-OrchestratorBatchItems {
             $Item = $_.BatchItem | ConvertFrom-Json
             $BatchItems.Add($Item)
         }
-        Remove-AzDataTableEntity @Table -Entity $Entities -Force
         Write-Information "Retrieved $($BatchItems.Count) batch items for BatchId: $($Item.Parameters.BatchId)"
     } else {
         $BatchItems = [system.Collections.Generic.List[object]]::new()

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Webhooks/Push-AuditLogProcessingBatch.ps1

@@ -28,31 +28,29 @@ function Push-AuditLogProcessingBatch {
 
     do {
         # Fetch only the properties needed to determine claim status and build the batch
-        $WebhookCache = Get-CIPPAzDataTableEntity @WebhookCacheTable -First $PageSize -Skip $Skip -Property @('PartitionKey', 'RowKey', 'ETag', 'CippProcessing', 'CippProcessingStarted')
+        $WebhookCache = Get-CIPPAzDataTableEntity @WebhookCacheTable -First $PageSize -Skip $Skip -Property @('PartitionKey', 'RowKey', 'ETag', 'Timestamp', 'CippProcessing')
         $PageCount = $WebhookCache.Count
 
         # Filter client-side: skip rows actively claimed unless the claim is stale (> 4 hours old)
         $TenantGroups = $WebhookCache | Where-Object {
             -not $_.CippProcessing -or
-            (-not $_.CippProcessingStarted) -or
-            ([datetime]$_.CippProcessingStarted -lt $StaleThreshold)
+            ($_.Timestamp -and $_.Timestamp.UtcDateTime -lt $StaleThreshold)
         } | Group-Object -Property PartitionKey
         $WebhookCache = $null
 
         if ($TenantGroups) {
-            $ProcessingTimestamp = $NowUtc.ToString('yyyy-MM-ddTHH:mm:ssZ')
             foreach ($TenantGroup in $TenantGroups) {
                 $TenantFilter = $TenantGroup.Name
                 $Rows = @($TenantGroup.Group)
                 $RowIds = @($Rows.RowKey)
 
                 # Claim these rows so subsequent timer runs skip them (UpsertMerge preserves JSON and other fields)
+                # The entity Timestamp is updated automatically on write and used for stale detection.
                 foreach ($Row in $Rows) {
                     $ClaimEntity = [PSCustomObject]@{
-                        PartitionKey          = $Row.PartitionKey
-                        RowKey                = $Row.RowKey
-                        CippProcessing        = $true
-                        CippProcessingStarted = $ProcessingTimestamp
+                        PartitionKey   = $Row.PartitionKey
+                        RowKey         = $Row.RowKey
+                        CippProcessing = $true
                     }
                     Add-CIPPAzDataTableEntity @WebhookCacheTable -Entity $ClaimEntity -OperationType UpsertMerge
                 }

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

@@ -9,7 +9,10 @@ function Invoke-ListAuditLogs {
     param($Request, $TriggerMetadata)
     # Interact with query parameters or the body of the request.
     $TenantFilter = ConvertTo-CIPPODataFilterValue -Value $Request.Query.tenantFilter -Type 'String'
-    $LogID = ConvertTo-CIPPODataFilterValue -Value $Request.Query.LogId -Type 'Guid'
+
+    if ($Request.Query.LogId) {
+        $LogID = ConvertTo-CIPPODataFilterValue -Value $Request.Query.LogId -Type 'Guid'
+    }
     $StartDate = $Request.Query.StartDate
     $EndDate = $Request.Query.EndDate
     $RelativeTime = $Request.Query.RelativeTime

Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-TableCleanup.ps1

@@ -85,6 +85,16 @@ function Start-TableCleanup {
                 Property = @('PartitionKey', 'RowKey', 'ETag')
             }
         }
+        @{
+            FunctionName   = 'TableCleanupTask'
+            Type           = 'CleanupRule'
+            TableName      = 'CippOrchestratorBatch'
+            DataTableProps = @{
+                Filter   = "Timestamp lt datetime'$((Get-Date).AddHours(-24).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ'))'"
+                First    = 10000
+                Property = @('PartitionKey', 'RowKey', 'ETag')
+            }
+        }
         @{
             FunctionName = 'TableCleanupTask'
             Type         = 'DeleteTable'