Merge pull request #604 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

.gitignore

@@ -9,7 +9,7 @@ Logs
 ExcludedTenants
 SendNotifications/config.json
 .env
-
+Output/
 
 # Cursor IDE
 .cursor/rules

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Groups/Invoke-ListGroupTemplates.ps1

@@ -13,35 +13,44 @@ function Invoke-ListGroupTemplates {
     $Table = Get-CippTable -tablename 'templates'
     $Filter = "PartitionKey eq 'GroupTemplate'"
     $Templates = (Get-CIPPAzDataTableEntity @Table -Filter $Filter) | ForEach-Object {
-        $data = $_.JSON | ConvertFrom-Json -ErrorAction SilentlyContinue
-        # Normalize groupType to camelCase for consistent frontend handling
-        # Handle both stored normalized values and legacy values
-        $normalizedGroupType = switch -Wildcard ($data.groupType) {
-            # Already normalized values (most common)
-            'dynamicdistribution' { 'dynamicDistribution'; break }
-            'azurerole' { 'azureRole'; break }
-            # Legacy values that might exist in stored templates
-            '*dynamicdistribution*' { 'dynamicDistribution'; break }
-            '*dynamic*' { 'dynamic'; break }
-            '*azurerole*' { 'azureRole'; break }
-            '*unified*' { 'm365'; break }
-            '*microsoft*' { 'm365'; break }
-            '*m365*' { 'm365'; break }
-            '*generic*' { 'generic'; break }
-            '*security*' { 'security'; break }
-            '*distribution*' { 'distribution'; break }
-            '*mail*' { 'distribution'; break }
-            default { $data.groupType }
-        }
+        try {
+            $data = $_.JSON | ConvertFrom-Json -ErrorAction SilentlyContinue
+            # Normalize groupType to camelCase for consistent frontend handling
+            # Handle both stored normalized values and legacy values
+
+            if (!$data.groupType) {
+                $data.groupType = 'generic'
+            }
+
+            $normalizedGroupType = switch -Wildcard ($data.groupType) {
+                # Already normalized values (most common)
+                'dynamicdistribution' { 'dynamicDistribution'; break }
+                'azurerole' { 'azureRole'; break }
+                # Legacy values that might exist in stored templates
+                '*dynamicdistribution*' { 'dynamicDistribution'; break }
+                '*dynamic*' { 'dynamic'; break }
+                '*azurerole*' { 'azureRole'; break }
+                '*unified*' { 'm365'; break }
+                '*microsoft*' { 'm365'; break }
+                '*m365*' { 'm365'; break }
+                '*generic*' { 'generic'; break }
+                '*security*' { 'security'; break }
+                '*distribution*' { 'distribution'; break }
+                '*mail*' { 'distribution'; break }
+                default { $data.groupType }
+            }
 
-        [PSCustomObject]@{
-            displayName     = $data.displayName
-            description     = $data.description
-            groupType       = $normalizedGroupType
-            membershipRules = $data.membershipRules
-            allowExternal   = $data.allowExternal
-            username        = $data.username
-            GUID            = $_.RowKey
+            [PSCustomObject]@{
+                displayName     = $data.displayName
+                description     = $data.description
+                groupType       = $normalizedGroupType
+                membershipRules = $data.membershipRules
+                allowExternal   = $data.allowExternal
+                username        = $data.username
+                GUID            = $_.RowKey
+            }
+        } catch {
+            Write-Information "Could not parse group template $($_.RowKey): $($_.Exception.Message)"
         }
     } | Sort-Object -Property displayName
 

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

@@ -15,11 +15,9 @@ function Start-AuditLogIngestion {
 
     try {
         Write-Information 'Office 365 Management Activity API: Starting audit log ingestion orchestrator'
-
         # Get webhook rules to determine which tenants to monitor
         $WebhookRulesTable = Get-CippTable -TableName 'WebhookRules'
         $WebhookRules = Get-CIPPAzDataTableEntity @WebhookRulesTable -Filter "PartitionKey eq 'Webhookv2'"
-
         if (($WebhookRules | Measure-Object).Count -eq 0) {
             Write-Information 'No webhook rules defined, skipping audit log ingestion'
             return
@@ -78,7 +76,7 @@ function Start-AuditLogIngestion {
         if ($PSCmdlet.ShouldProcess('Start-AuditLogIngestion', 'Starting Audit Log Ingestion')) {
       $Queue = New-CippQueueEntry -Name 'Audit Logs Ingestion' -Reference 'AuditLogsIngestion' -TotalTasks $TenantsToProcess.Count
       $Batch = $TenantsToProcess | Select-Object @{Name = 'TenantFilter'; Expression = { $_.defaultDomainName } }, @{Name = 'TenantId'; Expression = { $_.customerId } }, @{Name = 'ContentTypes'; Expression = { $_.ContentTypes } }, @{Name = 'QueueId'; Expression = { $Queue.RowKey } }, @{Name = 'FunctionName'; Expression = { 'AuditLogIngestion' } }
-            $InputObject = [PSCustomObject]@{
+      $InputObject = [PSCustomObject]@{
                 OrchestratorName = 'AuditLogsIngestion'
                 Batch            = @($Batch)
                 SkipLog          = $true

Modules/CIPPCore/Public/Get-CIPPTimerFunctions.ps1

@@ -40,7 +40,9 @@ function Get-CIPPTimerFunctions {
     }
 
     $CIPPRoot = (Get-Item $CIPPCoreModuleRoot).Parent.Parent
+    Write-Host "Loading CIPPTimers from $CIPPRoot\CIPPTimers.json"
     $CippTimers = Get-Content -Path $CIPPRoot\CIPPTimers.json
+    Write-Host "CIPPTimers content: $CippTimers"
     if ($ListAllTasks) {
         $Orchestrators = $CippTimers | ConvertFrom-Json | Sort-Object -Property Priority
     } else {

Modules/CIPPCore/Public/New-CIPPIntuneTemplate.ps1

@@ -51,7 +51,7 @@ function New-CIPPIntuneTemplate {
         'configurationPolicies' {
             $Type = 'Catalog'
             $Template = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/deviceManagement/$($urlname)('$($ID)')?`$expand=settings" -tenantid $TenantFilter | Select-Object name, description, settings, platforms, technologies, templateReference
-            $TemplateJson = $Template | ConvertTo-Json -Depth 100
+            $TemplateJson = $Template | ConvertTo-Json -Depth 100 -Compress
             $DisplayName = $Template.name
 
         }

Modules/CippEntrypoints/CippEntrypoints.psm1

@@ -278,7 +278,15 @@ function Receive-CippActivityTrigger {
     try {
         $Output = $null
         Set-Location (Get-Item $PSScriptRoot).Parent.Parent.FullName
-
+        $metric = @{
+            Kind     = 'CIPPCommandStart'
+            Command  = $Item.Command
+            Tenant   = $Item.TenantFilter.defaultDomainName
+            TaskName = $Item.TaskName
+            JSONData = ($Item | ConvertTo-Json -Depth 10 -Compress)
+        } | ConvertTo-Json -Depth 10 -Compress
+
+        Write-Information -MessageData $metric -Tag 'CIPPCommandStart'
         if ($Item.QueueId) {
             if ($Item.QueueName) {
                 $QueueName = $Item.QueueName
@@ -400,6 +408,7 @@ function Receive-CIPPTimerTrigger {
 
     $UtcNow = (Get-Date).ToUniversalTime()
     $Functions = Get-CIPPTimerFunctions
+    Write-Host "CIPP Timer Trigger executed at $UtcNow. Found $($Functions.Count) functions to evaluate. The names are as follows: $($Functions.Command -join ', ')"
     $Table = Get-CIPPTable -tablename CIPPTimers
     $Statuses = Get-CIPPAzDataTableEntity @Table
     $FunctionName = $env:WEBSITE_SITE_NAME