Merge pull request #5635 from FabienTschanz/fix/speedup-telemetry

Report LCM details only if running as administrator
microsoft · Jan 17, 2025 · 49bc3bf · 49bc3bf
2 parents a59a6d2 + 403d7ff
commit 49bc3bf
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@
   * Added support for the AllowGetOneLakeUDK, AllowMountDfCreation, AllowOneLakeUDK,
     ArtifactOrgAppPreview properties.
   * Fix values that have a zero length whitespace character.
+* M365DSCTelemetryEngine
+  * Report LCM details only if running as administrator.
 
 # 1.25.115.1
 

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1
@@ -108,14 +108,7 @@ function Add-M365DSCTelemetryEvent
             {
                 if ($null -eq $Script:M365DSCCurrentRoles -or $Script:M365DSCCurrentRoles.Length -eq 0)
                 {
-                    try
-                    {
-                        Connect-M365Tenant -Workload 'MicrosoftGraph' @Global:M365DSCTelemetryConnectionToGraphParams -ErrorAction SilentlyContinue
-                    }
-                    catch
-                    {
-                        Write-Verbose -Message $_
-                    }
+                    Connect-M365Tenant -Workload 'MicrosoftGraph' $Global:M365DSCTelemetryConnectionToGraphParams -ErrorAction SilentlyContinue
                     $Script:M365DSCCurrentRoles = @()
 
                     $uri = (Get-MSCloudLoginConnectionProfile -Workload MicrosoftGraph).ResourceUrl + 'v1.0/me?$select=id'
@@ -151,7 +144,7 @@ function Add-M365DSCTelemetryEvent
                 {
                     try
                     {
-                        Connect-M365Tenant -Workload 'MicrosoftGraph' @Global:M365DSCTelemetryConnectionToGraphParams -ErrorAction Stop
+                        Connect-M365Tenant -Workload 'MicrosoftGraph' $Global:M365DSCTelemetryConnectionToGraphParams -ErrorAction Stop
                         $Script:M365DSCCurrentRoles = @()
 
                         $sp = Get-MgServicePrincipal -Filter "AppId eq '$($Global:M365DSCTelemetryConnectionToGraphParams.ApplicationId)'" `
@@ -372,54 +365,63 @@ function Add-M365DSCTelemetryEvent
             # LCM Metadata Information
             try
             {
-                if ($null -eq $Script:LCMInfo)
+                if ($null -eq $Script:M365DSCCurrentPrincipalIsAdmin)
                 {
-                    $Script:LCMInfo = Get-DscLocalConfigurationManager -ErrorAction Stop
+                    $currentPrincipal = New-Object System.Security.Principal.WindowsPrincipal([System.Security.Principal.WindowsIdentity]::GetCurrent())
+                    $Script:M365DSCCurrentPrincipalIsAdmin = $currentPrincipal.IsInRole([System.Security.Principal.WindowsBuiltInRole]::Administrator)
                 }
 
-                $certificateConfigured = $false
-                if (-not [System.String]::IsNullOrEmpty($LCMInfo.CertificateID))
+                if ($Script:M365DSCCurrentPrincipalIsAdmin)
                 {
-                    $certificateConfigured = $true
-                }
-
-                $partialConfiguration = $false
-                if (-not [System.String]::IsNullOrEmpty($Script:LCMInfo.PartialConfigurations))
-                {
-                    $partialConfiguration = $true
-                }
-                $Data.Add('LCMUsesPartialConfigurations', $partialConfiguration)
-                $Data.Add('LCMCertificateConfigured', $certificateConfigured)
-                $Data.Add('LCMConfigurationMode', $Script:LCMInfo.ConfigurationMode)
-                $Data.Add('LCMConfigurationModeFrequencyMins', $Script:LCMInfo.ConfigurationModeFrequencyMins)
-                $Data.Add('LCMRefreshMode', $Script:LCMInfo.RefreshMode)
-                $Data.Add('LCMState', $Script:LCMInfo.LCMState)
-                $Data.Add('LCMStateDetail', $Script:LCMInfo.LCMStateDetail)
-
-                if ([System.String]::IsNullOrEmpty($Type))
-                {
-                    if ($Global:M365DSCExportInProgress)
-                    {
-                        $Type = 'Export'
-                    }
-                    elseif ($Script:LCMInfo.LCMStateDetail -eq 'LCM is performing a consistency check.' -or `
-                            $Script:LCMInfo.LCMStateDetail -eq 'LCM exécute une vérification de cohérence.' -or `
-                            $Script:LCMInfo.LCMStateDetail -eq 'LCM führt gerade eine Konsistenzüberprüfung durch.')
+                    if ($null -eq $Script:LCMInfo)
                     {
-                        $Type = 'MonitoringScheduled'
+                        $Script:LCMInfo = Get-DscLocalConfigurationManager -ErrorAction Stop
                     }
-                    elseif ($Script:LCMInfo.LCMStateDetail -eq 'LCM is testing node against the configuration.')
+
+                    $certificateConfigured = $false
+                    if (-not [System.String]::IsNullOrEmpty($LCMInfo.CertificateID))
                     {
-                        $Type = 'MonitoringManual'
+                        $certificateConfigured = $true
                     }
-                    elseif ($Script:LCMInfo.LCMStateDetail -eq 'LCM is applying a new configuration.' -or `
-                            $Script:LCMInfo.LCMStateDetail -eq 'LCM applique une nouvelle configuration.')
+
+                    $partialConfiguration = $false
+                    if (-not [System.String]::IsNullOrEmpty($Script:LCMInfo.PartialConfigurations))
                     {
-                        $Type = 'ApplyingConfiguration'
+                        $partialConfiguration = $true
                     }
-                    else
+                    $Data.Add('LCMUsesPartialConfigurations', $partialConfiguration)
+                    $Data.Add('LCMCertificateConfigured', $certificateConfigured)
+                    $Data.Add('LCMConfigurationMode', $Script:LCMInfo.ConfigurationMode)
+                    $Data.Add('LCMConfigurationModeFrequencyMins', $Script:LCMInfo.ConfigurationModeFrequencyMins)
+                    $Data.Add('LCMRefreshMode', $Script:LCMInfo.RefreshMode)
+                    $Data.Add('LCMState', $Script:LCMInfo.LCMState)
+                    $Data.Add('LCMStateDetail', $Script:LCMInfo.LCMStateDetail)
+
+                    if ([System.String]::IsNullOrEmpty($Type))
                     {
-                        $Type = 'Undetermined'
+                        if ($Global:M365DSCExportInProgress)
+                        {
+                            $Type = 'Export'
+                        }
+                        elseif ($Script:LCMInfo.LCMStateDetail -eq 'LCM is performing a consistency check.' -or `
+                                $Script:LCMInfo.LCMStateDetail -eq 'LCM exécute une vérification de cohérence.' -or `
+                                $Script:LCMInfo.LCMStateDetail -eq 'LCM führt gerade eine Konsistenzüberprüfung durch.')
+                        {
+                            $Type = 'MonitoringScheduled'
+                        }
+                        elseif ($Script:LCMInfo.LCMStateDetail -eq 'LCM is testing node against the configuration.')
+                        {
+                            $Type = 'MonitoringManual'
+                        }
+                        elseif ($Script:LCMInfo.LCMStateDetail -eq 'LCM is applying a new configuration.' -or `
+                                $Script:LCMInfo.LCMStateDetail -eq 'LCM applique une nouvelle configuration.')
+                        {
+                            $Type = 'ApplyingConfiguration'
+                        }
+                        else
+                        {
+                            $Type = 'Undetermined'
+                        }
                     }
                 }
             }