Merge pull request #582 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/CippQueue/Set-CippQueueTask.ps1

@@ -8,7 +8,8 @@ function Set-CippQueueTask {
         [string]$TaskId = (New-Guid).Guid.ToString(),
         [string]$Name,
         [ValidateSet('Queued', 'Running', 'Completed', 'Failed')]
-        [string]$Status = 'Queued'
+        [string]$Status = 'Queued',
+        [string]$Message
     )
 
     $CippQueueTasks = Get-CippTable -TableName CippQueueTasks
@@ -20,8 +21,11 @@ function Set-CippQueueTask {
         Name         = $Name
         Status       = $Status
     }
+    if ($Message) {
+        $QueueTaskEntry.Message = $Message
+    }
     $CippQueueTasks.Entity = $QueueTaskEntry
 
     Add-CIPPAzDataTableEntity @CippQueueTasks -Force
     return $QueueTaskEntry
-}
+}

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecAppInsightsQuery.ps1

@@ -0,0 +1,51 @@
+function Invoke-ExecAppInsightsQuery {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    .ROLE
+        CIPP.SuperAdmin.Read
+    #>
+    [CmdletBinding()]
+    param (
+        $Request,
+        $TriggerMetadata
+    )
+
+    $Query = $Request.Body.query ?? $Request.Query.query
+    if (-not $Query) {
+        return [HttpResponseContext]@{
+            StatusCode = [HttpStatusCode]::BadRequest
+            Body       = @{
+                Results = 'No query provided in request body.'
+            }
+        }
+    }
+
+    try {
+        $LogData = Get-ApplicationInsightsQuery -Query $Query
+
+        $Body = @{
+            Results  = @($LogData)
+            Metadata = @{
+                Query = $Query
+            }
+        } | ConvertTo-Json -Depth 10 -Compress
+
+        return [HttpResponseContext]@{
+            StatusCode = [HttpStatusCode]::OK
+            Body       = $Body
+        }
+
+    } catch {
+        return [HttpResponseContext]@{
+            StatusCode = [HttpStatusCode]::InternalServerError
+            Body       = @{
+                Results  = "$($_.Exception.Message)"
+                Metadata = @{
+                    Query     = $Query
+                    Exception = Get-CippException -Exception $_
+                }
+            }
+        }
+    }
+}

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecDiagnosticsPresets.ps1

@@ -0,0 +1,89 @@
+function Invoke-ExecDiagnosticsPresets {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    .ROLE
+        CIPP.SuperAdmin.ReadWrite
+    #>
+    [CmdletBinding()]
+    param (
+        $Request,
+        $TriggerMetadata
+    )
+
+    try {
+        $Table = Get-CIPPTable -TableName 'DiagnosticsPresets'
+        $Action = $Request.Body.action
+        $GUID = $Request.Body.GUID
+
+        if ($Action -eq 'delete') {
+            if (-not $GUID) {
+                return [HttpResponseContext]@{
+                    StatusCode = [HttpStatusCode]::BadRequest
+                    Body       = @{
+                        Results = 'GUID is required for delete action'
+                    }
+                }
+            }
+
+            Remove-AzDataTableEntity @Table -Entity @{
+                PartitionKey = 'Preset'
+                RowKey       = $GUID
+            }
+
+            return [HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::OK
+                Body       = @{
+                    Results = 'Preset deleted successfully'
+                }
+            }
+        } else {
+            # Save or update preset
+            $Name = $Request.Body.name
+            $Query = $Request.Body.query
+
+            if (-not $Name -or -not $Query) {
+                return [HttpResponseContext]@{
+                    StatusCode = [HttpStatusCode]::BadRequest
+                    Body       = @{
+                        Results = 'Name and query are required'
+                    }
+                }
+            }
+
+            # Use provided GUID or generate new one
+            if (-not $GUID) {
+                $GUID = (New-Guid).Guid
+            }
+
+            # Convert query to compressed JSON for storage
+            $QueryJson = ConvertTo-Json -InputObject @{ query = $Query } -Compress
+
+            $Entity = @{
+                PartitionKey = 'Preset'
+                RowKey       = [string]$GUID
+                name         = [string]$Name
+                data         = [string]$QueryJson
+            }
+
+            Add-CIPPAzDataTableEntity @Table -Entity $Entity -Force
+
+            return [HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::OK
+                Body       = @{
+                    Results  = 'Preset saved successfully'
+                    Metadata = @{
+                        GUID = $GUID
+                    }
+                }
+            }
+        }
+    } catch {
+        return [HttpResponseContext]@{
+            StatusCode = [HttpStatusCode]::InternalServerError
+            Body       = @{
+                Error = "Failed to manage diagnostics preset: $($_.Exception.Message)"
+            }
+        }
+    }
+}

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListDiagnosticsPresets.ps1

