From aa41571f5b0781b9a28bccd3d340b7887a26260b Mon Sep 17 00:00:00 2001
From: tarunshukla <tarunshukla@microsoft.com>
Date: Mon, 18 Mar 2024 16:22:08 +0530
Subject: [PATCH] Fixed dashboard incorrect count of VM extensions

---
 ...valUtilityMonitoringDashboardTemplate.json |   2 +-
 .../AzTSMMARemovalUtilityDeploymentFiles.zip  | Bin 38414 -> 38409 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/MMA Removal Utility/DeploymentFiles/MMARemovalUtilityMonitoringDashboardTemplate.json b/MMA Removal Utility/DeploymentFiles/MMARemovalUtilityMonitoringDashboardTemplate.json
index 72971aa3..7b170dd1 100644
--- a/MMA Removal Utility/DeploymentFiles/MMARemovalUtilityMonitoringDashboardTemplate.json	
+++ b/MMA Removal Utility/DeploymentFiles/MMARemovalUtilityMonitoringDashboardTemplate.json	
@@ -587,7 +587,7 @@
               "type": "Extension/Microsoft_OperationsManagementSuite_Workspace/PartType/LogsDashboardPart",
               "settings": {
                 "content": {
-                  "Query": "let timeago = timespan(<timespanValue>);\nlet virtualMachines = Inventory_CL\n| where TimeGenerated > ago(timeago)\n//| where ResourceType =~ \"VirtualMachine\"\n| summarize arg_max(TimeGenerated,*) by ResourceId = tolower(ResourceId)\n| extend  OSType = tolower(tostring(parse_json(Metadata_s).OSType))\n| where (isnotempty(OSType)) \n| project VMResourceID = ResourceId, OSType;\nlet virtualMachinesExtensions = Inventory_CL\n| where TimeGenerated > ago(timeago) and Source_s =~ \"AzTS_05_VMExtensionInventoryProcessor\"\n| summarize arg_max(TimeGenerated,*) by ResourceId = tolower(ResourceId)\n| extend VMResourceID = tolower(substring(ResourceId,0,indexof(ResourceId, '/', 0, -1, 9 )))\n| extend ExtensionType = tostring(parse_json(Metadata_s).ExtensionType)\n| project ResourceId, VMResourceID, ExtensionType;\nvirtualMachines\n| join kind=leftouter (virtualMachinesExtensions) on VMResourceID\n| summarize Extensions = make_list(ExtensionType) by VMResourceID, OSType\n|summarize TotalServices = count(), ServicesWithOnlyMMAAgent = countif((array_length(Extensions) == 1) and (Extensions contains \"MicrosoftMonitoringAgent\" or Extensions contains \"OmsAgentForLinux\" or Extensions contains \"\")),\nServicesWithOnlyAMAAgent = countif((array_length(Extensions) == 1) and (Extensions contains \"AzureMonitorWindowsAgent\" or Extensions contains \"AzureMonitorLinuxAgent\")),\nServicesWithBothAgents = countif((Extensions contains \"MicrosoftMonitoringAgent\" or Extensions contains \"OmsAgentForLinux\") and (Extensions contains \"AzureMonitorWindowsAgent\" or Extensions contains \"AzureMonitorLinuxAgent\")) by OSType\n\n",
+                  "Query": "let timeago = timespan(<timespanValue>);\nlet virtualMachines = Inventory_CL\n| where TimeGenerated > ago(timeago)\n//| where ResourceType =~ \"VirtualMachine\"\n| summarize arg_max(TimeGenerated,*) by ResourceId = tolower(ResourceId)\n| extend  OSType = tolower(tostring(parse_json(Metadata_s).OSType))\n| where (isnotempty(OSType)) \n| project VMResourceID = ResourceId, OSType;\nlet virtualMachinesExtensions = Inventory_CL\n| where TimeGenerated > ago(timeago) and Source_s =~ \"AzTS_05_VMExtensionInventoryProcessor\"\n| summarize arg_max(TimeGenerated,*) by ResourceId = tolower(ResourceId)\n| extend VMResourceID = tolower(substring(ResourceId,0,indexof(ResourceId, '/', 0, -1, 9 )))\n| extend ExtensionType = tostring(parse_json(Metadata_s).ExtensionType)\n| project ResourceId, VMResourceID, ExtensionType;\nvirtualMachines\n| join kind=leftouter (virtualMachinesExtensions) on VMResourceID\n| summarize Extensions = make_list(ExtensionType) by VMResourceID, OSType\n|summarize TotalServices = count(), ServicesWithOnlyMMAAgent = countif((array_length(Extensions) == 1) and (Extensions contains \"MicrosoftMonitoringAgent\" or Extensions contains \"OmsAgentForLinux\")),\nServicesWithOnlyAMAAgent = countif((array_length(Extensions) == 1) and (Extensions contains \"AzureMonitorWindowsAgent\" or Extensions contains \"AzureMonitorLinuxAgent\")),\nServicesWithBothAgents = countif((Extensions contains \"MicrosoftMonitoringAgent\" or Extensions contains \"OmsAgentForLinux\") and (Extensions contains \"AzureMonitorWindowsAgent\" or Extensions contains \"AzureMonitorLinuxAgent\")) by OSType\n\n",
                   "ControlType": "AnalyticsGrid",
                   "SpecificChart": "UnstackedColumn",
                   "PartTitle": "Inventory: MMA & AMA Agents",
diff --git a/TemplateFiles/AzTSMMARemovalUtilityDeploymentFiles.zip b/TemplateFiles/AzTSMMARemovalUtilityDeploymentFiles.zip
index 60d61f8dee160af8f7d58f698f46a1de88a3568f..c3565b5cc40aad4c6ececccf3bcb925a55e48cb9 100644
GIT binary patch
delta 2597
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
H00000F?#nb

delta 2611
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
V0t}Cnp)@0t*Oe>=`;h<u002zM>(>AP