Merge pull request #134 from MicrosoftDocs/main

Publish to live, Sunday 4 AM PST, 9/22

articles/azure-monitor/agents/azure-monitor-agent-manage.md

@@ -358,23 +358,23 @@ N/A
 
 ## Configure (Preview)
 
-[Data Collection Rules (DCRs)](../essentials/data-collection-rule-overview.md) serve as a management tool for Azure Monitor Agent (AMA) on your machine. The AgentSettings DCR can be used to configure AMA parameters like `DisQuotaInMb`, ensuring your agent is tailored to your specific monitoring needs.
+[Data Collection Rules (DCRs)](../essentials/data-collection-rule-overview.md) serve as a management tool for Azure Monitor Agent (AMA) on your machine. The `AgentSettings` DCR can be used to configure certain AMA parameters to configure the agent to your specific monitoring needs.
 
 > [!NOTE]
-> Important considerations to keep in mind when working with the AgentSettings DCR:
+> Important considerations to keep in mind when working with the `AgentSettings` DCR:
 >
-> * The AgentSettings DCR can only be configured via template deployment.
-> * AgentSettings is always it's own DCR and can't be added an existing one.
-> * For proper functionality, both the machine and the AgentSettings DCR must be located in the same region.
+> * The `AgentSettings` DCR can currently only be configured using ARM templates.
+> * `AgentSettings` must be a single DCR with no other settings.
+> * The virtual machine and the `AgentSettings` DCR must be located in the same region.
 
 ### Supported parameters
 
 The AgentSettings DCR currently supports configuring the following parameters:
 
 | Parameter | Description | Valid values |
 | --------- | ----------- | ----------- |
-| `MaxDiskQuotaInMB` | Defines the amount of disk space used by the Azure Monitor Agent log files and cache. | 1000-50000 (in MB) |
-| `TimeReceivedForForwardedEvents` | Changes WEF column in the Sentinel WEF table to use TimeReceived instead of TimeGenerated data | 0 or 1 |
+| `MaxDiskQuotaInMB` | Defines the amount of disk space used (in MB) by the Azure Monitor Agent log files and cache. | Linux: 1025-51199<br>Windows: 4000-51199 |
+| `UseTimeReceivedForForwardedEvents` | Changes WEF column in the Sentinel WEF table to use TimeReceived instead of TimeGenerated data | 0 or 1 |
 
 ### Setting up AgentSettings DCR
 
@@ -384,11 +384,11 @@ Currently not supported.
 
 #### [PowerShell](#tab/azure-powershell)
 
-N/A
+Currently not supported.
 
 #### [Azure CLI](#tab/azure-cli)
 
-N/A
+Currently not supported.
 
 #### [Resource Manager template](#tab/azure-resource-manager)
 
@@ -447,12 +447,6 @@ N/A
             "description": "The name of the virtual machine."
           }
         },
-        "associationName": {
-          "type": "string",
-          "metadata": {
-            "description": "The name of the association."
-          }
-        },
         "dataCollectionRuleId": {
           "type": "string",
           "metadata": {
@@ -465,7 +459,7 @@ N/A
           "type": "Microsoft.Insights/dataCollectionRuleAssociations",
           "apiVersion": "2021-09-01-preview",
           "scope": "[format('Microsoft.Compute/virtualMachines/{0}', parameters('vmName'))]",
-          "name": "[parameters('associationName')]",
+          "name": "agentSettings",
           "properties": {
             "description": "Association of data collection rule. Deleting this association will break the data collection for this virtual machine.",
             "dataCollectionRuleId": "[parameters('dataCollectionRuleId')]"
@@ -485,9 +479,6 @@ N/A
         "vmName": {
           "value": "my-azure-vm"
         },
-        "associationName": {
-          "value": "my-windows-vm-my-dcr"
-        },
         "dataCollectionRuleId": {
           "value": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/my-resource-group/providers/microsoft.insights/datacollectionrules/my-dcr"
         }

articles/azure-monitor/containers/container-insights-authentication.md

@@ -1,5 +1,5 @@
 ---
-title: Configure agent authentication for the Container Insights agent
+title: Legacy authentication for Container Insights 
 description: This article describes how to configure authentication for the containerized agent used by Container insights.
 ms.topic: conceptual
 ms.custom: devx-track-azurecli
@@ -81,8 +81,9 @@ AKS clusters must first disable monitoring and then upgrade to managed identity.
 ---
 
 
-## Timeline  
-Any new clusters being created or being onboarded now default to Managed Identity authentication. However, existing clusters with legacy solution-based authentication are still supported.  
+## Enable legacy authentication
+If you require legacy authentication, see [Enable Container insights](kubernetes-monitoring-enable.md#enable-container-insights) which has examples of different options for enabling Container insights.
+
 
 ## Next steps
 If you experience issues when you upgrade the agent, review the [troubleshooting guide](container-insights-troubleshoot.md) for support.

articles/azure-monitor/containers/kubernetes-monitoring-enable.md

@@ -365,6 +365,9 @@ az aks enable-addons --addon monitoring --name <cluster-name> --resource-group <
 
 ### Use existing Log Analytics workspace
 az aks enable-addons --addon monitoring --name <cluster-name> --resource-group <cluster-resource-group-name> --workspace-resource-id <workspace-resource-id>
+
+### Use legacy authentication
+az aks enable-addons --addon monitoring --name <cluster-name> --resource-group <cluster-resource-group-name> --workspace-resource-id <workspace-resource-id> --enable-msi-auth-for-monitoring false
 ```
 
 **Example**

articles/azure-monitor/essentials/data-collection-endpoint-overview.md

@@ -15,7 +15,7 @@ ms.reviwer: nikeist
 A data collection endpoint (DCE) is a connection where data sources send collected data for processing and ingestion into Azure Monitor. This article provides an overview of data collection endpoints and explains how to create and set them up based on your deployment.
 
 ## When is a DCE required?
-Prior to March 31, 2024, a DCE was required for all data collection scenarios using a DCR that required an endpoint. Any DCR created after this date includes its own endpoints for logs and metrics. The URL for these endpoints can be found in the [`logsIngestion` and `metricsIngestion`](./data-collection-rule-structure.md#endpoints) properties of the DCR. These endpoints can be used instead of a DCE for any direct ingestion scenarios.
+Prior to March 31, 2024, a DCE was required for all data collection scenarios using a DCR that required an endpoint. DCRs for supported scenarios created after this date include their own endpoints for logs and metrics. The URL for these endpoints can be found in the [`logsIngestion` and `metricsIngestion`](./data-collection-rule-structure.md#endpoints) properties of the DCR. These endpoints can be used instead of a DCE for any direct ingestion scenarios.
 
 Endpoints cannot be added to an existing DCR, but you can keep using any existing DCRs with existing DCEs. If you want to move to a DCR endpoint, then you must create a new DCR to replace the existing one. A DCR with endpoints can also use a DCE. In this case, you can choose whether to use the DCE or the DCR endpoints for each of the clients that use the DCR.