Merge branch 'preview' of github.com:/azure/azure-powershell into nsoft9merge

Author: markcowl

documentation/development-docs/create-alias-mappings.md

@@ -0,0 +1,9 @@
+In the new Az Netstandard module, the default prefix for all cmdlets is "Az".  However, in order to prevent massive breaking changes that require scripts to be immediately rewritten, we have created a new cmdlet "Enable-AzureRmAlias" that will enable aliases to the old "AzureRm" prefix.  This is a guide on how to add aliases for new cmdlets added to any module.
+
+1.) Ensure your cmdlet attribute is formatted correctly to include the AzureRMPrefix.  This will make the cmdlet prefix "Az" for Netstandard and "AzureRM" for the legacy desktop module (while the desktop module continues to be maintained). Example can be found [here](https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Profile/Commands.Profile/Default/GetAzureRmDefault.cs#L29).
+
+2.) Ensure both AzureRm.\<moduleName>.psd1 and Az.\<moduleName>.psd1 are updated with all new cmdlets.  The prefix for cmdlets in AzureRM.\<moduleName>.psd1 should be AzureRm, and the prefix for cmdlets in Az.\<moduleName>.psd1 should be Az.
+
+3.) Run the script to create alias mapping.  This can be found in [tools/CreateAliasMappings.ps1](https://github.com/Azure/azure-powershell/blob/preview/tools/CreateAliasMapping.ps1).
+
+4.) Copy the output contents from [tools/AliasMappings.json](https://github.com/Azure/azure-powershell/blob/preview/tools/AliasMapping.json) into the mapping variable in [src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/Mappings.cs](https://github.com/Azure/azure-powershell/blob/preview/src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/Mappings.cs#L36).

src/ResourceManager/Compute/Commands.Compute/help/Export-AzureRmLogAnalyticRequestRateByInterval.md

@@ -20,9 +20,10 @@ Export-AzureRmLogAnalyticRequestRateByInterval [-FromTime] <DateTime> [-GroupByO
 ```
 
 ## DESCRIPTION
-This exports aggregated numbers of Microsoft.Compute API calls separated by Success, Failure, or Throttled displayed in time intervals.
-The logs can be further grouped by three parameters: GroupByOperationName, GroupByThrottlePolicy, or GroupByResourceName.
-Note that this cmdlet collects only CRP logs.
+Exports statistical data about the subscription's calls to the Microsoft.Compute API by Success, Failure, or Throttled status, in predefined time intervals. The logs can be further grouped by three parameters: GroupByOperationName, GroupByThrottlePolicy, or GroupByResourceName.
+Note that this cmdlet collects only Compute Resource Provider logs; moreover, data about the Disk and Snapshot resource types is not yet available.
+
+For an overview of the Compute Resource Provider's API throttling, see https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-manager-request-limits. 
 
 ## EXAMPLES
 

src/ResourceManager/Compute/Commands.Compute/help/Export-AzureRmLogAnalyticThrottledRequests.md

@@ -24,6 +24,8 @@ This exports the total number of throttled Microsoft.Compute API calls.
 The logs can be further aggregated by three options: GroupByOperationName, GroupByThrottlePolicy, or GroupByResourceName.
 Note that this cmdlet collects only CRP logs.
 
+For an overview of the Compute Resource Provider's API throttling, see https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-manager-request-limits. 
+
 ## EXAMPLES
 
 ### Example 1

src/ResourceManager/Insights/Commands.Insights.Test/Diagnostics/SetDiagnosticSettingCommandTests.cs

@@ -203,14 +203,23 @@ public void SetSomeCategories()
             expectedSettings.Logs[0].Enabled = false;
 
             VerifyCalledOnce();
-            VerifySettings(expectedSettings, this.calledSettings);
+            VerifySettings(expectedSettings, this.calledSettings, suffix: "#1");
 
             // Testing the new categories must be known before the cmdlet can add them
+            expectedSettings.Logs.Add(
+                new LogSettings()
+                {
+                    Category = "TestCategory3",
+                    RetentionPolicy = new RetentionPolicy
+                    {
+                        Days = 0,
+                        Enabled = false
+                    }
+                });
             cmdlet.Categories = new List<string> { "TestCategory3" };
             cmdlet.Enabled = false;
             cmdlet.MyInvocation.BoundParameters[SetAzureRmDiagnosticSettingCommand.EnabledParamName] = false;
-            var argException = Assert.Throws<PSInvalidOperationException>(() => cmdlet.ExecuteCmdlet());
-            Assert.Contains("ArgumentException", argException.ToString());
+            cmdlet.ExecuteCmdlet();
 
             // Testing the new metric categories must be known before the cmdlet can add them
             expectedSettings.Metrics[0].Enabled = false;
@@ -220,14 +229,13 @@ public void SetSomeCategories()
             cmdlet.MyInvocation.BoundParameters[SetAzureRmDiagnosticSettingCommand.EnabledParamName] = false;
             cmdlet.ExecuteCmdlet();
 
-            VerifySettings(expectedSettings, this.calledSettings);
+            VerifySettings(expectedSettings, this.calledSettings, suffix: "#2");
 
             // Testing the new categories must be known before the cmdlet can add them
             cmdlet.MetricCategory = new List<string> { "MetricCat3" };
             cmdlet.Enabled = false;
             cmdlet.MyInvocation.BoundParameters[SetAzureRmDiagnosticSettingCommand.EnabledParamName] = false;
-            argException = Assert.Throws<PSInvalidOperationException>(() => cmdlet.ExecuteCmdlet());
-            Assert.Contains("ArgumentException", argException.ToString());
+            cmdlet.ExecuteCmdlet();
         }
 
         [Fact]
@@ -310,7 +318,8 @@ private void VerifyCalledOnce()
 
         private void VerifySettings(
             DiagnosticSettingsResource expectedSettings,
-            DiagnosticSettingsResource actualSettings)
+            DiagnosticSettingsResource actualSettings,
+            string suffix = "")
         {
             Assert.Equal(expectedSettings.StorageAccountId, actualSettings.StorageAccountId);
             Assert.Equal(expectedSettings.EventHubName, actualSettings.EventHubName);
@@ -321,7 +330,7 @@ private void VerifySettings(
             }
             else
             {
-                Assert.True(expectedSettings.Logs.Count == actualSettings.Logs.Count, string.Format("Expected: {0}, Actual: {1}, no the same number of Log settings", expectedSettings.Logs.Count, actualSettings.Logs.Count));
+                Assert.True(expectedSettings.Logs.Count == actualSettings.Logs.Count, string.Format("Expected: {0}, Actual: {1}, no the same number of Log settings {2}", expectedSettings.Logs.Count, actualSettings.Logs.Count, suffix));
                 for (int i = 0; i < expectedSettings.Logs.Count; i++)
                 {
                     var expected = expectedSettings.Logs[i];
@@ -338,7 +347,7 @@ private void VerifySettings(
             }
             else
             {
-                Assert.True(expectedSettings.Metrics.Count == actualSettings.Metrics.Count, string.Format("Expected: {0}, Actual: {1}, no the same number of Metric settings", expectedSettings.Metrics.Count, actualSettings.Metrics.Count));
+                Assert.True(expectedSettings.Metrics.Count == actualSettings.Metrics.Count, string.Format("Expected: {0}, Actual: {1}, no the same number of Metric settings {2}", expectedSettings.Metrics.Count, actualSettings.Metrics.Count, suffix));
                 for (int i = 0; i < expectedSettings.Metrics.Count; i++)
                 {
                     var expected = expectedSettings.Metrics[i];

src/ResourceManager/Insights/Commands.Insights/ChangeLog.md

@@ -19,6 +19,13 @@
 -->
 ## Current Release
 
+* Fixed issues #6833 and #7102 (Diagnostic Settings area)
+    - Issues with the default name, i.e. "service", during creation and listing/getting of diagnostic settings
+    - Issues creating diagnostic settings with categories
+
+* Added deprecation message for metrics time grains parameters
+    - Timegrains parameters are still being accepted (this is a non-breaking change,) but they are ignored in the backend since only PT1M is valid
+
 ## Version 5.1.3
 * Fixed issue with default resource groups not being set.
 * Updated common runtime assemblies

src/ResourceManager/Insights/Commands.Insights/Diagnostics/SetAzureRmDiagnosticSettingCommand.cs

@@ -364,8 +364,13 @@ private void SetSelectedTimegrains(DiagnosticSettingsResource properties)
                 throw new ArgumentException("Parameter 'Enabled' is required by 'Timegrains' parameter.");
             }
 
-            if (this.Timegrains.Count > 0)
+            if (this.Timegrains != null && this.Timegrains.Count > 0)
             {
+                if (properties.Metrics == null)
+                {
+                    properties.Metrics = new List<MetricSettings>();
+                }
+
                 WriteWarningWithTimestamp("Deprecation: The timegain argument for metrics will be deprecated since the back end supports only PT1M. Currently it is ignored for backwards compatibility.");
                 WriteDebugWithTimestamp("Setting Enabled property for metrics since timegrains argument is non-empty");
                 foreach (MetricSettings metric in properties.Metrics)
@@ -383,16 +388,35 @@ private void SetSelectedCategories(DiagnosticSettingsResource properties)
             }
 
             WriteDebugWithTimestamp("Setting log categories, including Enabled property");
+            if (properties.Logs == null)
+            {
+                properties.Logs = new List<LogSettings>();
+            }
+
             foreach (string category in this.Categories)
             {
                 LogSettings logSettings = properties.Logs.FirstOrDefault(x => string.Equals(x.Category, category, StringComparison.OrdinalIgnoreCase));
-
                 if (logSettings == null)
                 {
-                    throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "Log category '{0}' is not available", category));
-                }
+                    // if not there add it
+                    logSettings = new LogSettings()
+                    {
+                        Category = category,
+                        RetentionPolicy = new RetentionPolicy
+                        {
+                            Days = 0,
+                            Enabled = false
+                        },
+                        Enabled = this.Enabled
+                    };
 
-                logSettings.Enabled = this.Enabled;
+                    properties.Logs.Add(logSettings);
+                }
+                else
+                {
+                    // else update it
+                    logSettings.Enabled = this.Enabled;
+                }
             }
         }
 
@@ -404,16 +428,37 @@ private void SetSelectedMetricsCategories(DiagnosticSettingsResource properties)
             }
 
             WriteDebugWithTimestamp("Setting metric categories, including Enabled property");
+            if (properties.Metrics == null)
+            {
+                properties.Metrics = new List<MetricSettings>();
+            }
+
             foreach (string category in this.MetricCategory)
             {
                 MetricSettings metricSettings = properties.Metrics.FirstOrDefault(x => string.Equals(x.Category, category, StringComparison.OrdinalIgnoreCase));
 
                 if (metricSettings == null)
                 {
-                    throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "Metric category '{0}' is not available", category));
-                }
+                    // If not there add it
+                    metricSettings = new MetricSettings
+                    {
+                        Category = category,
+                        Enabled = this.Enabled,
+                        RetentionPolicy = new RetentionPolicy
+                        {
+                            Days = 0,
+                            Enabled = false
+                        },
+                        TimeGrain = null
+                    };
 
-                metricSettings.Enabled = this.Enabled;
+                    properties.Metrics.Add(metricSettings);
+                }
+                else
+                {
+                    // else update it
+                    metricSettings.Enabled = this.Enabled;
+                }
             }
         }
 
@@ -425,12 +470,22 @@ private void SetAllCategoriesAndTimegrains(DiagnosticSettingsResource properties
             }
 
             WriteDebugWithTimestamp("Setting Enabled property for logs");
+            if (properties.Logs == null)
+            {
+                properties.Logs = new List<LogSettings>();
+            }
+
             foreach (var log in properties.Logs)
             {
                 log.Enabled = this.Enabled;
             }
 
             WriteDebugWithTimestamp("Setting Enabled property for metrics");
+            if (properties.Metrics == null)
+            {
+                properties.Metrics = new List<MetricSettings>();
+            }
+
             foreach (var metric in properties.Metrics)
             {
                 metric.Enabled = this.Enabled;
@@ -470,7 +525,6 @@ private void SetEventHubRule(DiagnosticSettingsResource properties)
             }
         }
 
-
         private void SetStorage(DiagnosticSettingsResource properties)
         {
             if (this.isStorageParamPresent)

src/ResourceManager/Websites/Commands.Websites/help/Set-AzureRmWebAppSlotConfigName.md

@@ -34,7 +34,7 @@ The **Set-AzureRmWebAppSlotConfigName** cmdlet marks App Settings and Connection
 
 ### 1:
 ```
-PS C:\> Set-AzureRmWebAppSlotConfigName -ResourceGroupName "Default-Web-WestUS" -Name "ContosoWebApp" -Slot "Slot001" -RemoveAllAppSettingNames -RemoveAllConnectionStringNames
+PS C:\> Set-AzureRmWebAppSlotConfigName -ResourceGroupName "Default-Web-WestUS" -Name "ContosoWebApp" -RemoveAllAppSettingNames -RemoveAllConnectionStringNames
 ```
 
 This command removes all app settings and connection strings for Web App ContosoWebApp associated with the resource group Default-Web-WestUS

src/Storage/Commands.Storage/Azure.Storage.psd1

@@ -126,9 +126,7 @@ CmdletsToExport = 'Get-AzureStorageTable', 'New-AzureStorageTableSASToken',
                'Stop-AzureStorageBlobCopy', 'Update-AzureStorageServiceProperty', 
                'Get-AzureStorageServiceProperty', 
                'Enable-AzureStorageDeleteRetentionPolicy', 
-               'Disable-AzureStorageDeleteRetentionPolicy',
-               'Enable-AzureStorageStaticWebsite', 
-               'Disable-AzureStorageStaticWebsite'
+               'Disable-AzureStorageDeleteRetentionPolicy'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/Storage/Commands.Storage/ChangeLog.md

@@ -21,9 +21,6 @@
 * Upgrade to Azure Storage Client Library 9.3.0 and Azure Storage DataMovement Library 0.8.1
 * Support create Storage Context with OAuth. 
 	- New-AzureStorageContext
-* Support Static Website configuration 
-	- Enable-AzureStorageStaticWebsite
-	- Disable-AzureStorageStaticWebsite
 
 ## Version 4.5.0
 * Remove the 5TB limitation for Azure File Share quota

src/Storage/Commands.Storage/Common/Cmdlet/DisableAzureStorageStaticWebsite.cs

@@ -23,8 +23,6 @@ namespace Microsoft.WindowsAzure.Commands.Storage.Common.Cmdlet
     /// <summary>
     /// Disable azure storage service StaticWebsite, currently only available on Blob service
     /// </summary>
-    [Cmdlet(VerbsLifecycle.Disable, Azure.Commands.ResourceManager.Common.AzureRMConstants.AzurePrefix + "StorageStaticWebsite", SupportsShouldProcess = true),
-        OutputType(typeof(PSStaticWebsiteProperties))]
     public class DisableAzureStorageServiceStaticWebsiteCommand : StorageCloudBlobCmdletBase
     {
         [Parameter(Mandatory = false)]

src/Storage/Commands.Storage/Common/Cmdlet/EnableAzureStorageStaticWebsite.cs

@@ -23,8 +23,6 @@ namespace Microsoft.WindowsAzure.Commands.Storage.Common.Cmdlet
     /// <summary>
     /// Enable azure storage service StaticWebsite, currently only enabled on Blob service
     /// </summary>
-    [Cmdlet(VerbsLifecycle.Enable, Azure.Commands.ResourceManager.Common.AzureRMConstants.AzurePrefix + "StorageStaticWebsite", SupportsShouldProcess = true),
-        OutputType(typeof(PSStaticWebsiteProperties))]
     public class EnableAzureStorageServiceStaticWebsiteCommand : StorageCloudBlobCmdletBase
     {
         [Parameter(Mandatory = true, Position = 0, HelpMessage = "The name of the index document in each directory.")]