Merge pull request #184976 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: v-ccolin

.openpublishing.redirection.json

@@ -16129,8 +16129,13 @@
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-add-artifact-repo.md",
-      "redirect_url": "/azure/devtest-labs/devtest-lab-add-artifact-repo",
-      "redirect_document_id": true
+      "redirect_url": "/azure/devtest-labs/add-artifact-repository",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/devtest-lab-add-artifact-repo.md",
+      "redirect_url": "/azure/devtest-labs/add-artifact-repository",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-add-claimable-vm.md",

articles/active-directory-b2c/identity-provider-generic-saml-options.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 08/25/2021
+ms.date: 01/13/2022
 ms.custom: project-no-code
 ms.author: kengaderdus
 ms.subservice: B2C
@@ -242,6 +242,29 @@ The following example shows the `ForceAuthN` property in an authorization reques
 </samlp:AuthnRequest>
 ```
 
+### Provider name
+
+You can optionally include the `ProviderName` attribute in the SAML authorization request. Set the metadata item as shown below to include the provider name for all requests to the external SAML IDP. The following example shows the `ProviderName` property set to `Contoso app`:
+
+```xml
+<Metadata>
+  ...
+  <Item Key="ProviderName">Contoso app</Item>
+  ...
+</Metadata>
+```
+
+The following example shows the `ProviderName` property in an authorization request:
+
+
+```xml
+<samlp:AuthnRequest AssertionConsumerServiceURL="https://..."  ...
+                    ProviderName="Contoso app">
+  ...
+</samlp:AuthnRequest>
+```
+
+
 ### Include authentication context class references
 
 A SAML authorization request may contain a **AuthnContext** element, which specifies the context of an authorization request. The element can contain an authentication context class reference, which tells the SAML identity provider which authentication mechanism to present to the user.

articles/aks/concepts-clusters-workloads.md

@@ -68,7 +68,7 @@ To run your applications and supporting services, you need a Kubernetes *node*.
 
 | Component | Description |  
 | ----------------- | ------------- |  
-| `kubelet` | The Kubernetes agent that processes the orchestration requests from the control plane and scheduling of running the requested containers. |  
+| `kubelet` | The Kubernetes agent that processes the orchestration requests from the control plane along with scheduling and running the requested containers. |  
 | *kube-proxy* | Handles virtual networking on each node. The proxy routes network traffic and manages IP addressing for services and pods. |  
 | *container runtime* | Allows containerized applications to run and interact with additional resources, such as the virtual network and storage. AKS clusters using Kubernetes version 1.19+ for Linux node pools use `containerd` as their container runtime. Beginning in Kubernetes version 1.20 for Windows node pools, `containerd` can be used in preview for the container runtime, but Docker is still the default container runtime. AKS clusters using prior versions of Kubernetes for node pools use Docker as their container runtime. |  
 

articles/app-service/environment/firewall-integration.md

@@ -4,7 +4,7 @@ description: Learn how to integrate with Azure Firewall to secure outbound traff
 author: madsd
 ms.assetid: 955a4d84-94ca-418d-aa79-b57a5eb8cb85
 ms.topic: article
-ms.date: 01/05/2022
+ms.date: 01/12/2022
 ms.author: madsd
 ms.custom: seodec18, references_regions
 
@@ -245,7 +245,7 @@ With an Azure Firewall, you automatically get everything below configured with t
 | \*.ctldl.windowsupdate.com:443 |
 | \*.prod.microsoftmetrics.com:443 |
 | \*.dsms.core.windows.net:443 |
-| \*.prod.warm.ingest.monitor.core.windows.net |
+| \*.prod.warm.ingest.monitor.core.windows.net:443 |
 
 ### Linux dependencies
 
@@ -446,7 +446,7 @@ Linux is not available in US Gov regions and is thus not listed as an optional c
 |\*.management.usgovcloudapi.net:443 |
 |\*.update.microsoft.com:443 |
 |\*.prod.microsoftmetrics.com:443 |
-| \*.prod.warm.ingest.monitor.core.usgovcloudapi.net |
+| \*.prod.warm.ingest.monitor.core.usgovcloudapi.net:443 |
 
 <!--Image references-->
 [1]: ./media/firewall-integration/firewall-apprule.png

articles/automation/automation-windows-hrw-install.md

@@ -80,6 +80,7 @@ To install and configure a Windows user Hybrid Runbook Worker, you can use one o
 
 * Use a provided PowerShell script to completely [automate](#automated-deployment) the process of configuring one or more Windows machines. This is the recommended method for machines in your datacenter or another cloud environment.
 * Manually import the Automation solution, install the Log Analytics agent for Windows, and configure the worker role on the machine.
+* Agent-based hybrid worker uses MMA proxy setting. You have to pass the proxy setting while installing the log analytics extension(MMA) and this setting will be stored under MMA configuration(registry) on VM.
 
 ## Automated deployment
 

articles/automation/extension-based-hybrid-runbook-worker-install.md

@@ -61,6 +61,36 @@ After you successfully deploy a runbook worker, review [Run runbooks on a Hybrid
 
 If you use a proxy server for communication between Azure Automation and machines running the extension-base Hybrid Runbook Worker, ensure that the appropriate resources are accessible. The timeout for requests from the Hybrid Runbook Worker and Automation services is 30 seconds. After three attempts, a request fails.
 
+> [!NOTE]
+> You can set up the proxy settings either by PowerShell cmdlets or API.
+
+**Proxy server settings**
+# [Windows](#tab/windows) 
+ 
+```azurepowershell
+$settings = @{
+    "AutomationAccountURL"  = "<registrationurl>/<subscription-id>";    
+    "ProxySettings" = @{
+        "ProxyServer" = "<ipaddress>:<port>";
+        "UserName"="test";
+    }
+};
+$protectedsettings = @{
+"ProxyPassword" = "password";
+};
+```
+
+# [Linux](#tab/linux)
+```
+$protectedsettings = @{
+      "Proxy_URL"="http://username:password@<IP Address>"
+};
+$settings = @{
+    "AutomationAccountURL"  = "<registration-url>/<subscription-id>";    
+};
+```
+---
+
 ### Firewall use
 
 If you use a firewall to restrict access to the Internet, you must configure the firewall to permit access. The following port and URLs are required for the Hybrid Runbook Worker, and for [Automation State Configuration](./automation-dsc-overview.md) to communicate with Azure Automation.

articles/automation/state-configuration/remove-node-and-configuration-package.md

@@ -10,15 +10,16 @@ ms.topic: how-to
 
 # How to remove a configuration and node from Automation State Configuration
 
-This article covers how to unregister a node managed by Automation State Configuration, and safely remove a PowerShell Desired State Configuration (DSC) configuration from managed nodes. For both Windows and Linux nodes, you need to [unregister the node](#unregister-a-node) and [delete the configuration](#delete-a-configuration-from-the-azure-portal). For Linux nodes only, you can optionally delete the DSC packages from the nodes as well. See [Remove the DSC package from a Linux node](#remove-the-dsc-package-from-a-linux-node).
+This article covers how to unregister a node managed by Automation State Configuration, and safely remove a PowerShell Desired State Configuration (DSC) configuration from managed nodes. For both Windows and Linux nodes, you need to [unregister the node](#unregister-a-node) and [Delete a configuration from the node](#delete-a-configuration-from-the-node). For Linux nodes only, you can optionally delete the DSC packages from the nodes as well. See [Remove the DSC package from a Linux node](#remove-the-dsc-package-from-a-linux-node).
 
 ## Unregister a node
 
-If you no longer want a node to be managed by State Configuration (DSC), you can unregister it from the Azure portal or with Azure PowerShell using the following steps.
+>[!NOTE]
+> Unregistering a node from the service only sets the Local Configuration Manager settings so the node is no longer connecting to the service. This does not effect the configuration that's currently applied to the node, and leaves the related files in place on the node. After you unregister/delete the node, to re-register it, clear the existing configuration files. See [Delete a configuration from the node](#delete-a-configuration-from-the-node).
 
-Unregistering a node from the service only sets the Local Configuration Manager settings so the node is no longer connecting to the service. This does not effect the configuration that's currently applied to the node, and leaves the related files in place on the node. You can optionally clean up those files. See [Delete a configuration](#delete-a-configuration).
+If you no longer want a node to be managed by State Configuration (DSC), you can unregister it from the Azure portal or with Azure PowerShell using the following steps.
 
-### Unregister in the Azure portal
+ # [Azure portal](#tab/azureportal)
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. Search for and select **Automation Accounts**.
@@ -30,18 +31,21 @@ Unregistering a node from the service only sets the Local Configuration Manager
 
    :::image type="content" source="./media/remove-node-and-configuration-package/unregister-node.png" alt-text="Screenshot of the Node details page highlighting the Unregister button." lightbox="./media/remove-node-and-configuration-package/unregister-node.png":::
 
-### Unregister using PowerShell
+# [Azure PowerShell](#tab/powershell)
 
 You can also unregister a node using the PowerShell cmdlet [Unregister-AzAutomationDscNode](/powershell/module/az.automation/unregister-azautomationdscnode).
 
 >[!NOTE]
->If your organization still uses the deprecated AzureRM modules, you can use [Unregister-AzureRmAutomationDscNode](/powershell/module/azurerm.automation/unregister-azurermautomationdscnode).
+> If your organization still uses the deprecated AzureRM modules, you can use [Unregister-AzureRmAutomationDscNode](/powershell/module/azurerm.automation/unregister-azurermautomationdscnode).
+
+---
+
 
-## Delete a configuration
+## Delete a configuration from the node
 
-When you're ready to remove an imported DSC configuration document (which is a Managed Object Format (MOF) or .mof file) that's assigned to one or more nodes, follow these steps.
+When you're ready to remove an imported DSC configuration document (which is a Managed Object Format (MOF) or .mof file) that's assigned to one or more nodes, follow either of these steps.
 
-### Delete a configuration from the Azure portal
+# [Azure portal](#tab/delete-azureportal)
 
 You can delete configurations for both Windows and Linux nodes from the Azure portal.
 
@@ -57,18 +61,25 @@ You can delete configurations for both Windows and Linux nodes from the Azure po
 
    :::image type="content" source="./media/remove-node-and-configuration-package/delete-extension.png" alt-text="Screenshot of deleting an extension." lightbox="./media/remove-node-and-configuration-package/delete-extension.png":::
 
-## Manually delete a configuration file from a node
+# [Manual Deletion](#tab/manual-delete-azureportal)
 
-If you don't want to use the Azure portal, you can manually delete the .mof configuration files as follows.
+To manually delete the .mof configuration files, follow the steps:
 
-### Delete a Windows configuration using PowerShell
+**Delete a Windows configuration using PowerShell**
 
 To remove an imported DSC configuration document (.mof), use the [Remove-DscConfigurationDocument](/powershell/module/psdesiredstateconfiguration/remove-dscconfigurationdocument) cmdlet.
 
-### Delete a Linux configuration
+**Delete a Linux configuration**
 
 The configuration files are stored in /etc/opt/omi/conf/dsc/configuration/. Remove the .mof files in this directory to delete the node's configuration.
 
+
+---
+
+## Re-register a node
+You can re-register a node just as you registered the node initially, using any of the methods described in [Enable Azure Automation State Configuration](/azure/automation/automation-dsc-onboarding)
+
+
 ## Remove the DSC package from a Linux node
 
 This step is optional. Unregistering a Linux node from State Configuration (DSC) doesn't remove the DSC and OMI packages from the machine. Use the commands below to remove the packages as well as all logs and related data.

articles/azure-functions/functions-bindings-rabbitmq-trigger.md

@@ -231,7 +231,7 @@ The default message type is [RabbitMQ Event](https://rabbitmq.github.io/rabbitmq
 * `An object serializable as JSON` - The message is delivered as a valid JSON string.
 * `string`
 * `byte[]`
-* `POCO` - The message is formatted as a C# object. For a complete example, see C# [example](#example).
+* `POCO` - The message is formatted as a C# object. For complete code, see C# [example](#example).
 
 # [C# Script](#tab/csharp-script)
 

articles/azure-resource-manager/bicep/template-specs.md

@@ -2,7 +2,7 @@
 title: Create & deploy template specs in Bicep
 description: Describes how to create template specs in Bicep and share them with other users in your organization.
 ms.topic: conceptual
-ms.date: 01/07/2022
+ms.date: 01/12/2022
 ---
 
 # Azure Resource Manager template specs in Bicep
@@ -145,6 +145,12 @@ The JSON template embedded in the Bicep file needs to make these changes:
 * To access the parameters and variables defined in the Bicep file, you can directly use the parameter names and the variable names. To access the parameters and variables defined in `mainTemplate`, you still need to use the ARM JSON template syntax.  For example, **'name': '[parameters(\'storageAccountType\')]'**.
 * Use the Bicep syntax to call Bicep functions.  For example, **'location': resourceGroup().location**.
 
+The size of a template spec is limited to approximated 2 MB. If a template spec size exceeds the limit, you will get the **TemplateSpecTooLarge** error code. The error message says:
+
+```error
+The size of the template spec content exceeds the maximum limit. For large template specs with many artifacts, the recommended course of action is to split it into multiple template specs and reference them modularly via TemplateLinks.
+```
+
 You can view all template specs in your subscription by using:
 
 # [PowerShell](#tab/azure-powershell)

articles/azure-resource-manager/templates/template-specs.md

@@ -2,7 +2,7 @@
 title: Create & deploy template specs
 description: Describes how to create template specs and share them with other users in your organization.
 ms.topic: conceptual
-ms.date: 01/07/2022
+ms.date: 01/12/2022
 ms.custom: devx-track-azurepowershell
 ---
 
@@ -170,6 +170,12 @@ You can also create template specs by using ARM templates. The following templat
 }
 ```
 
+The size of a template spec is limited to approximated 2 MB. If a template spec size exceeds the limit, you will get the **TemplateSpecTooLarge** error code. The error message says:
+
+```error
+The size of the template spec content exceeds the maximum limit. For large template specs with many artifacts, the recommended course of action is to split it into multiple template specs and reference them modularly via TemplateLinks.
+```
+
 You can view all template specs in your subscription by using:
 
 # [PowerShell](#tab/azure-powershell)