Merge pull request #509 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

CIPPTimers.json

@@ -105,6 +105,14 @@
     "Priority": 5,
     "RunOnProcessor": true
   },
+  {
+    "Id": "0967c860-3a57-4860-8f33-e5136eae7b4e",
+    "Command": "Start-TenantDynamicGroupOrchestrator",
+    "Description": "Orchestrator to update dynamic tenant groups",
+    "Cron": "0 0 */4 * * *",
+    "Priority": 6,
+    "RunOnProcessor": true
+  },
   {
     "Id": "4ca242d0-8dc8-4256-b0ed-186599f4233f",
     "Command": "Start-UpdateTokensTimer",
@@ -206,4 +214,4 @@
     "RunOnProcessor": true,
     "IsSystem": true
   }
-]
+]

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tenant Groups/Push-UpdateDynamicTenantGroup.ps1

@@ -0,0 +1,14 @@
+function Push-UpdateDynamicTenantGroup {
+    <#
+    .SYNOPSIS
+    Push an update to a Dynamic Tenant Group
+    .FUNCTIONALITY
+    Entrypoint
+    #>
+
+    [CmdletBinding()]
+    param ($Item)
+
+    Write-Information "Pushing update to Dynamic Tenant Group: $($Item.Name) (ID: $($Item.Id))"
+    Update-CIPPDynamicTenantGroups -GroupId $Item.Id
+}

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecRunTenantGroupRule.ps1

@@ -20,8 +20,9 @@ function Invoke-ExecRunTenantGroupRule {
 
         if (-not $Group) { $Body = @{ Results = 'Group not found' } }
 
-        $UpdateResult = Update-CIPPDynamicTenantGroups -GroupId $GroupId
-        $Body = @{ Results = "Dynamic rules executed successfully for group '$($Group.Name)'. Members added: $($UpdateResult.MembersAdded), Members removed: $($UpdateResult.MembersRemoved)" }
+        $null = Start-TenantDynamicGroupOrchestrator -GroupId $GroupId
+
+        $Body = @{ Results = "Dynamic rules executed successfully for group '$($Group.Name)'. Processing will continue in the background. Check the logbook for details." }
 
         return ([HttpResponseContext]@{
                 StatusCode = [HttpStatusCode]::OK

Modules/CIPPCore/Public/Entrypoints/Invoke-ListLogs.ps1

@@ -58,6 +58,7 @@ function Invoke-ListLogs {
             $PartitionKey = $Request.Query.DateFilter
             $username = $Request.Query.User ?? '*'
             $TenantFilter = $Request.Query.Tenant
+            $ApiFilter = $Request.Query.API
 
             $StartDate = $Request.Query.StartDate ?? $Request.Query.DateFilter
             $EndDate = $Request.Query.EndDate ?? $Request.Query.DateFilter
@@ -87,7 +88,8 @@ function Invoke-ListLogs {
         $Rows = Get-AzDataTableEntity @Table -Filter $Filter | Where-Object {
             $_.Severity -in $LogLevel -and
             $_.Username -like $username -and
-            ($TenantFilter -eq $null -or $TenantFilter -eq 'AllTenants' -or $_.Tenant -like "*$TenantFilter*" -or $_.TenantID -eq $TenantFilter)
+            ($TenantFilter -eq $null -or $TenantFilter -eq 'AllTenants' -or $_.Tenant -like "*$TenantFilter*" -or $_.TenantID -eq $TenantFilter) -and
+            ($ApiFilter -eq $null -or $_.API -match "$ApiFilter")
         }
 
         if ($AllowedTenants -notcontains 'AllTenants') {
@@ -122,8 +124,8 @@ function Invoke-ListLogs {
     }
 
     return [HttpResponseContext]@{
-            StatusCode = [HttpStatusCode]::OK
-            Body       = @($ReturnedLog | Sort-Object -Property DateTime -Descending)
-        }
+        StatusCode = [HttpStatusCode]::OK
+        Body       = @($ReturnedLog | Sort-Object -Property DateTime -Descending)
+    }
 
 }

Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-AuditLogOrchestrator.ps1

@@ -2,6 +2,9 @@ function Start-AuditLogOrchestrator {
     <#
     .SYNOPSIS
     Start the Audit Log Polling Orchestrator
+
+    .FUNCTIONALITY
+    Entrypoint
     #>
     [CmdletBinding(SupportsShouldProcess = $true)]
     param()

Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-AuditLogProcessingOrchestrator.ps1

@@ -2,6 +2,9 @@ function Start-AuditLogProcessingOrchestrator {
     <#
     .SYNOPSIS
     Start the Audit Log Processing Orchestrator
+
+    .FUNCTIONALITY
+    Entrypoint
     #>
     [CmdletBinding(SupportsShouldProcess = $true)]
     param()

Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-AuditLogSearchCreation.ps1

@@ -2,6 +2,9 @@ function Start-AuditLogSearchCreation {
     <#
     .SYNOPSIS
     Start the Audit Log Searches
+
+    .FUNCTIONALITY
+    Entrypoint
     #>
     [CmdletBinding(SupportsShouldProcess = $true)]
     param()

Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-DriftStandardsOrchestrator.ps1

@@ -2,6 +2,9 @@ function Start-DriftStandardsOrchestrator {
     <#
     .SYNOPSIS
     Start the Drift Standards Orchestrator
+
+    .FUNCTIONALITY
+    Entrypoint
     #>
     [CmdletBinding(SupportsShouldProcess = $true)]
     param()

Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-SchedulerOrchestrator.ps1

@@ -2,6 +2,9 @@ function Start-SchedulerOrchestrator {
     <#
     .SYNOPSIS
     Start the Scheduler Orchestrator
+
+    .FUNCTIONALITY
+    Entrypoint
     #>
     [CmdletBinding(SupportsShouldProcess = $true)]
     param()

Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-StandardsOrchestrator.ps1

@@ -2,6 +2,9 @@ function Start-StandardsOrchestrator {
     <#
     .SYNOPSIS
     Start the Standards Orchestrator
+
+    .FUNCTIONALITY
+    Entrypoint
     #>
     [CmdletBinding(SupportsShouldProcess = $true)]
     param()