Merge pull request #22142 from grabinski/patch-1

Update names and API versions for VM extension resources

Author: GitHubber17

articles/azure-monitor/platform/collect-custom-metrics-guestos-resource-manager-vm.md

@@ -71,8 +71,8 @@ Add this Managed Service Identity (MSI) extension to the template at the top of
 // Add this code directly below.
     {
         "type": "Microsoft.Compute/virtualMachines/extensions",
-        "name": "WADExtensionSetup",
-        "apiVersion": "2015-05-01-preview",
+        "name": "[concat(variables('vmName'), '/', 'WADExtensionSetup')]",
+        "apiVersion": "2017-12-01",
         "location": "[resourceGroup().location]",
         "dependsOn": [
             "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]" ],
@@ -142,7 +142,7 @@ Add the following configuration to enable the Diagnostics extension on a Windows
 {
             "type": "extensions",
             "name": "Microsoft.Insights.VMDiagnosticsSettings",
-            "apiVersion": "2015-05-01-preview",
+            "apiVersion": "2017-12-01",
             "location": "[resourceGroup().location]",
             "dependsOn": [
             "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]"