resolve merge conflict

Author: ktoliver

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

@@ -2,7 +2,7 @@
 title: Troubleshoot extension-based Hybrid Runbook Worker issues in Azure Automation 
 description: This article tells how to troubleshoot and resolve issues that arise with Azure Automation extension-based Hybrid Runbook Workers.
 services: automation
-ms.date: 01/03/2024
+ms.date: 08/26/2024
 ms.topic: troubleshooting 
 ms.custom:
 ---
@@ -73,34 +73,6 @@ To help troubleshoot issues with extension-based Hybrid Runbook Workers:
     /home/hweautomation
     ```
 
-
-### Unable to update Az modules while using the Hybrid Worker
-
-#### Issue
-
-The Hybrid Runbook Worker jobs failed as it was unable to import Az modules.
-
-#### Resolution
-
-As a workaround, you can follow these steps:
-
-1. Navigate to the folder:
-   > [!TIP] 
-   > Replace `*` in the below path with the specific version that is installed if you know it.
-   ```
-   C:\Program Files\Microsoft Monitoring Agent\Agent\AzureAutomation\*\HybridAgent
-   ```
-
-1. Edit the file with the name `Orchestrator.Sandbox.exe.config`
-
-1. Add the following lines inside the `<assemblyBinding>` tag:
-```xml
-<dependentAssembly>
-  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-  <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
-</dependentAssembly>
-```
-
 ### Scenario: Runbooks go into a suspended state on a Hybrid Runbook Worker when using a custom account on a server with User Account Control (UAC) enabled
 
 #### Issue
@@ -411,38 +383,6 @@ This error occurs when you attempt to use a Run As account in a runbook that run
 If your Hybrid Runbook Worker is an Azure VM, you can use [runbook authentication with managed identities](../automation-hrw-run-runbooks.md#runbook-auth-managed-identities) instead. This scenario simplifies authentication by allowing you to authenticate to Azure resources using the managed identity of the Azure VM instead of the Run As account. When the Hybrid Runbook Worker is an on-premises machine, you need to install the Run As account certificate on the machine. To learn how to install the certificate, see the steps to run the PowerShell runbook **Export-RunAsCertificateToHybridWorker** in [Run runbooks on a Hybrid Runbook Worker](../automation-hrw-run-runbooks.md).
 
 
-### Scenario: Set-AzStorageBlobContent fails on a Hybrid Runbook Worker 
-
-#### Issue
-
-Runbook fails when it tries to execute `Set-AzStorageBlobContent`, and you receive the following error message:
-
-`Set-AzStorageBlobContent : Failed to open file xxxxxxxxxxxxxxxx: Illegal characters in path`
-
-#### Cause
-
- This error is caused by the long file name behavior of calls to `[System.IO.Path]::GetFullPath()`, which adds UNC paths.
-
-#### Resolution
-
-As a workaround, you can create a configuration file named `OrchestratorSandbox.exe.config` with the following content:
-
-```azurecli
-<configuration>
-  <runtime>
-    <AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false" />
-  </runtime>
-</configuration>
-```
-
-Place this file in the same folder as the executable file `OrchestratorSandbox.exe`. For example:
-> [!TIP] 
-> Replace `*` in the below path with the specific version that is installed if you know it.
-```
-%ProgramFiles%\Microsoft Monitoring Agent\Agent\AzureAutomation\*\HybridAgent
-```
-
-
 ### Scenario: Microsoft Azure VMs automatically dropped from a hybrid worker group
 
 #### Issue

articles/azure-app-configuration/concept-feature-management.md

@@ -13,7 +13,7 @@ ms.date: 02/20/2024
 
 Traditionally, shipping a new application feature requires a complete redeployment of the application itself. Testing a feature often requires multiple deployments of the application. Each deployment might change the feature or expose the feature to different customers for testing.  
 
-Feature management is a modern software-development practice that decouples feature release from code deployment and enables quick changes to feature availability on demand. It uses a technique called *feature flags* (also known as *feature toggles* and *feature switches*) to dynamically administer a feature's lifecycle.
+Feature management is a software-development practice that decouples feature release from code deployment and enables quick changes to feature availability on demand. It uses a technique called *feature flags* (also known as *feature toggles* and *feature switches*) to dynamically administer a feature's lifecycle.
 
 Feature management helps developers address the following problems:
 

articles/azure-monitor/agents/azure-monitor-agent-migration-data-collection-rule-generator.md

@@ -73,6 +73,8 @@ To run script, copy the following command and replace the parameters with your v
 
 For information on deploying the DCRs, see [Data collection rules in Azure Monitor](/azure/azure-monitor/essentials/data-collection-rule-overview) and [Create and edit data collection rules (DCRs) in Azure Monitor](/azure/azure-monitor/essentials/data-collection-rule-create-edit)
 
+> [!Warning]
+> You shouldn’t use an existing custom log table used by MMA agents. Your MMA agents won't be able to write to the table once the first AMA agent writes to the table. You should create a new table for AMA to use to prevent MMA data loss.
 
 ## Next steps
 

articles/azure-monitor/logs/manage-table-access.md

@@ -90,7 +90,7 @@ The user can now read workspace details and run a query, but can't read data fro
 1. From the **Log Analytics workspaces** menu, select **Tables**.  
 1. Select the ellipsis ( **...** ) to the right of your table and select **Access control (IAM)**.
 
-   :::image type="content" source="media/manage-access/table-level-access-control.png" alt-text="Screenshot that shows the Log Analytics workspace table management screen with the table-level access control button highlighted." lightbox="media/manage-access/manage-access-create-custom-role-json.png":::      
+   :::image type="content" source="media/manage-access/table-level-access-control.png" alt-text="Screenshot that shows the Log Analytics workspace table management screen with the table-level access control button highlighted." lightbox="media/manage-access/table-level-access-control.png":::      
 
 1. On the **Access control (IAM)** screen, select **Add** > **Add role assignment**. 
 1. Select the **Reader** role and select **Next**.    

articles/azure-monitor/vm/monitor-virtual-machine.md

@@ -44,8 +44,8 @@ The following table lists the different steps for configuration of VM monitoring
 | Step | Description |
 |:---|:---|
 | [Deploy Azure Monitor agent](monitor-virtual-machine-agent.md) | Deploy the Azure Monitor agent to your Azure and hybrid virtual machines to collect data from the guest operating system and workloads. |
-| [Configure data collection](monitor-virtual-machine-data-collection.md)) | Create data collection rules to instruct the Azure Monitor agent to collect telemetry from the guest operating system. |
-| [Analyze collect data](monitor-virtual-machine-analyze.md) | Analyze monitoring data collected by Azure Monitor from virtual machines and their guest operating systems and applications to identify trends and critical information. |
+| [Configure data collection](monitor-virtual-machine-data-collection.md) | Create data collection rules to instruct the Azure Monitor agent to collect telemetry from the guest operating system. |
+| [Analyze collected data](monitor-virtual-machine-analyze.md) | Analyze monitoring data collected by Azure Monitor from virtual machines and their guest operating systems and applications to identify trends and critical information. |
 | [Create alert rules](monitor-virtual-machine-alerts.md) | Create alerts to proactively identify critical issues in your monitoring data. |
 | [Migrate management pack logic](monitor-virtual-machine-management-packs.md) | General guidance for translation the logic from your System Center Operations Manager management packs to Azure Monitor. |
 
@@ -90,4 +90,4 @@ See [Design a Log Analytics workspace architecture](../logs/workspace-design.md)
 
 ## Next steps
 
-[Deploy the Azure Monitor agent to your virtual machines](monitor-virtual-machine-agent.md)
+[Deploy the Azure Monitor agent to your virtual machines](monitor-virtual-machine-agent.md)

articles/azure-netapp-files/manage-cool-access.md

@@ -28,7 +28,7 @@ The storage with cool access feature provides options for the “coolness period
 * You can't use [large volume](large-volumes-requirements-considerations.md) with cool access.
 * See [Resource limits for Azure NetApp Files](azure-netapp-files-resource-limits.md#resource-limits) for maximum number of volumes supported for cool access per subscription per region.
 * Considerations for using cool access with [cross-region replication](cross-region-replication-requirements-considerations.md) and [cross-zone replication](cross-zone-replication-introduction.md): 
-    * The cool access setting on the destination is updated automatically to match the source volume whenever the setting is changed on the source volume or during authorizing or performing a reverse resync of the replication. Changes to the cool access setting on the destination volume don't affect the setting on the source volume.
+    * The cool access setting on the destination volume is updated automatically to match the source volume whenever the setting is changed on the source volume or during authorizing or performing a reverse resync of the replication  only if the destination volume is in a cool access-enabled capacity pool. Changes to the cool access setting on the destination volume don't affect the setting on the source volume.
     * In cross-region or cross-zone replication configuration, you can enable cool access exclusively for destination volumes to enhance data protection and create cost savings without affecting latency in source volumes.
 * Considerations for using cool access with [snapshot restore](snapshots-restore-new-volume.md):
     * When restoring a snapshot of a cool access enabled volume to a new volume, the new volume inherits the cool access configuration from the parent volume. Once the new volume is created, the cool access settings can be modified.  

articles/azure-signalr/concept-connection-string.md

@@ -4,7 +4,7 @@ description: This article gives an overview of connection strings in Azure Signa
 author: chenkennt
 ms.service: azure-signalr-service
 ms.topic: conceptual
-ms.date: 03/29/2023
+ms.date: 08/09/2024
 ms.author: kenchen
 ---
 

articles/azure-web-pubsub/howto-disable-local-auth.md

@@ -11,7 +11,12 @@ ms.topic: conceptual
 
 # Turn off local (access key) authentication
 
-Azure Web PubSub resources can authenticate requests in two ways: via a Microsoft Entra ID or via an access key. Microsoft Entra ID provides superior security and ease of use over an access key. If you use Microsoft Entra ID, you don't need to store the tokens in your code and risk potential security vulnerabilities. We recommend that you use Microsoft Entra ID for your Web PubSub resources when possible.
+Azure Web PubSub resources can authenticate requests in two ways:
+
+- Microsoft Entra ID (recommended)
+- Access key
+
+Microsoft Entra ID provides superior security and ease of use over an access key. If you use Microsoft Entra ID, you don't need to store the tokens in your code and risk potential security vulnerabilities. We recommend that you use Microsoft Entra ID for your Web PubSub resources when possible.
 
 > [!IMPORTANT]
 > Disabling local authentication might have the following results:
@@ -40,9 +45,9 @@ To turn off local authentication by using the Azure portal:
 
 1. Select **Save**.
 
-![Screenshot that shows turning off local authentication.](./media/howto-disable-local-auth/disable-local-auth.png)
+:::image type="content" source="media/howto-disable-local-auth/disable-local-auth.png" alt-text="Screenshot that shows turning off local authentication.":::
 
-### Use an Azure Resource Manager template
+### Azure Resource Manager template
 
 You can turn off local authentication by setting the `disableLocalAuth` property to `true` as shown in the following Azure Resource Manager template:
 
@@ -96,9 +101,9 @@ You can turn off local authentication by setting the `disableLocalAuth` property
 
 ### Azure Policy
 
-You can assign the policy [Azure Web PubSub Service should have local authentication methods disabled](https://ms.portal.azure.com/#view/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2Fb66ab71c-582d-4330-adfd-ac162e78691e) in Azure Policy to an Azure subscription or to a resource group to turn off local authentication for all Web PubSub resources in the subscription or resource group.
+You can assign the policy [Azure Web PubSub Service should have local authentication methods disabled](https://ms.portal.azure.com/#view/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2Fb66ab71c-582d-4330-adfd-ac162e78691e) in Azure Policy to an Azure subscription or to a resource group. Assigning this policy turns off local authentication for all Web PubSub resources in the subscription or resource group.
 
-![Screenshot that shows turning off local authentication policy.](./media/howto-disable-local-auth/disable-local-auth-policy.png)
+:::image type="content" source="media/howto-disable-local-auth/disable-local-auth-policy.png" alt-text="Screenshot that shows turning off local authentication policy.":::
 
 ## Related content
 

articles/cost-management-billing/manage/change-azure-account-profile.yml

@@ -6,7 +6,7 @@ metadata:
   author: bandersmsft
   ms.author: banders
   ms.reviewer: judupont
-  ms.date: 08/19/2024
+  ms.date: 08/27/2024
   ms.service: cost-management-billing
   ms.subservice: billing
   ms.topic: how-to
@@ -91,7 +91,7 @@ procedureSection:
   - title: |
       Add a PO number
     summary: |
-      By default, invoices for the billing profile don't have an associated PO number. After you add a PO number for a billing profile, the system regenerates the invoices within 24 hours. Afterward, the PO number appears on invoices for the billing profile.
+      By default, invoices for the billing profile don't have an associated PO number. After you add a PO number for a billing profile, the system uses the updated PO number in the next invoice. Afterward, the PO number appears in invoices for the billing profile.
       
       To add a PO number for a billing profile, use the following steps.
     steps:

articles/ddos-protection/ddos-protection-features.md

@@ -21,7 +21,7 @@ Azure DDoS Protection monitors actual traffic utilization and constantly compare
 During mitigation, traffic sent to the protected resource is redirected by the DDoS protection service and several checks are performed, such as:
 
 - Ensure packets conform to internet specifications and aren't malformed.
-- Interact with the client to determine if the traffic is potentially a spoofed packet (e.g: SYN Auth or SYN Cookie or by dropping a packet for the source to retransmit it).
+- Interact with the client to determine if the traffic is potentially a spoofed packet (for example: SYN Auth or SYN Cookie or by dropping a packet for the source to retransmit it).
 - Rate-limit packets, if no other enforcement method can be performed.
 
 Azure DDoS Protection drops attack traffic and forwards the remaining traffic to its intended destination. Within a few minutes of attack detection, you're notified using Azure Monitor metrics. By configuring logging on DDoS Protection telemetry, you can write the logs to available options for future analysis. Metric data in Azure Monitor for DDoS Protection is retained for 30 days.