Skip to content

Commit 8376022

Browse files
authored
Merge pull request #277417 from MicrosoftDocs/main
Merge main to live 4 AM
2 parents 7d69f71 + 1467035 commit 8376022

20 files changed

+379
-86
lines changed

articles/ai-services/openai/includes/on-your-data-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 03/27/2024
99

1010
## Data connection
1111

12-
You need to select how you want to authenticate the connection from Azure OpenAI, Azure AI Search, and Azure blob storage. You can choose a *System assigned managed identity* or an *API key*. By selecting *API key* as the authentication type, the system will automatically populate the API key for you to connect with your Azure AI Search resource. By selecting *System assigned managed identity*, the authentication will be based on the [role assignment](../how-to/use-your-data-securely.md#role-assignments) you have. *System assigned managed identity* is selected by default for security.
12+
You need to select how you want to authenticate the connection from Azure OpenAI, Azure AI Search, and Azure blob storage. You can choose a *System assigned managed identity* or an *API key*. By selecting *API key* as the authentication type, the system will automatically populate the API key for you to connect with your Azure AI Search, Azure OpenAI, and Azure Blob Storage resources. By selecting *System assigned managed identity*, the authentication will be based on the [role assignment](../how-to/use-your-data-securely.md#role-assignments) you have. *System assigned managed identity* is selected by default for security.
1313

1414

1515
:::image type="content" source="../media/use-your-data/data-connection-authentication.png" alt-text="A screenshot showing the managed identity option in Azure OpenAI Studio." lightbox="../media/use-your-data/data-connection-authentication.png":::

articles/azure-monitor/containers/container-insights-private-link.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ az aks enable-addons --addon monitoring --name <cluster-name> --resource-group <
3232
Example:
3333

3434
```azurecli
35-
az aks enable-addons --addon monitoring --name "my-cluster" --resource-group "my-resource-group" --workspace-resource-id "/subscriptions/my-subscription/resourceGroups/my-resource-group/providers/Microsoft.OperationalInsights/workspaces/my-workspace" --ampls-resource-id "/subscriptions/my-subscription /resourceGroups/ my-resource-group/providers/microsoft.insights/privatelinkscopes/my-ampls-resource"
35+
az aks enable-addons --addon monitoring --name "my-cluster" --resource-group "my-resource-group" --workspace-resource-id "/subscriptions/my-subscription/resourceGroups/my-resource-group/providers/Microsoft.OperationalInsights/workspaces/my-workspace" --ampls-resource-id "/subscriptions/my-subscription /resourceGroups/my-resource-group/providers/microsoft.insights/privatelinkscopes/my-ampls-resource"
3636
```
3737

3838
**Use existing Log Analytics workspace**

articles/azure-monitor/essentials/collect-custom-metrics-linux-telegraf.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
11
---
2-
title: Collect custom metrics for Linux VM with the InfluxData Telegraf agent
2+
title: Collect custom metrics for Linux Virtual Machines with the InfluxData Telegraf agent
33
description: Instructions on how to deploy the InfluxData Telegraf agent on a Linux VM in Azure and configure the agent to publish metrics to Azure Monitor.
44
services: azure-monitor
55
author: EdB-MSFT
66
ms.author: edbaynash
77
ms.reviewer: priyamishra
88
ms.topic: conceptual
99
ms.custom: linux-related-content
10-
ms.date: 08/01/2023
10+
ms.date: 06/06/2024
1111
---
12-
# Collect custom metrics for a Linux VM with the InfluxData Telegraf agent
12+
# Collect custom metrics for a Linux Virtual Machine with the InfluxData Telegraf agent
1313

14-
> [!CAUTION]
15-
> This article references CentOS, a Linux distribution that is nearing End Of Life (EOL) status. Please consider your use and planning accordingly. For more information, see the [CentOS End Of Life guidance](~/articles/virtual-machines/workloads/centos/centos-end-of-life.md).
1614

1715
This article explains how to deploy and configure the [InfluxData](https://www.influxdata.com/) Telegraf agent on a Linux virtual machine to send metrics to Azure Monitor.
1816

1917
> [!NOTE]
20-
> InfluxData Telegraf is an open source agent and not officially supported by Azure Monitor. For issues with the Telegraf connector, please refer to the Telegraf GitHub page here: [InfluxData](https://github.com/influxdata/telegraf)
18+
> InfluxData Telegraf is an open source agent and not officially supported by Azure Monitor. For issues with the Telegraf connector, refer to the Telegraf GitHub page here: [InfluxData](https://github.com/influxdata/telegraf)
2119
2220
## InfluxData Telegraf agent
2321

24-
[Telegraf](https://docs.influxdata.com/telegraf/) is a plug-in-driven agent that enables the collection of metrics from over 150 different sources. Depending on what workloads run on your VM, you can configure the agent to use specialized input plug-ins to collect metrics. Examples are MySQL, NGINX, and Apache. By using output plug-ins, the agent can then write to destinations that you choose. The Telegraf agent has integrated directly with the Azure Monitor custom metrics REST API. It supports an Azure Monitor output plug-in. Using this plug-in, the agent can collect workload-specific metrics on your Linux VM and submit them as custom metrics to Azure Monitor.
22+
[Telegraf](https://docs.influxdata.com/telegraf/) is a plug-in-driven agent that enables the collection of metrics from over 150 different sources. Depending on what workloads run on your VM, you can configure the agent to use specialized input plug-ins to collect metrics. Examples are MySQL, NGINX, and Apache. By using output plug-ins, the agent can then write to destinations that you choose. The Telegraf agent integrates directly with the Azure Monitor custom metrics REST API. It supports an Azure Monitor output plug-in. Using this plug-in, the agent can collect workload-specific metrics on your Linux VM and submit them as custom metrics to Azure Monitor.
2523

2624
:::image type="content" source="./media/collect-custom-metrics-linux-telegraf/telegraf-agent-overview.png" alt-text="A diagram showing the Telegraph agent overview." lightbox="./media/collect-custom-metrics-linux-telegraf/telegraf-agent-overview.png":::
2725

2826
## Connect to the VM
2927

3028
Create an SSH connection to the VM where you want to install Telegraf. Select the **Connect** button on the overview page for your virtual machine.
3129

32-
:::image source="./media/collect-custom-metrics-linux-telegraf/connect-to-virtual-machine.png" alt-text="A screenshot of the a Virtual machine overview page with the connect button highlighted." lightbox="./media/collect-custom-metrics-linux-telegraf/connect-to-virtual-machine.png":::
30+
:::image source="./media/collect-custom-metrics-linux-telegraf/connect-to-virtual-machine.png" alt-text="A screenshot of the Virtual machine overview page with the connect button highlighted." lightbox="./media/collect-custom-metrics-linux-telegraf/connect-to-virtual-machine.png":::
3331

3432
In the **Connect to virtual machine** page, keep the default options to connect by DNS name over port 22. In **Login using VM local account**, a connection command is shown. Select the button to copy the command. The following example shows what the SSH connection command looks like:
3533

@@ -59,7 +57,7 @@ Install the package:
5957
sudo apt-get update
6058
sudo apt-get install telegraf
6159
```
62-
# [RHEL, CentOS, Oracle Linux](#tab/redhat)
60+
# [RHEL, Oracle Linux](#tab/redhat)
6361

6462
Add the repository:
6563

218 Bytes
Loading
-4.95 KB
Loading

articles/azure-monitor/logs/tutorial-logs-ingestion-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ The [DCR](../essentials/data-collection-rule-overview.md) defines how the data w
148148
149149
```json
150150
{
151-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
151+
"$schema": "https://schema.management.azure.com/schemas/2023-03-11/deploymentTemplate.json#",
152152
"contentVersion": "1.0.0.0",
153153
"parameters": {
154154
"dataCollectionRuleName": {

articles/azure-monitor/toc.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -550,10 +550,9 @@ items:
550550
- name: Troubleshoot remote-write
551551
displayName: Prometheus,remote-write
552552
href: containers/prometheus-remote-write-troubleshooting.md
553-
- name: Private Link
554-
items:
555-
- name: Private link for Container Insights
556-
href: containers/container-insights-private-link.md
553+
- name: Private link
554+
displayName: Private Link, container insights
555+
href: containers/container-insights-private-link.md
557556
- name: Monitor
558557
items:
559558
- name: Monitor performance

articles/azure-monitor/whats-new.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,33 @@ This article lists significant changes to Azure Monitor documentation.
1919

2020
## [2024](#tab/2024)
2121

22+
## May 2024
23+
24+
|Subservice | Article | Description |
25+
|---|---|---|
26+
|Agents|[Migrate to Azure Monitor Agent from Log Analytics agent](agents/azure-monitor-agent-migration.md)|Updated support policy for the legacy Log Analytics agent, which will be retired on August 31, 2024.|
27+
|Alerts|[Create a metric alert with dynamic thresholds](alerts/alerts-dynamic-thresholds.md)|Clarify lookback period|
28+
|Alerts|[Action groups](alerts/action-groups.md)|Updated the desciption of action groups to clarify that you can use automatic workflows for any scenario, not only to let users know that alert has been raised.|
29+
|Alerts|[Supported resources for Azure Monitor metric alerts](alerts/alerts-metric-near-real-time.md)|Removed references to the deprecated Microsoft.Web/containerApps namespace, and replaced with Microsoft.app/containerApps namespace.|
30+
|Alerts|[Action groups](alerts/action-groups.md)|Updated action group ARM role group notification functionality.|
31+
|Alerts|[Create or edit a log search alert rule](alerts/alerts-create-log-alert-rule.md)|Updated article to indicate that log search alert rule queries support 'ago()' with timespan literals only.|
32+
|Application-Insights|[Configure Azure Monitor OpenTelemetry](app/opentelemetry-configuration.md)|The OpenTelemetry live metrics feature preview is available for .NET Core, Node.js, and Python.|
33+
|Application-Insights|[Testing behind a firewall](app/availability-private-test.md)|New guidance is available for availability testing behind firewalls.|
34+
|Application-Insights|[Application Insights availability tests](app/availability-overview.md)|We added clarification on both running availability tests on an intranet server and the user agent string used for availability tests.|
35+
|Application-Insights|[Application map: Triage distributed applications](app/app-map.md)|This article has been refreshed with all new screenshots.|
36+
|Application-Insights|[Downtime, SLA, and outages workbook](app/sla-report.md)|This article has been refreshed with all new screenshots.|
37+
|Application-Insights|[Application Insights API for custom events and metrics](app/api-custom-events-metrics.md)|Clarification added for Java and JavaScript automatic flushing behavior and configuration.|
38+
|Containers|[Switch to using managed Prometheus visualizations for Container Insights (preview)](containers/container-insights-experience-v2.md)|V2 docs updates|
39+
|Essentials|[Built-in policies for Azure Monitor](essentials/diagnostics-settings-policies-deployifnotexists.md)|New built-in policies for "allLogs" category |
40+
|Logs|[Define Azure Monitor Agent network settings](agents/azure-monitor-agent-data-collection-endpoint.md)|When you create a data collection rule, Azure Monitor now automatically creates a data collection endpoint and associates it to the data collection rule.|
41+
|Logs|[Azure Monitor customer-managed key](logs/customer-managed-keys.md)|Azure Monitor Logs now supports running search jobs in Log Analytics workspaces with customer managed keys.|
42+
|Logs|[Enhance resilience by replicating your Log Analytics workspace across regions (Preview)](logs/workspace-replication.md)|You can now replicate your Log Analytics workspace across regions and switch over to the replicated workspace if there's a regional failure.|
43+
|Logs|[Analyze data using Log Analytics Simple mode (Preview)](logs/log-analytics-simple-mode.md)|Simple mode provides the most commonly used Azure Monitor Logs functionality in an intuitive, spreadsheet-like experience. Just point and click to filter, sort, and aggregate data to get to the insights you need 80% of the time.|
44+
|Profiler|[Troubleshoot Application Insights Profiler](profiler/profiler-troubleshooting.md)|Update Troubleshooting guide with instructions for stopping unused slots.|
45+
|Profiler|[Troubleshoot Application Insights Profiler](profiler/profiler-troubleshooting.md)|Update Troubleshooting guide with prerequisite for latest ASP.NET Core runtime and explanation for limit on active profiling sessions.|
46+
47+
48+
2249
## April 2024
2350

2451
|Subservice | Article | Description |

articles/container-registry/container-registry-private-link.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,12 @@ The following [az network nic show][az-network-nic-show] commands get the privat
219219
```azurecli
220220
REGISTRY_PRIVATE_IP=$(az network nic show \
221221
--ids $NETWORK_INTERFACE_ID \
222-
--query "ipConfigurations[?privateLinkConnectionProperties.requiredMemberName=='registry'].privateIpAddress" \
222+
--query "ipConfigurations[?privateLinkConnectionProperties.requiredMemberName=='registry'].privateIPAddress" \
223223
--output tsv)
224224
225225
DATA_ENDPOINT_PRIVATE_IP=$(az network nic show \
226226
--ids $NETWORK_INTERFACE_ID \
227-
--query "ipConfigurations[?privateLinkConnectionProperties.requiredMemberName=='registry_data_$REGISTRY_LOCATION'].privateIpAddress" \
227+
--query "ipConfigurations[?privateLinkConnectionProperties.requiredMemberName=='registry_data_$REGISTRY_LOCATION'].privateIPAddress" \
228228
--output tsv)
229229
230230
# An FQDN is associated with each IP address in the IP configurations
@@ -248,7 +248,7 @@ If your registry is [geo-replicated](container-registry-geo-replication.md), que
248248
REPLICA_LOCATION=eastus
249249
GEO_REPLICA_DATA_ENDPOINT_PRIVATE_IP=$(az network nic show \
250250
--ids $NETWORK_INTERFACE_ID \
251-
--query "ipConfigurations[?privateLinkConnectionProperties.requiredMemberName=='registry_data_$REPLICA_LOCATION'].privateIpAddress" \
251+
--query "ipConfigurations[?privateLinkConnectionProperties.requiredMemberName=='registry_data_$REPLICA_LOCATION'].privateIPAddress" \
252252
--output tsv)
253253
254254
GEO_REPLICA_DATA_ENDPOINT_FQDN=$(az network nic show \

articles/data-factory/TOC.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,11 @@ items:
599599
- name: SAP Table
600600
href: connector-sap-table.md
601601
- name: ServiceNow
602-
href: connector-servicenow.md
602+
items:
603+
- name: ServiceNow
604+
href: connector-servicenow.md
605+
- name: ServiceNow (legacy)
606+
href: connector-servicenow-legacy.md
603607
- name: SFTP
604608
href: connector-sftp.md
605609
- name: SharePoint Online List

0 commit comments

Comments
 (0)