Merge pull request #1111 from JohnDuprey/dev

CIPP Timers and Offloaded Functions
KelvinTegelaar · Sep 6, 2024 · b9758f8 · b9758f8
2 parents 01685e0 + ddb3aa5
commit b9758f8
Show file tree

Hide file tree

Showing 66 changed files with 833 additions and 804 deletions.
diff --git a/AddChocoApp_OrchestrationStarterTimer/function.json b/AddChocoApp_OrchestrationStarterTimer/function.json
diff --git a/AddChocoApp_OrchestrationStarterTimer/run.ps1 b/AddChocoApp_OrchestrationStarterTimer/run.ps1
diff --git a/BestPracticeAnalyser_OrchestrationStarterTimer/function.json b/BestPracticeAnalyser_OrchestrationStarterTimer/function.json
diff --git a/BestPracticeAnalyser_OrchestrationStarterTimer/run.ps1 b/BestPracticeAnalyser_OrchestrationStarterTimer/run.ps1
diff --git a/Scheduler_Extensions/function.json → CIPPTimer/function.json b/Scheduler_Extensions/function.json → CIPPTimer/function.json
@@ -1,8 +1,10 @@
 {
+  "scriptFile": "../Modules/CippEntrypoints/CippEntrypoints.psm1",
+  "entryPoint": "Receive-CippTimerTrigger",
   "bindings": [
     {
       "name": "Timer",
-      "schedule": "0 0 */2 * * *",
+      "schedule": "0 0/15 * * * *",
       "direction": "in",
       "type": "timerTrigger"
     },

diff --git a/CIPPTimers.json b/CIPPTimers.json
@@ -0,0 +1,110 @@
+[
+  {
+    "Command": "Start-UserTasksOrchestrator",
+    "Description": "Orchestrator to process user scheduled tasks",
+    "Cron": "0 */15 * * * *",
+    "Priority": 1,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-AuditLogOrchestrator",
+    "Description": "Orchestrator to process audit logs",
+    "Cron": "0 */15 * * * *",
+    "Priority": 2,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-WebhookOrchestrator",
+    "Description": "Orchestrator to process webhooks",
+    "Cron": "0 */15 * * * *",
+    "Priority": 3,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-StandardsOrchestrator",
+    "Description": "Orchestrator to process standards",
+    "Cron": "0 0 */4 * * *",
+    "Priority": 4,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-CIPPGraphSubscriptionCleanupTimer",
+    "Description": "Orchestrator to cleanup old Graph subscriptions",
+    "Cron": "0 0 0 * * *",
+    "Priority": 5,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-SchedulerOrchestrator",
+    "Description": "Orchestrator to process system scheduled tasks",
+    "Cron": "0 0 * * * *",
+    "Priority": 6,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Set-CIPPGDAPInviteGroups",
+    "Description": "Orchestrator to map the groups for GDAP invites",
+    "Cron": "0 0 */3 * * *",
+    "Priority": 5,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-UpdateTokensTimer",
+    "Description": "Orchestrator to update tokens",
+    "Cron": "0 0 0 * * 0",
+    "Priority": 7,
+    "RunOnProcessor": true,
+    "IsSystem": true
+  },
+  {
+    "Command": "Start-CIPPGraphSubscriptionRenewalTimer",
+    "Description": "Orchestrator to renew Graph subscriptions",
+    "Cron": "0 10 * * * *",
+    "Priority": 8,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-DomainOrchestrator",
+    "Description": "Orchestrator to process domains",
+    "Cron": "0 0 0 * * *",
+    "Priority": 10,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-UpdatePermissionsOrchestrator",
+    "Description": "Orchestrator to update CPV permissions",
+    "Cron": "0 0 0 * * *",
+    "Priority": 10,
+    "RunOnProcessor": true,
+    "IsSystem": true
+  },
+  {
+    "Command": "Start-BillingTimer",
+    "Description": "Timer to process billing",
+    "Cron": "0 0 0 * * *",
+    "Priority": 12,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-BPAOrchestrator",
+    "Description": "Orchestrator to process BPA reports",
+    "Cron": "0 0 3 * * *",
+    "Priority": 10,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-ExtensionOrchestrator",
+    "Description": "Orchestrator to process extensions",
+    "Cron": "0 0 */2 * * *",
+    "Priority": 12,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-CIPPStatsTimer",
+    "Description": "Timer to process CIPP stats",
+    "Cron": "0 0 0 * * *",
+    "Priority": 15,
+    "RunOnProcessor": true,
+    "IsSystem": true
+  }
+]
diff --git a/Cleanup_OldAuditLogs/function.json b/Cleanup_OldAuditLogs/function.json
diff --git a/Cleanup_OldAuditLogs/run.ps1 b/Cleanup_OldAuditLogs/run.ps1
diff --git a/Domain_OrchestrationStarterTimer/function.json b/Domain_OrchestrationStarterTimer/function.json
diff --git a/Domain_OrchestrationStarterTimer/run.ps1 b/Domain_OrchestrationStarterTimer/run.ps1
diff --git a/ExecGDAPInviteApproved_Timer/function.json b/ExecGDAPInviteApproved_Timer/function.json
diff --git a/ExecGDAPInviteApproved_Timer/run.ps1 b/ExecGDAPInviteApproved_Timer/run.ps1
diff --git a/ListGenericAllTenants/function.json b/ListGenericAllTenants/function.json
diff --git a/ListGenericAllTenants/run.ps1 b/ListGenericAllTenants/run.ps1
diff --git a/...s/Activity Triggers/Push-CIPPStandard.ps1 → ... Triggers/Standards/Push-CIPPStandard.ps1 b/...s/Activity Triggers/Push-CIPPStandard.ps1 → ... Triggers/Standards/Push-CIPPStandard.ps1
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Webhooks/Push-AuditLogTenant.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Webhooks/Push-AuditLogTenant.ps1
@@ -36,25 +36,29 @@ function Push-AuditLogTenant {
             StartTime    = $Item.StartTime
             EndTime      = $Item.EndTime
         }
-        $LogBundles = Get-CIPPAuditLogContentBundles @ContentBundleQuery
-        $ExistingBundles = Get-CIPPAzDataTableEntity @AuditBundleTable -Filter "PartitionKey eq '$($Item.TenantFilter)' and ContentType eq '$LogType' and Timestamp ge datetime'$($LastHour)'"
+        try {
+            $LogBundles = Get-CIPPAuditLogContentBundles @ContentBundleQuery
+            $ExistingBundles = Get-CIPPAzDataTableEntity @AuditBundleTable -Filter "PartitionKey eq '$($Item.TenantFilter)' and ContentType eq '$LogType' and Timestamp ge datetime'$($LastHour)'"
 
-        foreach ($Bundle in $LogBundles) {
-            if ($ExistingBundles.RowKey -notcontains $Bundle.contentId) {
-                $NewBundles.Add([PSCustomObject]@{
-                        PartitionKey      = $TenantFilter
-                        RowKey            = $Bundle.contentId
-                        DefaultDomainName = $TenantFilter
-                        ContentType       = $Bundle.contentType
-                        ContentUri        = $Bundle.contentUri
-                        ContentCreated    = $Bundle.contentCreated
-                        ContentExpiration = $Bundle.contentExpiration
-                        CIPPURL           = [string]$CIPPURL
-                        ProcessingStatus  = 'Pending'
-                        MatchedRules      = ''
-                        MatchedLogs       = 0
-                    })
+            foreach ($Bundle in $LogBundles) {
+                if ($ExistingBundles.RowKey -notcontains $Bundle.contentId) {
+                    $NewBundles.Add([PSCustomObject]@{
+                            PartitionKey      = $TenantFilter
+                            RowKey            = $Bundle.contentId
+                            DefaultDomainName = $TenantFilter
+                            ContentType       = $Bundle.contentType
+                            ContentUri        = $Bundle.contentUri
+                            ContentCreated    = $Bundle.contentCreated
+                            ContentExpiration = $Bundle.contentExpiration
+                            CIPPURL           = [string]$CIPPURL
+                            ProcessingStatus  = 'Pending'
+                            MatchedRules      = ''
+                            MatchedLogs       = 0
+                        })
+                }
             }
+        } catch {
+            Write-Information "Could not get audit log content bundles for $TenantFilter - $LogType, $($_.Exception.Message)"
         }
     }
 

diff --git a/...CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/Applications/Invoke-ExecAppUpload.ps1 b/...CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/Applications/Invoke-ExecAppUpload.ps1
@@ -8,10 +8,23 @@ function Invoke-ExecAppUpload {
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
 
-    try {
-        Start-ApplicationOrchestrator
-    } catch {
-        Write-Host "orchestrator error: $($_.Exception.Message)"
+    $ConfigTable = Get-CIPPTable -tablename Config
+    $Config = Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'OffloadFunctions' and RowKey eq 'OffloadFunctions'"
+
+    if ($Config -and $Config.state -eq $true) {
+        if ($env:CIPP_PROCESSOR -ne 'true') {
+            $ProcessorFunction = [PSCustomObject]@{
+                FunctionName      = 'CIPPFunctionProcessor'
+                ProcessorFunction = 'Start-ApplicationOrchestrator'
+            }
+            Push-OutputBinding -Name QueueItem -Value $ProcessorFunction
+        }
+    } else {
+        try {
+            Start-ApplicationOrchestrator
+        } catch {
+            Write-Host "orchestrator error: $($_.Exception.Message)"
+        }
     }
 
     $Results = [pscustomobject]@{'Results' = 'Started application queue' }