Merge pull request Azure#8401 from MSSedusch/master

AEM Extension: add support for UltraSSD and P60,P70 and P80 disks

Author: markcowl

src/Compute/Compute.Test/ScenarioTests/AEMExtensionTests.ps1

@@ -19,6 +19,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* AEM extension: Add support for UltraSSD and P60,P70 and P80 disks
 * Update help description for Set-AzVMBootDiagnostics
 
 ## Version 1.2.0

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinux.json

@@ -41,6 +41,7 @@ public static class AEMExtensionConstants
         public const string DISK_TYPE_STANDARD = "Standard";
         public const string DISK_TYPE_PREMIUM = "Premium";
         public const string DISK_TYPE_PREMIUM_MD = "Premium";
+        public const string DISK_TYPE_ULTRA_MD = "Premium";
         public const string WadTableName = "WADPerformanceCountersTable";
         public const string AzureEndpoint = "core.windows.net";
         public const int ContentAgeInMinutes = 5;

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxMD.json

@@ -474,12 +474,30 @@ internal AzureSLA GetDiskSLA(int? diskSize, VirtualHardDisk vhd)
                 sla.IOPS = 7500;
                 sla.TP = 250;
             }
-            else if (diskSize > 0 && diskSize <= 4095)
+            else if (diskSize > 0 && diskSize <= (4 * 1024))
             {
                 // P50
                 sla.IOPS = 7500;
                 sla.TP = 250;
             }
+            else if (diskSize > 0 && diskSize <= (8 * 1024))
+            {
+                // P60
+                sla.IOPS = 12500;
+                sla.TP = 480;
+            }
+            else if (diskSize > 0 && diskSize <= (16 * 1024))
+            {
+                // P70
+                sla.IOPS = 15000;
+                sla.TP = 750;
+            }
+            else if (diskSize > 0 && diskSize <= (32 * 1024))
+            {
+                // P80
+                sla.IOPS = 20000;
+                sla.TP = 750;
+            }
             else
             {
                 WriteError("Unkown disk size for Premium Storage - {0}", diskSize);

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxMD_DSeries.json

@@ -210,7 +210,7 @@ public override void ExecuteCmdlet()
                         this._Helper.GetResourceNameFromId(osdisk.ManagedDisk.Id));
                     if (osDiskMD.Sku.Name == StorageAccountTypes.PremiumLRS)
                     {
-                        WriteVerbose("OS Disk Storage Account is a premium account - adding SLAs for OS disk");
+                        WriteVerbose("OS Disk is a Premium Managed Disk - adding SLAs for OS disk");
                         var sla = this._Helper.GetDiskSLA(osDiskMD.DiskSizeGB, null);
                         var caching = osdisk.Caching;
                         sapmonPublicConfig.Add(new KeyValuePair() { Key = "osdisk.name", Value = this._Helper.GetResourceNameFromId(osdisk.ManagedDisk.Id) });
@@ -247,6 +247,19 @@ public override void ExecuteCmdlet()
                             sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.sla.iops." + diskNumber, Value = sla.IOPS });
                             this._Helper.WriteVerbose("Done - Data Disk {0} is a Premium Managed Disk - adding SLAs for disk", diskNumber.ToString());
                         }
+                        else if (diskMD.Sku.Name == StorageAccountTypes.UltraSSDLRS)
+                        {
+                            this._Helper.WriteVerbose("Data Disk {0} is an UltraSSD Disk - adding SLAs for disk", diskNumber.ToString());
+                            var sla = this._Helper.GetDiskSLA(diskMD.DiskSizeGB, null);
+                            var cachingMD = disk.Caching;
+                            sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.lun." + diskNumber, Value = disk.Lun });
+                            sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.name." + diskNumber, Value = this._Helper.GetResourceNameFromId(disk.ManagedDisk.Id) });
+                            sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.caching." + diskNumber, Value = cachingMD });
+                            sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.type." + diskNumber, Value = AEMExtensionConstants.DISK_TYPE_ULTRA_MD });
+                            sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.sla.throughput." + diskNumber, Value = diskMD.DiskMBpsReadWrite });
+                            sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.sla.iops." + diskNumber, Value = diskMD.DiskIOPSReadWrite });
+                            this._Helper.WriteVerbose("Done - Data Disk {0} is an UltraSSD Disk - adding SLAs for disk", diskNumber.ToString());
+                        }
                         else
                         {
                             this._Helper.WriteWarning("[WARN] Standard Managed Disks are not supported. Extension will be installed but no disk metrics will be available.");

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxMD_ESeries.json

@@ -398,6 +398,12 @@ public override void ExecuteCmdlet()
                                 this._Helper.CheckMonitoringProperty("Azure Enhanced Monitoring Extension for SAP public configuration check: VM Data Disk " + diskNumber + " SLA IOPS", "disk.sla.throughput." + diskNumber, sapmonPublicConfig, sla.TP, aemConfigResult);
                                 this._Helper.CheckMonitoringProperty("Azure Enhanced Monitoring Extension for SAP public configuration check: VM Data Disk " + diskNumber + " SLA Throughput", "disk.sla.iops." + diskNumber, sapmonPublicConfig, sla.IOPS, aemConfigResult);
                             }
+                            else if (diskMD.Sku.Name == StorageAccountTypes.UltraSSDLRS)
+                            {
+                                this._Helper.CheckMonitoringProperty("Azure Enhanced Monitoring Extension for SAP public configuration check: VM Data Disk " + diskNumber + " Type", "disk.type." + diskNumber, sapmonPublicConfig, AEMExtensionConstants.DISK_TYPE_PREMIUM_MD, aemConfigResult);
+                                this._Helper.CheckMonitoringProperty("Azure Enhanced Monitoring Extension for SAP public configuration check: VM Data Disk " + diskNumber + " SLA IOPS", "disk.sla.throughput." + diskNumber, sapmonPublicConfig, diskMD.DiskMBpsReadWrite, aemConfigResult);
+                                this._Helper.CheckMonitoringProperty("Azure Enhanced Monitoring Extension for SAP public configuration check: VM Data Disk " + diskNumber + " SLA Throughput", "disk.sla.iops." + diskNumber, sapmonPublicConfig, diskMD.DiskIOPSReadWrite, aemConfigResult);
+                            }
                             else
                             {
                                 this._Helper.WriteWarning("[WARN] Standard Managed Disks are not supported.");

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinuxWAD.json

@@ -1065,6 +1065,54 @@
 	  {
       "file": "\\src\\IotHub\\IotHub.Test\\ScenarioTests\\IotHubRoutingTests.ps1",
       "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionAdvancedLinux.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionAdvancedLinuxMD_DSeries.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionAdvancedLinuxMD.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionAdvancedLinuxWAD.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionAdvancedWindows.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionAdvancedWindowsMD.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionAdvancedWindowsWAD.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionBasicLinux.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionBasicLinuxWAD.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionBasicWindows.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionBasicWindowsWAD.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
+    },
+	  {
+      "file": "src\\Compute\\Compute.Test\\SessionRecords\\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests\\TestAEMExtensionAdvancedLinuxMD_ESeries.json",
+      "_justification": "Mocked test resource. The resources are being deleted after the test run in Record mode."
     }
   ]
 }