Merge pull request Azure#1962 from yantang-msft/AutoFillMetricsResourceId

Auto fill metrics resource id

Author: Hovsep

src/ResourceManager/Compute/Commands.Compute.Test/ConfigFiles/DiagnosticsExtensionConfig.json

@@ -86,6 +86,14 @@
         "scheduledTransferLogLevelFilter": "Error",
         "scheduledTransferPeriod": "PT1M"
       },
+      "Metrics": {
+        "resourceId": "dummy",
+        "MetricAggregation": [
+          {
+            "scheduledTransferPeriod": "PT1M"
+          }
+        ]
+      },
       "overallQuotaInMB": 4096
     }
   }

src/ResourceManager/Compute/Commands.Compute.Test/ConfigFiles/DiagnosticsExtensionConfig.xml

@@ -26,6 +26,9 @@
         <CrashDumpConfiguration processName="w3wp.exe" />
       </CrashDumps>
       <Logs scheduledTransferPeriod="PT3M" />
+      <Metrics resourceId="dummy">
+        <MetricAggregation scheduledTransferPeriod="PT1M"/>
+      </Metrics>
     </DiagnosticMonitorConfiguration>
   </WadCfg>
   <StorageAccount>definedinconfigstorage</StorageAccount>

src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionBasic.json

@@ -16,6 +16,7 @@
 using System.Collections;
 using System.IO;
 using System.Linq;
+using System.Management.Automation;
 using System.Text;
 using System.Xml;
 using System.Xml.Linq;
@@ -46,12 +47,15 @@ public static class DiagnosticsHelper
         private static string StorageAccountEndPointTag = "storageAccountEndPoint";
 
         public static string DiagnosticsConfigurationElemStr = "DiagnosticsConfiguration";
+        public static string DiagnosticMonitorConfigurationElemStr = "DiagnosticMonitorConfiguration";
         public static string PublicConfigElemStr = "PublicConfig";
         public static string PrivateConfigElemStr = "PrivateConfig";
         public static string StorageAccountElemStr = "StorageAccount";
         public static string PrivConfNameAttr = "name";
         public static string PrivConfKeyAttr = "key";
         public static string PrivConfEndpointAttr = "endpoint";
+        public static string MetricsElemStr = "Metrics";
+        public static string MetricsResourceIdAttr = "resourceId";
 
         public enum ConfigFileType
         {
@@ -70,71 +74,58 @@ public static ConfigFileType GetConfigFileType(string configurationPath)
                     doc.Load(configurationPath);
                     return ConfigFileType.Xml;
                 }
-                catch
+                catch (XmlException)
                 { }
 
                 try
                 {
                     JsonConvert.DeserializeObject(File.ReadAllText(configurationPath));
                     return ConfigFileType.Json;
                 }
-                catch
+                catch (JsonReaderException)
                 { }
             }
 
             return ConfigFileType.Unknown;
         }
 
         public static Hashtable GetPublicDiagnosticsConfigurationFromFile(string configurationPath,
-            string storageAccountName)
+            string storageAccountName, string resourceId, Cmdlet cmdlet)
         {
             switch (GetConfigFileType(configurationPath))
             {
                 case ConfigFileType.Xml:
-                    return GetPublicConfigFromXmlFile(configurationPath, storageAccountName);
+                    return GetPublicConfigFromXmlFile(configurationPath, storageAccountName, resourceId, cmdlet);
                 case ConfigFileType.Json:
-                    return GetPublicConfigFromJsonFile(configurationPath, storageAccountName);
+                    return GetPublicConfigFromJsonFile(configurationPath, storageAccountName, resourceId, cmdlet);
                 default:
                     throw new ArgumentException(Properties.Resources.DiagnosticsExtensionInvalidConfigFileFormat);
             }
         }
 
-        private static Hashtable GetPublicConfigFromXmlFile(string configurationPath, string storageAccountName)
+        private static Hashtable GetPublicConfigFromXmlFile(string configurationPath, string storageAccountName, string resourceId, Cmdlet cmdlet)
         {
-            var config = File.ReadAllText(configurationPath);
-
-            // find the <WadCfg> element and extract it
-            int wadCfgBeginIndex = config.IndexOf("<WadCfg>");
-            if (wadCfgBeginIndex == -1)
+            var doc = XDocument.Load(configurationPath);
+            var wadCfgElement = doc.Descendants().FirstOrDefault(d => d.Name.LocalName == WadCfg);
+            var wadCfgBlobElement = doc.Descendants().FirstOrDefault(d => d.Name.LocalName == WadCfgBlob);
+            if (wadCfgElement == null && wadCfgBlobElement == null)
             {
-                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionXmlConfigNoWadCfgStartTag);
+                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionIaaSConfigElementNotDefinedInXml);
             }
 
