Merge pull request #285759 from bwren/text-log-dce

Add DCE to text and json log collection

Author: prmerger-automator[bot]

articles/azure-monitor/agents/data-collection-log-json.md

@@ -2,7 +2,7 @@
 title: Collect logs from a JSON file with Azure Monitor Agent 
 description: Configure a data collection rule to collect log data from a JSON file on a virtual machine using Azure Monitor Agent.
 ms.topic: conceptual
-ms.date: 08/23/2024
+ms.date: 08/28/2024
 author: guywi-ms
 ms.author: guywild
 ms.reviewer: jeffwo
@@ -16,7 +16,7 @@ Many applications and services will log information to a JSON files instead of s
 ## Prerequisites
 
 - Log Analytics workspace where you have at least [contributor rights](../logs/manage-access.md#azure-rbac).
-- A data collection endpoint (DCE) if you plan to use Azure Monitor Private Links. The data collection endpoint must be in the same region as the Log Analytics workspace. See [How to set up data collection endpoints based on your deployment](../essentials/data-collection-endpoint-overview.md#how-to-set-up-data-collection-endpoints-based-on-your-deployment) for details.
+- A data collection endpoint (DCE) in the same region as the Log Analytics workspace. See [How to set up data collection endpoints based on your deployment](../essentials/data-collection-endpoint-overview.md#how-to-set-up-data-collection-endpoints-based-on-your-deployment) for details.
 - Either a new or existing DCR described in [Collect data with Azure Monitor Agent](./azure-monitor-agent-data-collection.md).
 
 ## Basic operation
@@ -133,6 +133,7 @@ Use the following ARM template to create a DCR for collecting text log files, ma
 | Setting | Description |
 |:---|:---|
 | Data collection rule name | Unique name for the DCR. |
+| Data collection endpoint resource ID | Resource ID of the data collection endpoint (DCE). |
 | Location | Region for the DCR. Must be the same location as the Log Analytics workspace. |
 | File patterns | Identifies the location and name of log files on the local disk. Use a wildcard for filenames that vary, for example when a new file is created each day with a new name. You can enter multiple file patterns separated by commas (AMA version 1.26 or higher required for multiple file patterns on Linux).<br><br>Examples:<br>- C:\Logs\MyLog.json<br>- C:\Logs\MyLog*.json<br>- C:\App01\AppLog.json, C:\App02\AppLog.json<br>- /var/mylog.json<br>- /var/mylog*.json |
 | Table name | Name of the destination table in your Log Analytics Workspace. |     
@@ -152,6 +153,12 @@ Use the following ARM template to create a DCR for collecting text log files, ma
                 "description": "Unique name for the DCR. "
             }
         },
+        "dataCollectionEndpointResourceId": {
+            "type": "string",
+            "metadata": {
+              "description": "Resource ID of the data collection endpoint (DCE)."
+            }
+        },
         "location": {
             "type": "string",
             "metadata": {
@@ -175,12 +182,6 @@ Use the following ARM template to create a DCR for collecting text log files, ma
             "metadata": {
                 "description": "Resource ID of the Log Analytics workspace with the target table."
             }
-        },
-        "dataCollectionEndpointResourceId": {
-            "type": "string",
-            "metadata": {
-                "description": "Resource ID of the Data Collection Endpoint to be used with this rule."
-            }
         }
     },
     "variables": {
@@ -193,6 +194,7 @@ Use the following ARM template to create a DCR for collecting text log files, ma
             "name": "[parameters('dataCollectionRuleName')]",
             "location": "[parameters('location')]",
             "properties": {
+                "dataCollectionEndpointId": "[parameters('dataCollectionEndpointResourceId')]",
                 "streamDeclarations": {
                     "Custom-Json-stream": {
                         "columns": [
@@ -256,8 +258,7 @@ Use the following ARM template to create a DCR for collecting text log files, ma
                         "transformKql": "source",
                         "outputStream": "[variables('tableOutputStream')]"
                     }
-                ],
-                "dataCollectionEndpointId": "[parameters('dataCollectionEndpointResourceId')]"
+                ]
             }
         }
     ]

articles/azure-monitor/agents/data-collection-log-text.md

@@ -2,7 +2,7 @@
 title: Collect logs from a text file with Azure Monitor Agent 
 description: Configure a data collection rule to collect log data from a text file on a virtual machine using Azure Monitor Agent.
 ms.topic: conceptual
-ms.date: 08/23/2024
+ms.date: 08/28/2024
 author: guywi-ms
 ms.author: guywild
 ms.reviewer: jeffwo
@@ -16,7 +16,7 @@ Many applications and services will log information to text files instead of sta
 ## Prerequisites
 
 - Log Analytics workspace where you have at least [contributor rights](../logs/manage-access.md#azure-rbac).
-- A data collection endpoint (DCE) if you plan to use Azure Monitor Private Links. The data collection endpoint must be in the same region as the Log Analytics workspace. See [How to set up data collection endpoints based on your deployment](../essentials/data-collection-endpoint-overview.md#how-to-set-up-data-collection-endpoints-based-on-your-deployment) for details.
+- A data collection endpoint (DCE) in the same region as the Log Analytics workspace. See [How to set up data collection endpoints based on your deployment](../essentials/data-collection-endpoint-overview.md#how-to-set-up-data-collection-endpoints-based-on-your-deployment) for details.
 - Either a new or existing DCR described in [Collect data with Azure Monitor Agent](./azure-monitor-agent-data-collection.md).
 
 ## Basic operation
@@ -143,6 +143,12 @@ Use the following ARM template to create or modify a DCR for collecting text log
               "description": "Unique name for the DCR. "
             }
         },
+        "dataCollectionEndpointResourceId": {
+            "type": "string",
+            "metadata": {
+              "description": "Resource ID of the data collection endpoint (DCE)."
+            }
+        },
         "location": {
             "type": "string",
             "metadata": {
@@ -178,6 +184,7 @@ Use the following ARM template to create or modify a DCR for collecting text log
             "location": "[parameters('location')]",
             "apiVersion": "2022-06-01",
             "properties": {
+                "dataCollectionEndpointId": "[parameters('dataCollectionEndpointResourceId')]",
                 "streamDeclarations": {
                     "Custom-Text-stream": {
                         "columns": [