From 8451ffa3c625649aad989addaafda8114ac44c14 Mon Sep 17 00:00:00 2001 From: nasundar <45012871+nasundar@users.noreply.github.com> Date: Fri, 21 Feb 2020 13:45:24 -0800 Subject: [PATCH] Upgrade templates to use VMInsights solution. We will be using 'VMInsights' solution which will deploy MPs for 1. Service Map functionality 2. Performance counters --- .../ConfigureWorkspaceTemplate.json | 371 +----------------- ReadMe.md | 6 +- 2 files changed, 9 insertions(+), 368 deletions(-) diff --git a/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceTemplate.json b/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceTemplate.json index 70a453c..2cdbfaa 100644 --- a/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceTemplate.json +++ b/OnbordingTemplates/ConfigureWorkspace/ConfigureWorkspaceTemplate.json @@ -20,7 +20,7 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "2017-05-10", - "name": "SMSolutionDeployment", + "name": "VMISolutionDeployment", "properties": { "mode": "Incremental", "template": { @@ -33,13 +33,13 @@ "apiVersion": "2015-11-01-preview", "type": "Microsoft.OperationsManagement/solutions", "location": "[parameters('WorkspaceLocation')]", - "name": "[concat('ServiceMap', '(', split(parameters('WorkspaceResourceId'),'/')[8], ')')]", + "name": "[concat('VMInsights', '(', split(parameters('WorkspaceResourceId'),'/')[8], ')')]", "properties": { "workspaceResourceId": "[parameters('WorkspaceResourceId')]" }, "plan": { - "name": "[concat('ServiceMap', '(', split(parameters('WorkspaceResourceId'),'/')[8], ')')]", - "product": "[concat('OMSGallery/', 'ServiceMap')]", + "name": "[concat('VMInsights', '(', split(parameters('WorkspaceResourceId'),'/')[8], ')')]", + "product": "[concat('OMSGallery/', 'VMInsights')]", "promotionCode": "", "publisher": "Microsoft" } @@ -49,369 +49,6 @@ }, "subscriptionId": "[split(parameters('WorkspaceResourceId'),'/')[2]]", "resourceGroup": "[split(parameters('WorkspaceResourceId'),'/')[4]]" - }, - { - "type": "Microsoft.Resources/deployments", - "apiVersion": "2017-05-10", - "name": "PerfCountersDeployment", - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": {}, - "variables": {}, - "resources": [ - { - "apiVersion": "2017-03-15-preview", - "type": "Microsoft.OperationalInsights/workspaces", - "name": "[split(parameters('WorkspaceResourceId'),'/')[8]]", - "location": "[parameters('WorkspaceLocation')]", - "resources": [ - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-LogicalDisk-Pct-Free-Space", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "LogicalDisk", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "% Free Space" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-LogicalDisk-Avg-DiskSecRead", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "LogicalDisk", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Avg. Disk sec/Read" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-LogicalDisk-Avg-DiskSecTransfer", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "LogicalDisk", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Avg. Disk sec/Transfer" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-LogicalDisk-Avg-DiskSecWrite", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "LogicalDisk", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Avg. Disk sec/Write" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-LogicalDisk-Disk-BytesSec", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "LogicalDisk", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Disk Bytes/sec" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-LogicalDisk-Disk-ReadBytesSec", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "LogicalDisk", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Disk Read Bytes/sec" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-LogicalDisk-Disk-ReadsSec", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "LogicalDisk", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Disk Reads/sec" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-LogicalDisk-Disk-TransfersSec", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "LogicalDisk", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Disk Transfers/sec" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-LogicalDisk-Disk-WriteBytesSec", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "LogicalDisk", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Disk Write Bytes/sec" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-LogicalDisk-Disk-WritesSec", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "LogicalDisk", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Disk Writes/sec" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-LogicalDisk-FreeMegabytes", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "LogicalDisk", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Free Megabytes" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-Memory-AvailableMBytes", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "Memory", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Available MBytes" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-NetworkAdapter-BytesReceived-sec", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "Network Adapter", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Bytes Received/sec" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-NetworkAdapter-BytesSent-sec", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "Network Adapter", - "instanceName": "*", - "intervalSeconds": 60, - "counterName": "Bytes Sent/sec" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-Processor-Pct-Processor-Time-Total", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "WindowsPerformanceCounter", - "properties": { - "objectName": "Processor", - "instanceName": "_Total", - "intervalSeconds": 60, - "counterName": "% Processor Time" - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-Logical-Disk-Linux", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "LinuxPerformanceObject", - "properties": { - "objectName": "Logical Disk", - "instanceName": "*", - "intervalSeconds": 60, - "performanceCounters": [ - { - "counterName": "% Used Space" - }, - { - "counterName": "Disk Read Bytes/sec" - }, - { - "counterName": "Disk Reads/sec" - }, - { - "counterName": "Disk Transfers/sec" - }, - { - "counterName": "Disk Write Bytes/sec" - }, - { - "counterName": "Disk Writes/sec" - }, - { - "counterName": "Free Megabytes" - }, - { - "counterName": "Logical Disk Bytes/sec" - } - ] - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-Memory-Linux", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "LinuxPerformanceObject", - "properties": { - "objectName": "Memory", - "instanceName": "*", - "intervalSeconds": 60, - "performanceCounters": [ - { - "counterName": "Available MBytes Memory" - } - ] - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-Network", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "LinuxPerformanceObject", - "properties": { - "objectName": "Network", - "instanceName": "*", - "intervalSeconds": 60, - "performanceCounters": [ - { - "counterName": "Total Bytes Received" - }, - { - "counterName": "Total Bytes Transmitted" - } - ] - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "VMInsights-Processor-Pct-Processor-Time-Linux", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "LinuxPerformanceObject", - "properties": { - "objectName": "Processor", - "instanceName": "*", - "intervalSeconds": 60, - "performanceCounters": [ - { - "counterName": "% Processor Time" - } - ] - } - }, - { - "apiVersion": "2015-11-01-preview", - "type": "datasources", - "name": "DataSource_LinuxPerformanceCollection", - "dependsOn": [ - "[parameters('WorkspaceResourceId')]" - ], - "kind": "LinuxPerformanceCollection", - "properties": { - "state": "Enabled" - } - } - ] - } - ] - } - }, - "subscriptionId": "[split(parameters('WorkspaceResourceId'),'/')[2]]", - "resourceGroup": "[split(parameters('WorkspaceResourceId'),'/')[4]]" } ], "outputs": {} diff --git a/ReadMe.md b/ReadMe.md index f0ff3dc..eb73f0e 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -13,7 +13,7 @@ This download contains onboarding templates for different scenarios: > Note: If Virtual Machines Scale Sets are already present and the upgrade policy is set to 'Manual', Azure Monitor for VMs will not be enabled for instances by default after running 'ExistingVmssOnboarding' template. You have Manually upgrade the instances. ### Configure Workspace: -- ConfigureWorkspace: Use this to enable Azure Monitor for VMs features for a new workspace and to configure the performance counters. +- ConfigureWorkspace: Use this to enable Azure Monitor for VMs solution on the workspace. ## How to Deploy: Each folder has a 'Template' and a 'Parameters' file. @@ -44,3 +44,7 @@ az group deployment create --resource-group --template-file [Azure Monitor for VMs (preview)](https://docs.microsoft.com/azure/azure-monitor/insights/vminsights-overview) [Deploy Azure Monitor for VMs (preview)](https://docs.microsoft.com/azure/azure-monitor/insights/vminsights-onboard) + +[GA FAQ](https://docs.microsoft.comazure/azure-monitor/insights/vminsights-ga-release-faq) + +[Repository](https://github.com/Azure/AzureMonitorForVMs-ArmTemplates.git)