fixes

KelvinTegelaar · KelvinTegelaar · commit 331a0c766ad4 · 2025-12-07T23:29:09.000+01:00
diff --git a/Modules/CIPPCore/Public/New-CIPPBackupTask.ps1 b/Modules/CIPPCore/Public/New-CIPPBackupTask.ps1
@@ -7,7 +7,7 @@ function New-CIPPBackupTask {
 
     $BackupData = switch ($Task) {
         'CippCustomVariables' {
-            Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'CustomVariables' -Execute {
+            Measure-CippTask -TaskName 'CustomVariables' -EventName 'CIPP.BackupCompleted' -Script {
                 $ReplaceTable = Get-CIPPTable -tablename 'CippReplacemap'
 
                 # Get tenant-specific variables
@@ -26,7 +26,7 @@ function New-CIPPBackupTask {
             }
         }
         'users' {
-            Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'Users' -Execute {
+            Measure-CippTask -TaskName 'Users' -EventName 'CIPP.BackupCompleted' -Script {
                 $Users = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/users?$top=999' -tenantid $TenantFilter | Select-Object * -ExcludeProperty mail, provisionedPlans, onPrem*, *passwordProfile*, *serviceProvisioningErrors*, isLicenseReconciliationNeeded, isManagementRestricted, isResourceAccount, *date*, *external*, identities, deletedDateTime, isSipEnabled, assignedPlans, cloudRealtimeCommunicationInfo, deviceKeys, provisionedPlan, securityIdentifier
                 #remove the property if the value is $null
                 $users = $Users | ForEach-Object {
@@ -38,12 +38,12 @@ function New-CIPPBackupTask {
             }
         }
         'groups' {
-            Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'Groups' -Execute {
+            Measure-CippTask -TaskName 'Groups' -EventName 'CIPP.BackupCompleted' -Script {
                 New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/groups?$top=999' -tenantid $TenantFilter
             }
         }
         'ca' {
-            Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'ConditionalAccess' -Execute {
+            Measure-CippTask -TaskName 'ConditionalAccess' -EventName 'CIPP.BackupCompleted' -Script {
                 $Policies = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/conditionalAccess/policies?$top=999' -tenantid $TenantFilter -AsApp $true
                 foreach ($policy in $policies) {
                     try {
@@ -55,7 +55,7 @@ function New-CIPPBackupTask {
             }
         }
         'intuneconfig' {
-            Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'IntuneConfiguration' -Execute {
+            Measure-CippTask -TaskName 'IntuneConfiguration' -EventName 'CIPP.BackupCompleted' -Script {
                 $GraphURLS = @("https://graph.microsoft.com/beta/deviceManagement/deviceConfigurations?`$select=id,displayName,lastModifiedDateTime,roleScopeTagIds,microsoft.graph.unsupportedDeviceConfiguration/originalEntityTypeName&`$expand=assignments&top=1000"
                     'https://graph.microsoft.com/beta/deviceManagement/windowsDriverUpdateProfiles'
                     "https://graph.microsoft.com/beta/deviceManagement/groupPolicyConfigurations?`$expand=assignments&top=999"
@@ -85,23 +85,23 @@ function New-CIPPBackupTask {
             }
         }
         'intunecompliance' {
-            Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'IntuneCompliance' -Execute {
+            Measure-CippTask -TaskName 'IntuneCompliance' -EventName 'CIPP.BackupCompleted' -Script {
                 New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/deviceManagement/deviceCompliancePolicies?$top=999' -tenantid $TenantFilter | ForEach-Object {
                     New-CIPPIntuneTemplate -TenantFilter $TenantFilter -URLName 'deviceCompliancePolicies' -ID $_.ID
                 }
             }
         }
 
         'intuneprotection' {
-            Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'IntuneProtection' -Execute {
+            Measure-CippTask -TaskName 'IntuneProtection' -EventName 'CIPP.BackupCompleted' -Script {
                 New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/deviceAppManagement/managedAppPolicies?$top=999' -tenantid $TenantFilter | ForEach-Object {
                     New-CIPPIntuneTemplate -TenantFilter $TenantFilter -URLName 'managedAppPolicies' -ID $_.ID
                 }
             }
         }
 
         'antispam' {
-            Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'AntiSpam' -Execute {
+            Measure-CippTask -TaskName 'AntiSpam' -EventName 'CIPP.BackupCompleted' -Script {
                 $Policies = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-HostedContentFilterPolicy' | Select-Object * -ExcludeProperty *odata*, *data.type*
                 $Rules = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-HostedContentFilterRule' | Select-Object * -ExcludeProperty *odata*, *data.type*
 
@@ -122,7 +122,7 @@ function New-CIPPBackupTask {
         }
 
         'antiphishing' {
-            Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'AntiPhishing' -Execute {
+            Measure-CippTask -TaskName 'AntiPhishing' -EventName 'CIPP.BackupCompleted' -Script {
                 $Policies = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-AntiPhishPolicy' | Select-Object * -ExcludeProperty *odata*, *data.type*
                 $Rules = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-AntiPhishRule' | Select-Object * -ExcludeProperty *odata*, *data.type*
 
@@ -143,13 +143,13 @@ function New-CIPPBackupTask {
         }
 
         'CippWebhookAlerts' {
-            Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'WebhookAlerts' -Execute {
+            Measure-CippTask -TaskName 'WebhookAlerts' -EventName 'CIPP.BackupCompleted' -Script {
                 $WebhookTable = Get-CIPPTable -TableName 'WebhookRules'
                 Get-CIPPAzDataTableEntity @WebhookTable | Where-Object { $TenantFilter -in ($_.Tenants | ConvertFrom-Json).value }
             }
         }
         'CippScriptedAlerts' {
-            Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'ScriptedAlerts' -Execute {
+            Measure-CippTask -TaskName 'ScriptedAlerts' -EventName 'CIPP.BackupCompleted' -Script {
                 $ScheduledTasks = Get-CIPPTable -TableName 'ScheduledTasks'
                 Get-CIPPAzDataTableEntity @ScheduledTasks | Where-Object { $_.hidden -eq $true -and $_.command -like 'Get-CippAlert*' -and $TenantFilter -in $_.Tenant }
             }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ function New-CIPPBackupTask {`
`7`	`7`
`8`	`8`	`$BackupData = switch ($Task) {`
`9`	`9`	`'CippCustomVariables' {`
`10`		`- Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'CustomVariables' -Execute {`
	`10`	`+ Measure-CippTask -TaskName 'CustomVariables' -EventName 'CIPP.BackupCompleted' -Script {`
`11`	`11`	`$ReplaceTable = Get-CIPPTable -tablename 'CippReplacemap'`
`12`	`12`
`13`	`13`	`# Get tenant-specific variables`
`@@ -26,7 +26,7 @@ function New-CIPPBackupTask {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`'users' {`
`29`		`- Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'Users' -Execute {`
	`29`	`+ Measure-CippTask -TaskName 'Users' -EventName 'CIPP.BackupCompleted' -Script {`
`30`	`30`	`$Users = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/users?$top=999' -tenantid $TenantFilter \| Select-Object * -ExcludeProperty mail, provisionedPlans, onPrem, passwordProfile, serviceProvisioningErrors, isLicenseReconciliationNeeded, isManagementRestricted, isResourceAccount, date, external*, identities, deletedDateTime, isSipEnabled, assignedPlans, cloudRealtimeCommunicationInfo, deviceKeys, provisionedPlan, securityIdentifier`
`31`	`31`	`#remove the property if the value is $null`
`32`	`32`	`$users = $Users \| ForEach-Object {`
`@@ -38,12 +38,12 @@ function New-CIPPBackupTask {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`'groups' {`
`41`		`- Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'Groups' -Execute {`
	`41`	`+ Measure-CippTask -TaskName 'Groups' -EventName 'CIPP.BackupCompleted' -Script {`
`42`	`42`	`New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/groups?$top=999' -tenantid $TenantFilter`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`'ca' {`
`46`		`- Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'ConditionalAccess' -Execute {`
	`46`	`+ Measure-CippTask -TaskName 'ConditionalAccess' -EventName 'CIPP.BackupCompleted' -Script {`
`47`	`47`	`$Policies = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/conditionalAccess/policies?$top=999' -tenantid $TenantFilter -AsApp $true`
`48`	`48`	`foreach ($policy in $policies) {`
`49`	`49`	`try {`
`@@ -55,7 +55,7 @@ function New-CIPPBackupTask {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`'intuneconfig' {`
`58`		`- Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'IntuneConfiguration' -Execute {`
	`58`	`+ Measure-CippTask -TaskName 'IntuneConfiguration' -EventName 'CIPP.BackupCompleted' -Script {`
`59`	`59`	$GraphURLS = @("https://graph.microsoft.com/beta/deviceManagement/deviceConfigurations?`$select=id,displayName,lastModifiedDateTime,roleScopeTagIds,microsoft.graph.unsupportedDeviceConfiguration/originalEntityTypeName&`$expand=assignments&top=1000"
`60`	`60`	`'https://graph.microsoft.com/beta/deviceManagement/windowsDriverUpdateProfiles'`
`61`	`61`	"https://graph.microsoft.com/beta/deviceManagement/groupPolicyConfigurations?`$expand=assignments&top=999"
`@@ -85,23 +85,23 @@ function New-CIPPBackupTask {`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`'intunecompliance' {`
`88`		`- Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'IntuneCompliance' -Execute {`
	`88`	`+ Measure-CippTask -TaskName 'IntuneCompliance' -EventName 'CIPP.BackupCompleted' -Script {`
`89`	`89`	`New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/deviceManagement/deviceCompliancePolicies?$top=999' -tenantid $TenantFilter \| ForEach-Object {`
`90`	`90`	`New-CIPPIntuneTemplate -TenantFilter $TenantFilter -URLName 'deviceCompliancePolicies' -ID $_.ID`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`'intuneprotection' {`
`96`		`- Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'IntuneProtection' -Execute {`
	`96`	`+ Measure-CippTask -TaskName 'IntuneProtection' -EventName 'CIPP.BackupCompleted' -Script {`
`97`	`97`	`New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/deviceAppManagement/managedAppPolicies?$top=999' -tenantid $TenantFilter \| ForEach-Object {`
`98`	`98`	`New-CIPPIntuneTemplate -TenantFilter $TenantFilter -URLName 'managedAppPolicies' -ID $_.ID`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`'antispam' {`
`104`		`- Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'AntiSpam' -Execute {`
	`104`	`+ Measure-CippTask -TaskName 'AntiSpam' -EventName 'CIPP.BackupCompleted' -Script {`
`105`	`105`	`$Policies = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-HostedContentFilterPolicy' \| Select-Object * -ExcludeProperty odata, data.type`
`106`	`106`	`$Rules = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-HostedContentFilterRule' \| Select-Object * -ExcludeProperty odata, data.type`
`107`	`107`
`@@ -122,7 +122,7 @@ function New-CIPPBackupTask {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`'antiphishing' {`
`125`		`- Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'AntiPhishing' -Execute {`
	`125`	`+ Measure-CippTask -TaskName 'AntiPhishing' -EventName 'CIPP.BackupCompleted' -Script {`
`126`	`126`	`$Policies = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-AntiPhishPolicy' \| Select-Object * -ExcludeProperty odata, data.type`
`127`	`127`	`$Rules = New-ExoRequest -tenantid $Tenantfilter -cmdlet 'Get-AntiPhishRule' \| Select-Object * -ExcludeProperty odata, data.type`
`128`	`128`
`@@ -143,13 +143,13 @@ function New-CIPPBackupTask {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`'CippWebhookAlerts' {`
`146`		`- Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'WebhookAlerts' -Execute {`
	`146`	`+ Measure-CippTask -TaskName 'WebhookAlerts' -EventName 'CIPP.BackupCompleted' -Script {`
`147`	`147`	`$WebhookTable = Get-CIPPTable -TableName 'WebhookRules'`
`148`	`148`	`Get-CIPPAzDataTableEntity @WebhookTable \| Where-Object { $TenantFilter -in ($_.Tenants \| ConvertFrom-Json).value }`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`'CippScriptedAlerts' {`
`152`		`- Measure-CIPPTask -Name 'CIPP.BackupCompleted' -Section 'ScriptedAlerts' -Execute {`
	`152`	`+ Measure-CippTask -TaskName 'ScriptedAlerts' -EventName 'CIPP.BackupCompleted' -Script {`
`153`	`153`	`$ScheduledTasks = Get-CIPPTable -TableName 'ScheduledTasks'`
`154`	`154`	`Get-CIPPAzDataTableEntity @ScheduledTasks \| Where-Object { $_.hidden -eq $true -and $_.command -like 'Get-CippAlert*' -and $TenantFilter -in $_.Tenant }`
`155`	`155`	`}`