@@ -0,0 +1,37 @@
+function Invoke-ListDiagnosticsPresets {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    .ROLE
+        CIPP.SuperAdmin.Read
+    #>
+    [CmdletBinding()]
+    param (
+        $Request,
+        $TriggerMetadata
+    )
+
+    try {
+        $Table = Get-CIPPTable -TableName 'DiagnosticsPresets'
+        $Presets = Get-CIPPAzDataTableEntity @Table | ForEach-Object {
+            $Data = $_.data | ConvertFrom-Json
+            [PSCustomObject]@{
+                GUID  = $_.RowKey
+                name  = $_.name
+                query = $Data.query
+            }
+        }
+
+        return [HttpResponseContext]@{
+            StatusCode = [HttpStatusCode]::OK
+            Body       = @($Presets)
+        }
+    } catch {
+        return [HttpResponseContext]@{
+            StatusCode = [HttpStatusCode]::InternalServerError
+            Body       = @{
+                Error = "Failed to list diagnostics presets: $($_.Exception.Message)"
+            }
+        }
+    }
+}

Modules/CIPPCore/Public/Get-ApplicationInsightsQuery.ps1

@@ -0,0 +1,54 @@
+function Get-ApplicationInsightsQuery {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)]
+        [string]$Query
+    )
+
+    if (-not $env:APPLICATIONINSIGHTS_CONNECTION_STRING -and -not $env:APPINSIGHTS_INSTRUMENTATIONKEY) {
+        throw 'Application Insights is not enabled for this instance.'
+    }
+
+    if ($env:MSI_SECRET) {
+        $null = Connect-AzAccount -Identity
+    }
+
+    $SubscriptionId = $env:WEBSITE_OWNER_NAME -split '\+' | Select-Object -First 1
+    if ($env:WEBSITE_SKU -ne 'FlexConsumption' -and $Owner -match '^(?<SubscriptionId>[^+]+)\+(?<RGName>[^-]+(?:-[^-]+)*?)(?:-[^-]+webspace(?:-Linux)?)?$') {
+        $RGName = $Matches.RGName
+    } else {
+        $RGName = $env:WEBSITE_RESOURCE_GROUP
+    }
+    $AppInsightsName = $env:WEBSITE_SITE_NAME
+
+    $Body = @{
+        'query'            = $Query
+        'options'          = @{'truncationMaxSize' = 67108864 }
+        'maxRows'          = 1001
+        'workspaceFilters' = @{'regions' = @() }
+    } | ConvertTo-Json -Depth 10 -Compress
+
+    $AppInsightsQuery = 'subscriptions/{0}/resourceGroups/{1}/providers/microsoft.insights/components/{2}/query' -f $SubscriptionId, $RGName, $AppInsightsName
+
+    $resource = 'https://api.loganalytics.io'
+    $Token = Get-AzAccessToken -ResourceUrl $resource
+
+    $headerParams = @{'Authorization' = "Bearer $($Token.Token)" }
+    $logAnalyticsBaseURI = 'https://api.loganalytics.io/v1'
+
+    $result = Invoke-RestMethod -Method POST -Uri "$($logAnalyticsBaseURI)/$AppInsightsQuery" -Headers $headerParams -Body $Body -ContentType 'application/json' -ErrorAction Stop
+
+    # Format Result to PSObject
+    $headerRow = $null
+    $headerRow = $result.tables.columns | Select-Object name
+    $columnsCount = $headerRow.Count
+    $logData = foreach ($row in $result.tables.rows) {
+        $data = New-Object PSObject
+        for ($i = 0; $i -lt $columnsCount; $i++) {
+            $data | Add-Member -MemberType NoteProperty -Name $headerRow[$i].name -Value $row[$i]
+        }
+        $data
+    }
+
+    return $logData
+}