Merge pull request #1138 from KelvinTegelaar/dev

Dev to release

.github/workflows/dev_cippkkxvm.yml

@@ -0,0 +1,30 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cippkkxvm
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  deploy:
+    runs-on: windows-latest
+
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cippkkxvm'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_171C3E2B1E2346AAA333905DFCA62F2D }}

.github/workflows/dev_cippkwn4s-auditlog.yml

@@ -0,0 +1,30 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cippkwn4s-auditlog
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  deploy:
+    runs-on: windows-latest
+
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cippkwn4s-auditlog'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_4CBFBE8BE62240D789C371767B49278E }}

.github/workflows/dev_cipplwwww-proc.yml

@@ -0,0 +1,30 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cipplwwww-proc
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  deploy:
+    runs-on: windows-latest
+
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cipplwwww-proc'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_B8CE64E970E74E6AB2D6655823D95B1A }}

Z_CIPPHttpTrigger/function.json → CIPPHttpTrigger/function.json

@@ -27,12 +27,6 @@
       "name": "Subscription",
       "queueName": "AlertSubscriptions"
     },
-    {
-      "type": "queue",
-      "direction": "out",
-      "name": "mailboxstats",
-      "queueName": "generalAllTenantQueue"
-    },
     {
       "type": "queue",
       "direction": "out",
@@ -45,12 +39,6 @@
       "name": "alertqueue",
       "queueName": "alertqueue"
     },
-    {
-      "type": "queue",
-      "direction": "out",
-      "name": "gdapqueue",
-      "queueName": "gdapqueue"
-    },
     {
       "type": "queue",
       "direction": "out",

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"
     },

CIPPTimers.json

@@ -0,0 +1,122 @@
+[
+  {
+    "Command": "Start-UserTasksOrchestrator",
+    "Description": "Orchestrator to process user scheduled tasks",
+    "Cron": "0 */15 * * * *",
+    "Priority": 1,
+    "RunOnProcessor": true,
+    "PreferredProcessor": "usertasks"
+  },
+  {
+    "Command": "Start-CIPPProcessorQueue",
+    "Description": "Timer to handle user initiated tasks",
+    "Cron": "0 */15 * * * *",
+    "Priority": 1,
+    "RunOnProcessor": true
+  },
+  {
+    "Command": "Start-AuditLogOrchestrator",
+    "Description": "Orchestrator to process audit logs",
+    "Cron": "0 */15 * * * *",
+    "Priority": 2,
+    "RunOnProcessor": true,
+    "PreferredProcessor": "auditlog",
+    "IsSystem": 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,
+    "PreferredProcessor": "standards"
+  },
+  {
+    "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 15 * * * *",
+    "Priority": 8,
+    "RunOnProcessor": true,
+    "IsSystem": 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
+  }
+]