Add custom task support

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandard.ps1

@@ -49,7 +49,28 @@ function Push-CIPPStandard {
             $Settings = $Item.Settings
         }
 
-        & $FunctionName -Tenant $Item.Tenant -Settings $Settings -ErrorAction Stop
+        # Prepare telemetry metadata for standard execution
+        $metadata = @{
+            Standard       = $Standard
+            Tenant         = $Tenant
+            TemplateId     = $Item.templateId
+            FunctionName   = $FunctionName
+            TriggerType    = 'Standard'
+        }
+        
+        # Add template-specific metadata
+        if ($Standard -eq 'IntuneTemplate' -and $Item.Settings.TemplateList.value) {
+            $metadata['IntuneTemplateId'] = $Item.Settings.TemplateList.value
+        }
+        if ($Standard -eq 'ConditionalAccessTemplate' -and $Item.Settings.TemplateList.value) {
+            $metadata['CATemplateId'] = $Item.Settings.TemplateList.value
+        }
+
+        # Wrap the standard execution with telemetry
+        Measure-CippTask -TaskName $Standard -EventName 'CIPP.StandardCompleted' -Metadata $metadata -Script {
+            & $FunctionName -Tenant $Item.Tenant -Settings $Settings -ErrorAction Stop
+        }
+        
         Write-Information "Standard $($Standard) completed for tenant $($Tenant)"
     } catch {
         Write-LogMessage -API 'Standards' -tenant $Tenant -message "Error running standard $($Standard) for tenant $($Tenant) - $($_.Exception.Message)" -sev Error -LogData (Get-CippException -Exception $_)

Modules/CIPPCore/Public/Tools/Measure-CippTask.ps1

@@ -10,6 +10,8 @@ function Measure-CippTask {
         The scriptblock to execute and measure
     .PARAMETER Metadata
         Optional hashtable of metadata to include in telemetry (e.g., Command, Tenant, TaskInfo)
+    .PARAMETER EventName
+        Optional custom event name (default: "CIPP.TaskCompleted")
     .FUNCTIONALITY
         Internal
     .EXAMPLE
@@ -19,6 +21,13 @@ function Measure-CippTask {
             Command = "New-CIPPTemplateRun"
             Tenant = "contoso.onmicrosoft.com"
         }
+    .EXAMPLE
+        Measure-CippTask -TaskName "DisableGuests" -EventName "CIPP.StandardCompleted" -Script {
+            # Standard logic here
+        } -Metadata @{
+            Standard = "DisableGuests"
+            Tenant = "contoso.onmicrosoft.com"
+        }
     #>
     [CmdletBinding()]
     param(
@@ -29,7 +38,10 @@ function Measure-CippTask {
         [scriptblock]$Script,
 
         [Parameter(Mandatory = $false)]
-        [hashtable]$Metadata
+        [hashtable]$Metadata,
+
+        [Parameter(Mandatory = $false)]
+        [string]$EventName = 'CIPP.TaskCompleted'
     )
 
     # Initialize tracking variables
@@ -81,10 +93,10 @@ function Measure-CippTask {
                 $metrics['DurationMs'] = [double]$durationMs
 
                 # Send custom event to Application Insights
-                $global:TelemetryClient.TrackEvent('CIPP.TaskCompleted', $props, $metrics)
+                $global:TelemetryClient.TrackEvent($EventName, $props, $metrics)
                 $global:TelemetryClient.Flush()
 
-                Write-Verbose "Telemetry sent for task '$TaskName' (${durationMs}ms)"
+                Write-Verbose "Telemetry sent for task '$TaskName' to event '$EventName' (${durationMs}ms)"
             } catch {
                 Write-Warning "Failed to send telemetry for task '${TaskName}': $($_.Exception.Message)"
             }