Merge pull request #613 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -36,15 +36,19 @@ function Push-CippDriftManagement {
 
             $GenerateEmail = New-CIPPAlertTemplate -format 'html' -data $Data -CIPPURL $CIPPURL -Tenant $Item.Tenant -InputObject 'driftStandard' -AuditLogLink $drift.standardId
 
-            # Send email alert if configured
-            $CIPPAlert = @{
-                Type         = 'email'
-                Title        = $GenerateEmail.title
-                HTMLContent  = $GenerateEmail.htmlcontent
-                TenantFilter = $Item.Tenant
+            # Send email alert if configured and not disabled
+            if (-not $Settings.driftAlertDisableEmail) {
+                $CIPPAlert = @{
+                    Type         = 'email'
+                    Title        = $GenerateEmail.title
+                    HTMLContent  = $GenerateEmail.htmlcontent
+                    TenantFilter = $Item.Tenant
+                }
+                Write-Information "Sending email alert for tenant $($Item.Tenant)"
+                Send-CIPPAlert @CIPPAlert -altEmail $email
+            } else {
+                Write-Information "Email alert disabled for tenant $($Item.Tenant)"
             }
-            Write-Information "Sending email alert for tenant $($Item.Tenant)"
-            Send-CIPPAlert @CIPPAlert -altEmail $email
             # Send webhook alert if configured
             $WebhookData = @{
                 Title      = $GenerateEmail.title

Modules/CIPPCore/Public/Functions/Get-CIPPTenantAlignment.ps1

@@ -317,6 +317,7 @@ function Get-CIPPTenantAlignment {
                     standardSettings         = $Template.Standards
                     driftAlertEmail          = $Template.driftAlertEmail
                     driftAlertWebhook        = $Template.driftAlertWebhook
+                    driftAlertDisableEmail   = $Template.driftAlertDisableEmail
                     AlignmentScore           = $AlignmentPercentage
                     LicenseMissingPercentage = $LicenseMissingPercentage
                     CombinedScore            = $AlignmentPercentage + $LicenseMissingPercentage

Modules/CippEntrypoints/CippEntrypoints.psm1

@@ -21,6 +21,7 @@ function Receive-CippHttpTrigger {
     if ($Request.Headers.'x-ms-coldstart' -eq 1) {
         Write-Information '** Function app cold start detected **'
     }
+    Write-Information "CIPP_ACTION=$($Request.Params.CIPPEndpoint)"
 
     $ConfigTable = Get-CIPPTable -tablename Config
     $Config = Get-CIPPAzDataTableEntity @ConfigTable -Filter "PartitionKey eq 'OffloadFunctions' and RowKey eq 'OffloadFunctions'"
@@ -171,7 +172,7 @@ function Receive-CippOrchestrationTrigger {
         Entrypoint
     #>
     param($Context)
-
+    Write-Information "CIPP_ACTION=$($Item.Command ?? $Item.FunctionName)"
     try {
         if (Test-Json -Json $Context.Input) {
             $OrchestratorInput = $Context.Input | ConvertFrom-Json
@@ -286,6 +287,7 @@ function Receive-CippActivityTrigger {
         Entrypoint
     #>
     param($Item)
+    Write-Information "CIPP_ACTION=$($Item.Command ?? $Item.FunctionName)"
     Write-Warning "Hey Boo, the activity function is running. Here's some info: $($Item | ConvertTo-Json -Depth 10 -Compress)"
     try {
         $Output = $null
@@ -358,12 +360,8 @@ function Receive-CippActivityTrigger {
             }
 
             try {
-                Write-Verbose "Activity starting Function: $FunctionName."
-
-                # Wrap the function execution with telemetry
-                $Output = Measure-CippTask -TaskName $taskName -Metadata $metadata -Script {
-                    Invoke-Command -ScriptBlock { & $FunctionName -Item $Item }
-                }
+                Write-Verbose "Activity starting Function: $FunctionName."               
+                Invoke-Command -ScriptBlock { & $FunctionName -Item $Item }
                 $Status = 'Completed'
 
                 Write-Verbose "Activity completed Function: $FunctionName."
@@ -421,8 +419,6 @@ 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 ', ')"
-    Write-Host "CIPPTIMER: $($Functions | ConvertTo-Json -Depth 10 -Compress)"
     $Table = Get-CIPPTable -tablename CIPPTimers
     $Statuses = Get-CIPPAzDataTableEntity @Table
     $FunctionName = $env:WEBSITE_SITE_NAME
@@ -481,9 +477,9 @@ function Receive-CIPPTimerTrigger {
             }
 
             # Wrap the timer function execution with telemetry
-            $Results = Measure-CippTask -TaskName $Function.Command -Metadata $metadata -Script {
-                Invoke-Command -ScriptBlock { & $Function.Command @Parameters }
-            }
+            
+            Invoke-Command -ScriptBlock { & $Function.Command @Parameters }
+            
 
             if ($Results -match '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$') {
                 $FunctionStatus.OrchestratorId = $Results -join ','