Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev

Author: smithaborkar

src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Search/NewAzureOperationalInsightsComputerGroupCommand.cs

@@ -73,11 +73,6 @@ protected override void ProcessRecord()
                 Tags = new List<Tag>() { new Tag() { Name = "Group", Value = "Computer" } }
             };
 
-            if (!SearchCommandHelper.IsListOfComputers(this.Query))
-            {
-                throw new PSArgumentException("Query is not a list of computers. Please use aggregations such as: distinct Computer or measure count() by Computer.");
-            }
-
             WriteObject(OperationalInsightsClient.CreateOrUpdateSavedSearch(ResourceGroupName, WorkspaceName, SavedSearchId, properties, Force, ConfirmAction), true);
         }
 

src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Search/SearchCommandHelper.cs

@@ -23,29 +23,6 @@ namespace Microsoft.Azure.Commands.OperationalInsights
 
     internal class SearchCommandHelper
     {
-        /// <summary>
-        /// Return true if the provided query is a list of computers, return false otherwise.
-        /// </summary>
-        public static bool IsListOfComputers(string groupQuery)
-        {
-            if (string.IsNullOrEmpty(groupQuery))
-            {
-                return false;
-            }
-
-            // First, remove white spaces from group query.
-            string query = new string(
-                groupQuery.ToCharArray().Where(c => !Char.IsWhiteSpace(c)).ToArray());
-
-            if ((query.IndexOf("|measurecount()bycomputer", StringComparison.InvariantCultureIgnoreCase) >= 0) ||
-                (query.IndexOf("|distinctcomputer", StringComparison.InvariantCultureIgnoreCase) >= 0))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
         /// <summary>
         /// Populate and validate SavedSearch.Properties.Tags from a Hashtable of tags specified in the cmdlet.
         /// </summary>
@@ -57,7 +34,6 @@ public static IList<Tag> PopulateAndValidateTagsForProperties(Hashtable tags, st
                 return null;
             }
 
-            bool hasGroupTag = false;
             string groupKey = null;
             IList<Tag> tagList = new List<Tag>();
 
@@ -69,7 +45,6 @@ public static IList<Tag> PopulateAndValidateTagsForProperties(Hashtable tags, st
 
                     if (key.Equals("group", System.StringComparison.InvariantCultureIgnoreCase))
                     {
-                        hasGroupTag = true;
                         groupKey = key;
                     }
                 }
@@ -79,16 +54,6 @@ public static IList<Tag> PopulateAndValidateTagsForProperties(Hashtable tags, st
                 }
             }
 
-            // If the saved search is tagged as a group of computers, do a sanity check on the query as it should be a list of computers.
-            if (hasGroupTag &&
-                tags[groupKey].ToString().Equals("computer", StringComparison.InvariantCultureIgnoreCase))
-            {
-                if (!IsListOfComputers(query))
-                {
-                    throw new PSArgumentException("Query is not a list of computers. Please use aggregations such as: distinct Computer or measure count() by Computer.");
-                }
-            }
-
             return tagList;
         }
     }