Merge pull request #291959 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: Taojunshen

articles/container-apps/opentelemetry-agents.md

@@ -21,7 +21,7 @@ This article shows you how to set up and configure an OpenTelemetry agent for yo
 
 ## Configure an OpenTelemetry agent
 
-OpenTelemetry agents live within your container app environment. You configure agent settings via an ARM template or Bicep calls to the environment, or through the CLI.
+OpenTelemetry agents live within your container app environment. You configure agent settings via an ARM template or Bicep calls to the environment, or through the CLI, or through Terraform (via the [AzAPI provider](https://registry.terraform.io/providers/Azure/azapi/latest/docs)).
 
 Each endpoint type (Azure Monitor Application Insights, DataDog, and OTLP) has specific configuration requirements.
 
@@ -53,7 +53,7 @@ The following table shows you what type of data you can send to each destination
 
 ## Azure Monitor Application Insights
 
-The only configuration detail required from Application Insights is the connection string. Once you have the connection string, you can configure the agent via your container app's ARM template or with Azure CLI commands.
+The only configuration detail required from Application Insights is the connection string. Once you have the connection string, you can configure the agent via your container app's ARM template, with Azure CLI commands or Terraform.
 
 The connection string contains an instrumentation key, which is a unique identifier used to associate telemetry to a specific Application Insights resource. Instrumentation keys aren't security tokens or security keys, and aren't considered secrets.
 
@@ -99,6 +99,38 @@ az containerapp env telemetry app-insights set \
 >[!NOTE]
 > Due to the sensitivity of the connection-string, you will not be able to see the detail values of the connection string when the command returns. The system will display it as null.
 
+# [Terraform](#tab/terraform)
+
+```hcl
+resource "azapi_update_resource" "app_insights_open_telemetry_integration" {
+  name      = azurerm_container_app_environment.managed_environment.name
+  parent_id = azurerm_resource_group.resource_group.id
+  type      = "Microsoft.App/managedEnvironments@2023-11-02-preview"
+  body = jsonencode({
+    properties = {
+      appInsightsConfiguration = {
+        connectionString = azurerm_application_insights.applicationinsights.connection_string
+      }
+      appLogsConfiguration = {
+        destination = "log-analytics"
+        logAnalyticsConfiguration = {
+          customerId = azurerm_log_analytics_workspace.workspace.workspace_id
+          sharedKey  = azurerm_log_analytics_workspace.workspace.primary_shared_key
+        }
+      }
+      openTelemetryConfiguration = {
+        tracesConfiguration = {
+          destinations = ["appInsights"]
+        }
+        logsConfiguration = {
+          destinations = ["appInsights"]
+        }
+      }
+    }
+  })
+}
+```
+
 ---
 
 ## Datadog
@@ -205,6 +237,34 @@ az containerapp env telemetry data-dog set \
 >[!NOTE]
 > Due to the sensitivity of the key, you will not be able to see the detail values of the key when the command returns. The system will display it as null. 
 
+# [Terraform](#tab/terraform)
+
+```hcl
+resource "azapi_update_resource" "app_insights_open_telemetry_integration" {
+  name      = azurerm_container_app_environment.managed_environment.name
+  parent_id = azurerm_resource_group.resource_group.id
+  type      = "Microsoft.App/managedEnvironments@2023-11-02-preview"
+  body = jsonencode({
+    properties = {
+      openTelemetryConfiguration = {
+        destinationsConfiguration = {
+          dataDogConfiguration = {
+            site = "<YOUR_DATADOG_SUBDOMAIN>.datadoghq.com"
+            key = "<YOUR_DATADOG_KEY>"
+          }
+        }
+        tracesConfiguration = {
+          destinations = ["dataDog"]
+        }
+        metricsConfiguration = {
+          destinations = ["dataDog"]
+        }
+      }
+    }
+  })
+}
+```
+
 ---
 
 ## OTLP endpoint
@@ -280,6 +340,53 @@ az containerapp env telemetry otlp add \
 >[!NOTE]
 > Due to the sensitivity of the headers value, you will not be able to see the detail values of the headers value when the command returns. The system will display them as null.
 
+# [Terraform](#tab/terraform)
+
+```hcl
+resource "azapi_update_resource" "app_insights_open_telemetry_integration" {
+  name      = azurerm_container_app_environment.managed_environment.name
+  parent_id = azurerm_resource_group.resource_group.id
+  type      = "Microsoft.App/managedEnvironments@2023-11-02-preview"
+  body = jsonencode({
+    properties = {
+      openTelemetryConfiguration = {
+        destinationsConfiguration = {
+          otlpConfigurations = [
+            {
+              name = "otlp1"
+              endpoint = "ENDPOINT_URL_1"
+              insecure = false
+              headers = "api-key-1=key"
+            },
+            {
+              name = "otlp2"
+              endpoint = "ENDPOINT_URL_2"
+              insecure = true
+            }
+          ]
+        }
+        logsConfiguration = { 
+          destinations = [
+            "otlp2"
+          ]
+        },
+        tracesConfiguration = {
+          destinations = [
+            "otlp1",
+            "otlp2"
+          ]
+        },
+        metricsConfiguration = {
+          destinations = [
+            "otlp1"
+          ]
+        }
+      }
+    }
+  })
+}
+```
+
 ---
 
 | Name | Description |
@@ -310,9 +417,8 @@ To configure an agent, use the `destinations` array to define which agents your
 - You can only set up one Application Insights and Datadog endpoint each at a time.
 - While you can define more than one OTLP-configured endpoint, each one must have a distinct name.
 
-
-The following example shows how to use an OTLP endpoint named `customDashboard`. It sends:
--  traces to app insights and `customDashboard`
+The following example ARM template shows how to use an OTLP endpoint named `customDashboard`. It sends:
+- traces to app insights and `customDashboard`
 - logs to app insights and `customDashboard`
 - metrics to DataDog and `customDashboard`
 

articles/oracle/oracle-db/faq-oracle-database-azure.md

@@ -165,7 +165,7 @@ Data is encrypted at rest. All traffic between sites, including to the Oracle Da
 
 ### Can I use Azure Monitor with Oracle Database@Azure?
 
-Yes. Metrics are published for the Oracle Exadata infrastructure, for VM clusters, and for Oracle databases. The database metrics are listed under VM metrics. You can create custom dashboards for Azure Monitor to use with your application monitoring for a unified view.
+Yes. Metrics are published for the Oracle Exadata infrastructure, for VM clusters, and for Oracle databases. The database metrics are listed under VM metrics. You can create custom dashboards for Azure Monitor to use with your application monitoring for a unified view. For more information, see [Exadata metrics](https://docs.oracle.com/en-us/iaas/odexa/odexa-monitoring-exadata-services.html) and [metrics for autonomous database](https://docs.oracle.com/en-us/iaas/odadb/odadb-monitoring-autonomous-database-services.html).
 
 ### What are the different options for backup on Oracle Database@Azure?