-            int wadCfgEndIndex = config.IndexOf("</WadCfg>");
-            if (wadCfgEndIndex == -1)
+            if (wadCfgElement != null)
             {
-                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionXmlConfigNoWadCfgEndTag);
+                AutoFillMetricsConfig(wadCfgElement, resourceId, cmdlet);
             }
 
-            if (wadCfgEndIndex <= wadCfgBeginIndex)
-            {
-                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionXmlConfigWadCfgTagNotMatch);
-            }
-
-            string encodedConfiguration = Convert.ToBase64String(
-                Encoding.UTF8.GetBytes(
-                    config.Substring(
-                        wadCfgBeginIndex, wadCfgEndIndex + "</WadCfg>".Length - wadCfgBeginIndex).ToCharArray()));
+            string originalConfiguration = wadCfgElement != null ? wadCfgElement.ToString() : wadCfgBlobElement.ToString();
+            string encodedConfiguration = Convert.ToBase64String(Encoding.UTF8.GetBytes(wadCfgElement.ToString().ToCharArray()));
 
             // Now extract the local resource directory element
-            XmlDocument doc = new XmlDocument();
-            XmlNamespaceManager ns = new XmlNamespaceManager(doc.NameTable);
-            ns.AddNamespace("ns", XmlNamespace);
-            doc.LoadXml(config);
-            var node = doc.SelectSingleNode("//ns:LocalResourceDirectory", ns);
-            string localDirectory = (node != null && node.Attributes != null) ? node.Attributes[Path].Value : null;
-            string localDirectoryExpand = (node != null && node.Attributes != null)
-                ? node.Attributes["expandEnvironment"].Value
+            var node = doc.Descendants().FirstOrDefault(e => e.Name.LocalName == "LocalResourceDirectory");
+            string localDirectory = (node != null && node.Attribute(Path) != null) ? node.Attribute(Path).Value : null;
+            string localDirectoryExpand = (node != null && node.Attribute("expandEnvironment") != null)
+                ? node.Attribute("expandEnvironment").Value
                 : null;
             if (localDirectoryExpand == "0")
             {
@@ -159,7 +150,39 @@ private static Hashtable GetPublicConfigFromXmlFile(string configurationPath, st
             return hashTable;
         }
 
-        private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, string storageAccountName)
+        private static void AutoFillMetricsConfig(XElement wadCfgElement, string resourceId, Cmdlet cmdlet)
+        {
+            if (string.IsNullOrEmpty(resourceId))
+            {
+                return;
+            }
+
+            var configurationElem = wadCfgElement.Elements().FirstOrDefault(d => d.Name.LocalName == DiagnosticMonitorConfigurationElemStr);
+            if (configurationElem == null)
+            {
+                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionDiagnosticMonitorConfigurationElementNotDefined);
+            }
+
+            var metricsElement = configurationElem.Elements().FirstOrDefault(d => d.Name.LocalName == MetricsElemStr);
+            if (metricsElement == null)
+            {
+                XNamespace ns = XmlNamespace;
+                metricsElement = new XElement(ns + MetricsElemStr,
+                    new XAttribute(MetricsResourceIdAttr, resourceId));
+                configurationElem.Add(metricsElement);
+            }
+            else
+            {
+                var resourceIdAttr = metricsElement.Attribute(MetricsResourceIdAttr);
+                if (resourceIdAttr != null && !resourceIdAttr.Value.Equals(resourceId))
+                {
+                    cmdlet.WriteWarning(Properties.Resources.DiagnosticsExtensionMetricsResourceIdNotMatch);
+                }
+                metricsElement.SetAttributeValue(MetricsResourceIdAttr, resourceId);
+            }
+        }
+
+        private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, string storageAccountName, string resourceId, Cmdlet cmdlet)
         {
             var publicConfig = GetPublicConfigJObjectFromJsonFile(configurationPath);
             var properties = publicConfig.Properties().Select(p => p.Name);
@@ -170,9 +193,11 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s
             var hashTable = new Hashtable();
             hashTable.Add(StorageAccount, storageAccountName);
 
-            if (wadCfgProperty != null)
+            if (wadCfgProperty != null && publicConfig[wadCfgProperty] is JObject)
             {
-                hashTable.Add(wadCfgProperty, publicConfig[wadCfgProperty]);
+                var wadCfgObject = (JObject)publicConfig[wadCfgProperty];
+                AutoFillMetricsConfig(wadCfgObject, resourceId, cmdlet);
+                hashTable.Add(wadCfgProperty, wadCfgObject);
             }
             else if (wadCfgBlobProperty != null)
             {
@@ -184,12 +209,43 @@ private static Hashtable GetPublicConfigFromJsonFile(string configurationPath, s
             }
             else
             {
-                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionIaaSConfigElementNotDefined);
+                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionIaaSConfigElementNotDefinedInJson);
             }
 
             return hashTable;
         }
 
