add metrics for managed os disk

Author: MSSedusch

src/ResourceManager/Compute/Commands.Compute/Extension/AEM/AEMExtensionConstants.cs

@@ -40,6 +40,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 = "PremiumMD";
         public const string WadTableName = "WADPerformanceCountersTable";
         public const string AzureEndpoint = "core.windows.net";
         public const int ContentAgeInMinutes = 5;

src/ResourceManager/Compute/Commands.Compute/Extension/AEM/AEMHelper.cs

@@ -104,6 +104,11 @@ internal bool IsPremiumStorageAccount(string accountName)
 
         internal int? GetDiskSizeGbFromBlobUri(string sBlobUri)
         {
+            if (String.IsNullOrEmpty(sBlobUri))
+            {
+                return null;
+            }
+
             var blobMatch = Regex.Match(sBlobUri, "https?://(\\S*?)\\..*?/(.*)");
             if (!blobMatch.Success)
             {
@@ -321,7 +326,7 @@ internal bool IsPremiumStorageAccount(StorageAccount account)
         {
             if (account.AccountType.HasValue)
             {
-                return (account.AccountType.Value.ToString().StartsWith("Premium"));
+                return (account.AccountType.Value == AccountType.PremiumLRS);
             }
 
             WriteError("No AccountType for storage account {0} found", account.Name);
@@ -330,19 +335,19 @@ internal bool IsPremiumStorageAccount(StorageAccount account)
 
         internal AzureSLA GetDiskSLA(OSDisk osdisk)
         {
-            return this.GetDiskSLA(osdisk.DiskSizeGB, osdisk.Vhd.Uri);
+            return this.GetDiskSLA(osdisk.DiskSizeGB, osdisk.Vhd);
         }
 
         internal AzureSLA GetDiskSLA(DataDisk datadisk)
         {
-            return this.GetDiskSLA(datadisk.DiskSizeGB, datadisk.Vhd.Uri);
+            return this.GetDiskSLA(datadisk.DiskSizeGB, datadisk.Vhd);
         }
 
-        internal AzureSLA GetDiskSLA(int? diskSize, string vhdUri)
+        internal AzureSLA GetDiskSLA(int? diskSize, VirtualHardDisk vhd)
         {
-            if (!diskSize.HasValue)
+            if (!diskSize.HasValue && vhd != null)
             {
-                diskSize = this.GetDiskSizeGbFromBlobUri(vhdUri);
+                diskSize = this.GetDiskSizeGbFromBlobUri(vhd.Uri);
             }
             if (!diskSize.HasValue)
             {
@@ -363,7 +368,7 @@ internal AzureSLA GetDiskSLA(int? diskSize, string vhdUri)
                 sla.IOPS = 2300;
                 sla.TP = 150;
             }
-            else if (diskSize > 0 && diskSize < 1025)
+            else if (diskSize > 0 && diskSize < 1024)
             {
                 // P30
                 sla.IOPS = 5000;

src/ResourceManager/Compute/Commands.Compute/Extension/AEM/SetAzureRmVMAEMExtension.cs

@@ -207,18 +207,36 @@ public override void ExecuteCmdlet()
                         sapmonPublicConfig.Add(new KeyValuePair() { Key = "osdisk.connhour", Value = (accountName + ".hour") });
                     }
                 }
+                else if (osdisk.ManagedDisk.StorageAccountType == StorageAccountTypes.PremiumLRS)
+                {
+                    WriteVerbose("OS Disk Storage Account is a premium account - adding SLAs for OS disk");
+                    var sla = this._Helper.GetDiskSLA(osdisk);
+                    sapmonPublicConfig.Add(new KeyValuePair() { Key = "osdisk.type", Value = AEMExtensionConstants.DISK_TYPE_PREMIUM_MD });
+                    sapmonPublicConfig.Add(new KeyValuePair() { Key = "osdisk.sla.throughput", Value = sla.TP });
+                    sapmonPublicConfig.Add(new KeyValuePair() { Key = "osdisk.sla.iops", Value = sla.IOPS });
+                }
                 else
                 {
-                    this._Helper.WriteWarning("[WARN] Managed Disks are not yet supported. Extension will be installed but no disk metrics will be available.");
+                    this._Helper.WriteWarning("[WARN] Standard Managed Disks are not supported. Extension will be installed but no disk metrics will be available.");
                 }
 
                 // Get Storage accounts from disks
                 var diskNumber = 1;
                 foreach (var disk in disks)
                 {
-                    if (disk.ManagedDisk != null)
+                    
+                    if (disk.ManagedDisk != null && disk.ManagedDisk.StorageAccountType == StorageAccountTypes.PremiumLRS)
+                    {
+                        this._Helper.WriteVerbose("Data Disk {0} is a Premium Managed Disk - adding SLAs for disk", diskNumber.ToString());
+                        var sla = this._Helper.GetDiskSLA(disk);
+                        sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.type." + diskNumber, Value = AEMExtensionConstants.DISK_TYPE_PREMIUM_MD });
+                        sapmonPublicConfig.Add(new KeyValuePair() { Key = "disk.sla.throughput." + diskNumber, Value = sla.TP });
+                        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 (disk.ManagedDisk != null)
                     {
-                        this._Helper.WriteWarning("[WARN] Managed Disks are not yet supported. Extension will be installed but no disk metrics will be available.");
+                        this._Helper.WriteWarning("[WARN] Standard Managed Disks are not supported. Extension will be installed but no disk metrics will be available.");
                         continue;
                     }