bug fixes

Author: stevevillardi

Private/Resolve-LMDebugInfo.ps1

@@ -93,7 +93,7 @@ function Resolve-LMDebugInfo {
     Write-Debug "Portal: $($UriObj.Host)"
 
     # Display headers with partial redaction for identification
-    $SensitiveHeaders = @('accessKey', 'bearerToken', 'cookie', 'X-CSRF-Token')
+    $SensitiveHeaders = @('accessKey', 'bearerToken', 'cookie', 'X-CSRF-Token', 'Authorization')
     $HeaderInfo = $Headers.GetEnumerator() | ForEach-Object {
         $Value = if ($SensitiveHeaders -contains $_.Key) {
             if ($_.Value.Length -gt 25) {

Private/Test-LMFilterField.ps1

@@ -80,9 +80,9 @@ function Test-LMFilterField {
         # String filter (v2 format) - extract field names before operators
         # Pattern: field_name followed by -eq, -ne, -gt, -lt, -ge, -le, -contains, -notcontains
         $Pattern = '(?:^|\s+)([a-zA-Z_][a-zA-Z0-9_\.]*)\s+(?:-eq|-ne|-gt|-lt|-ge|-le|-contains|-notcontains)\s+'
-        $Matches = [regex]::Matches($Filter, $Pattern)
+        $PatternMatches = [regex]::Matches($Filter, $Pattern)
 
-        foreach ($Match in $Matches) {
+        foreach ($Match in $PatternMatches) {
             if ($Match.Groups.Count -ge 2) {
                 $FilterFields += $Match.Groups[1].Value
             }

Public/Send-LMWebhookMessage.ps1

@@ -21,9 +21,44 @@ Specifies the collection of messages/events to send. Each item may be a hashtabl
 Returns PSCustomObject entries containing status, payload, and optional error details for each attempted message.
 
 .EXAMPLE
-Send-LMWebhookMessage -SourceName "Meraki_CustomerA" -Events $Messages -Properties @{ accountId = '12345' }
+Send-LMWebhookMessage -SourceName "Meraki_CustomerA" -Messages $Messages -Properties @{ accountId = '12345' }
 Sends each event in `$Messages` to the Meraki webhook LogSource, appending the `accountId` property to every payload.
 
+.EXAMPLE
+$jsonString = '{"eventType":"alert","severity":"critical","description":"Database connection failed"}'
+Send-LMWebhookMessage -SourceName "MyWebhookSource" -Messages @($jsonString)
+Sends a JSON string that will be automatically parsed and sent as structured data to the webhook endpoint.
+
+.EXAMPLE
+Send-LMWebhookMessage -SourceName "AppLogs" -Messages @("Application started successfully", "User login detected")
+Sends plain text messages that will be wrapped in a message property for ingestion.
+
+.EXAMPLE
+$event = @{
+    eventType = "deployment"
+    version = "1.2.3"
+    environment = "production"
+    timestamp = (Get-Date).ToString("o")
+}
+Send-LMWebhookMessage -SourceName "Deployments" -Messages @($event) -PassThru
+Sends a hashtable as a structured event and returns the result with status information.
+
+.EXAMPLE
+$events = @(
+    [PSCustomObject]@{ eventType = "login"; user = "john.doe"; status = "success" }
+    [PSCustomObject]@{ eventType = "logout"; user = "jane.smith"; status = "success" }
+)
+Send-LMWebhookMessage -SourceName "AuthEvents" -Messages $events -Properties @{ source = "AD"; region = "us-east-1" }
+Sends multiple PSCustomObject events with additional properties merged into each payload.
+
+.EXAMPLE
+$jsonEvents = @(
+    '{"metric":"cpu","value":85,"host":"server01"}'
+    '{"metric":"memory","value":72,"host":"server01"}'
+)
+Send-LMWebhookMessage -SourceName "Metrics" -Messages $jsonEvents
+Sends multiple JSON strings that will be automatically parsed and sent as individual structured events.
+
 .OUTPUTS
 Outputs a confirmation message for each accepted webhook event, or an error message if the request fails. When -PassThru is specified, returns PSCustomObject entries containing status, payload, and optional error details for each attempted message.
 #>
@@ -70,6 +105,18 @@ function Send-LMWebhookMessage {
         foreach ($message in $Messages) {
             $payload = [ordered]@{}
 
+            # Check if message is a JSON string and convert it
+            if ($message -is [String]) {
+                try {
+                    $jsonObject = $message | ConvertFrom-Json -ErrorAction Stop
+                    $message = $jsonObject
+                }
+                catch {
+                    # Not valid JSON, treat as plain string message
+                    $payload["message"] = $message
+                }
+            }
+
             if ($message -is [System.Collections.IDictionary]) {
                 foreach ($key in $message.Keys) {
                     $payload[$key] = $message[$key]
@@ -80,7 +127,8 @@ function Send-LMWebhookMessage {
                     $payload[$property.Name] = $property.Value
                 }
             }
-            else {
+            elseif (-not ($payload.Contains("message"))) {
+                # Only wrap in message if not already handled above
                 $payload["message"] = [String]$message
             }
 

README.md

@@ -73,6 +73,32 @@ Connect-LMAccount -UseCachedCredential
 
 # Change List
 
+## 7.7.2
+### Hotfixes
+- **Send-LMWebhookMessage**: Fixed payload formatting when sending webhook messages to LM Logs:
+  - JSON strings are now automatically detected and parsed into structured data, preventing escaped JSON in payloads
+  - Plain text messages are properly encapsulated in a `message` property for consistent parsing
+  - Removed unnecessary payload wrapping that caused ingestion issues
+- **Resolve-LMDebugInfo**: Fix bug where BearerTokens were not being obfuscated when running commands with the -Debug parameter.
+
+```powershell
+#Sends multiple PSCustomObject events with additional properties merged into each payload.
+$events = @(
+    [PSCustomObject]@{ eventType = "login"; user = "john.doe"; status = "success" }
+    [PSCustomObject]@{ eventType = "logout"; user = "jane.smith"; status = "success" }
+)
+Send-LMWebhookMessage -SourceName "AuthEvents" -Messages $events -Properties @{ source = "AD"; region = "us-east-1" }
+
+#Sends a hashtable as a structured event and returns the result with status information.
+$event = @{
+    eventType = "deployment"
+    version = "1.2.3"
+    environment = "production"
+    timestamp = (Get-Date).ToString("o")
+}
+Send-LMWebhookMessage -SourceName "Deployments" -Messages @($event) -PassThru
+```
+
 ## 7.7.1
 ### Hotfixes
 - Fix bug with **ConvertTo-LMUpdateDevice** when trying to migrate Websites using an packet count of 50.