+        private static void AutoFillMetricsConfig(JObject wadCfgObject, string resourceId, Cmdlet cmdlet)
+        {
+            if (string.IsNullOrEmpty(resourceId))
+            {
+                return;
+            }
+
+            var configObject = wadCfgObject[DiagnosticMonitorConfigurationElemStr] as JObject;
+            if (configObject == null)
+            {
+                throw new ArgumentException(Properties.Resources.DiagnosticsExtensionDiagnosticMonitorConfigurationElementNotDefined);
+            }
+
+            var metricsObject = configObject[MetricsElemStr] as JObject;
+            if (metricsObject == null)
+            {
+                configObject.Add(new JProperty(MetricsElemStr,
+                                    new JObject(
+                                        new JProperty(MetricsResourceIdAttr, resourceId))));
+            }
+            else
+            {
+                var resourceIdValue = metricsObject[MetricsResourceIdAttr] as JValue;
+                if (resourceIdValue != null && !resourceIdValue.Value.Equals(resourceId))
+                {
+                    cmdlet.WriteWarning(Properties.Resources.DiagnosticsExtensionMetricsResourceIdNotMatch);
+                }
+                metricsObject[MetricsResourceIdAttr] = resourceId;
+            }
+        }
+
         public static Hashtable GetPrivateDiagnosticsConfiguration(string storageAccountName,
             string storageKey, string endpoint)
         {
@@ -201,7 +257,7 @@ public static Hashtable GetPrivateDiagnosticsConfiguration(string storageAccount
             return privateConfig;
         }
 
-        public static XElement GetPublicConfigXElementFromXmlFile(string configurationPath)
+        private static XElement GetPublicConfigXElementFromXmlFile(string configurationPath)
         {
             XElement publicConfig = null;
 
@@ -224,7 +280,7 @@ public static XElement GetPublicConfigXElementFromXmlFile(string configurationPa
             return publicConfig;
         }
 
-        public static JObject GetPublicConfigJObjectFromJsonFile(string configurationPath)
+        private static JObject GetPublicConfigJObjectFromJsonFile(string configurationPath)
         {
             var config = JsonConvert.DeserializeObject<JObject>(File.ReadAllText(configurationPath));
             var properties = config.Properties().Select(p => p.Name);

src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DiagnosticsExtensionTests/TestDiagnosticsExtensionSepcifyStorageAccountName.json

@@ -20,8 +20,7 @@
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Compute.Common;
 using Microsoft.Azure.Commands.Compute.Models;
-using Microsoft.Azure.ServiceManagemenet.Common;
-using Microsoft.Azure.ServiceManagemenet.Common.Models;
+using Microsoft.Azure.Management.Compute;
 using Microsoft.Azure.Management.Compute.Models;
 using Microsoft.Azure.Management.Storage;
 using Microsoft.WindowsAzure.Commands.Common.Storage;
@@ -179,9 +178,10 @@ private Hashtable PublicConfiguration
             {
                 if (this.publicConfiguration == null)
                 {
+                    var vm = ComputeClient.ComputeManagementClient.VirtualMachines.Get(this.ResourceGroupName, this.VMName);
                     this.publicConfiguration =
                         DiagnosticsHelper.GetPublicDiagnosticsConfigurationFromFile(this.DiagnosticsConfigurationPath,
-                            this.StorageAccountName);
+                            this.StorageAccountName, vm.Id, cmdlet: this);
                 }
 
                 return this.publicConfiguration;