Skip to content

Commit 4b7d123

Browse files
committed
fixes
1 parent ac21ae3 commit 4b7d123

8 files changed

+51
-11
lines changed

articles/azure-monitor/containers/prometheus-remote-write-active-directory.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,16 @@ This article applies to the following cluster configurations:
2424
2525
## Prerequisites
2626

27-
The prerequisites that are described in [Azure Monitor managed service for Prometheus remote write](prometheus-remote-write.md#prerequisites) apply to the processes that are described in this article.
27+
### Supported versions
28+
29+
- Prometheus versions greater than v2.48 are required for Microsoft Entra ID application authentication.
30+
31+
### Azure Monitor workspace
32+
33+
This article covers sending Prometheus metrics to an Azure Monitor workspace. To create an Azure monitor workspace, see [Manage an Azure Monitor workspace](./azure-monitor-workspace-manage.md#create-an-azure-monitor-workspace#create-an-azure-monitor-workspace).
34+
35+
## Permissions
36+
Administrator permissions for the cluster or resource are required to complete the steps in this article.
2837

2938
## Set up an application for Microsoft Entra ID
3039

@@ -167,7 +176,7 @@ This step is required only if you didn't turn on Azure Key Vault Provider for Se
167176
168177
## Verification and troubleshooting
169178
170-
For verification and troubleshooting information, see [Troubleshooting remote write](articles/azure-monitor/containers/prometheus-remote-write-troubleshooting) and [Azure Monitor managed service for Prometheus remote write](prometheus-remote-write.md#verify-remote-write-is-working-correctly).
179+
For verification and troubleshooting information, see [Troubleshooting remote write](/azure/azure-monitor/containers/prometheus-remote-write-troubleshooting) and [Azure Monitor managed service for Prometheus remote write](prometheus-remote-write.md#verify-remote-write-is-working-correctly).
171180
172181
## Next steps
173182

articles/azure-monitor/containers/prometheus-remote-write-azure-ad-pod-identity.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,17 @@ This article describes how to set up remote write for Azure Monitor managed serv
1717
1818
## Prerequisites
1919

20-
The prerequisites that are described in [Azure Monitor managed service for Prometheus remote write](prometheus-remote-write.md#prerequisites) apply to the processes that are described in this article.
20+
### Supported versions
21+
22+
Prometheus versions greater than v2.45 are required for managed identity authentication.
23+
24+
### Azure Monitor workspace
25+
26+
This article covers sending Prometheus metrics to an Azure Monitor workspace. To create an Azure monitor workspace, see [Manage an Azure Monitor workspace](./azure-monitor-workspace-manage.md#create-an-azure-monitor-workspace#create-an-azure-monitor-workspace).
27+
28+
## Permissions
29+
30+
Administrator permissions for the cluster or resource are required to complete the steps in this article.
2131

2232
## Set up an application for Microsoft Entra pod-managed identity
2333

@@ -100,7 +110,7 @@ The `aadpodidbinding` label must be added to the Prometheus pod for the pod-mana
100110

101111
## Verification and troubleshooting
102112

103-
For verification and troubleshooting information, see [Troubleshooting remote write](articles/azure-monitor/containers/prometheus-remote-write-troubleshooting) and [Azure Monitor managed service for Prometheus remote write](prometheus-remote-write.md#verify-remote-write-is-working-correctly).
113+
For verification and troubleshooting information, see [Troubleshooting remote write](/azure/azure-monitor/containers/prometheus-remote-write-troubleshooting) and [Azure Monitor managed service for Prometheus remote write](prometheus-remote-write.md#verify-remote-write-is-working-correctly).
104114

105115
## Next steps
106116

articles/azure-monitor/containers/prometheus-remote-write-azure-workload-identity.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ This article describes how to set up [remote write](prometheus-remote-write.md)
1717
## Prerequisites
1818

1919
To send data from a Prometheus server by using remote write with Microsoft Entra Workload ID authentication, you need:
20+
## Prerequisites
21+
22+
- Prometheus versions greater than v2.48 are required for Microsoft Entra ID application authentication.
2023

2124
- A cluster that has feature flags that are specific to OpenID Connect (OIDC) and an OIDC issuer URL:
2225
- For managed clusters (Azure Kubernetes Service, Amazon Elastic Kubernetes Service, and Google Kubernetes Engine), see [Managed Clusters - Microsoft Entra Workload ID](https://azure.github.io/azure-workload-identity/docs/installation/managed-clusters.html).
@@ -179,7 +182,7 @@ az ad app federated-credential create --id ${APPLICATION_OBJECT_ID} --parameters
179182
180183
## Verification and troubleshooting
181184
182-
For verification and troubleshooting information, see [Troubleshooting remote write](articles/azure-monitor/containers/prometheus-remote-write-troubleshooting) and [Azure Monitor managed service for Prometheus remote write](prometheus-remote-write.md#verify-remote-write-is-working-correctly).
185+
For verification and troubleshooting information, see [Troubleshooting remote write](/azure/azure-monitor/containers/prometheus-remote-write-troubleshooting) and [Azure Monitor managed service for Prometheus remote write](prometheus-remote-write.md#verify-remote-write-is-working-correctly).
183186
184187
## Next steps
185188

articles/azure-monitor/containers/prometheus-remote-write-managed-identity.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,17 @@ This article applies to the following cluster configurations:
2222
2323
## Prerequisites
2424

25-
The prerequisites that are described in [Azure Monitor managed service for Prometheus remote write](prometheus-remote-write.md#prerequisites) apply to the processes that are described in this article.
25+
### Supported versions
26+
27+
Prometheus versions greater than v2.45 are required for managed identity authentication.
28+
29+
### Azure Monitor workspace
30+
31+
This article covers sending Prometheus metrics to an Azure Monitor workspace. To create an Azure monitor workspace, see [Manage an Azure Monitor workspace](./azure-monitor-workspace-manage.md#create-an-azure-monitor-workspace#create-an-azure-monitor-workspace).
32+
33+
## Permissions
34+
35+
Administrator permissions for the cluster or resource are required to complete the steps in this article.
2636

2737
## Set up an application for managed identity
2838

@@ -131,7 +141,7 @@ This step isn't required if you're using an AKS identity. An AKS identity alread
131141
132142
## Verification and troubleshooting
133143
134-
For verification and troubleshooting information, see [Troubleshooting remote write](articles/azure-monitor/containers/prometheus-remote-write-troubleshooting) and [Azure Monitor managed service for Prometheus remote write](prometheus-remote-write.md#verify-remote-write-is-working-correctly).
144+
For verification and troubleshooting information, see [Troubleshooting remote write](/azure/azure-monitor/containers/prometheus-remote-write-troubleshooting) and [Azure Monitor managed service for Prometheus remote write](prometheus-remote-write.md#verify-remote-write-is-working-correctly).
135145
136146
## Next steps
137147

articles/azure-monitor/containers/prometheus-remote-write-troubleshooting.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ ms.date: 4/18/2024
1313

1414
# Troubleshoot remote write
1515

16+
17+
## Supported versions
18+
19+
- Prometheus versions greater than v2.45 are required for managed identity authentication.
20+
- Prometheus versions greater than v2.48 are required for Microsoft Entra ID application authentication.
21+
22+
1623
## HTTP 403 error in the Prometheus log
1724

1825
It takes about 30 minutes for the assignment of the role to take effect. During this time, you may see an HTTP 403 error in the Prometheus log. Check that you have configured the managed identity or Microsoft Entra ID application correctly with the `Monitoring Metrics Publisher` role on the workspace's data collection rule. If the configuration is correct, wait 30 minutes for the role assignment to take effect.

articles/azure-monitor/containers/prometheus-remote-write.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ See the following articles for more information on how to configure remote write
3636

3737
## Remote write from Virtual Machines and Virtual Machine Scale sets
3838

39-
You can send Prometheus data from Virtual Machines and Virtual Machines Scale Sets to Azure Monitor workspaces using remote write. The servers can be Azure-managed or in any other environment. For more information, see [Send Prometheus metrics from Virtual Machines to an Azure Monitor workspace](/azure/azure-monitor/containers/prometheus-remote-write-virtual-machines).
39+
You can send Prometheus data from Virtual Machines and Virtual Machines Scale Sets to Azure Monitor workspaces using remote write. The servers can be Azure-managed or in any other environment. For more information, see [Send Prometheus metrics from Virtual Machines to an Azure Monitor workspace](/azure/azure-monitor/essentials/prometheus-remote-write-virtual-machines).
4040

4141

4242
## Verify remote write is working correctly

articles/azure-monitor/essentials/prometheus-remote-write-virtual-machines.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ If you have virtual machines in non-Azure environments, and you don't want to on
4545
- Prometheus versions greater than v2.48 are required for Microsoft Entra ID application authentication.
4646

4747
### Azure Monitor workspace
48-
This article covers sending Prometheus metrics to an Azure Monitor workspace. To create an Azure monitor workspace, see [Manage an Azure Monitor workspace](./azure-monitor-workspace-manage.md#create-an-azure-monitor-workspace#create-an-azure-monitor-workspace).
48+
This article covers sending Prometheus metrics to an Azure Monitor workspace. To create an Azure monitor workspace, see [Manage an Azure Monitor workspace](./azure-monitor-workspace-manage.md#create-an-azure-monitor-workspace).
4949

50+
## Permissions
5051
Administrator permissions for the cluster or resource are required to complete the steps in this article.
5152

5253

@@ -313,7 +314,7 @@ To find your client for managed identity authentication in the portal, go to the
313314

314315
:::image type="content" source="media/prometheus-remote-write-virtual-machines/find-clinet-id.png" lightbox="media/prometheus-remote-write-virtual-machines/find-clinet-id.png" alt-text="A screenshot showing the client ID on the Identity overview page.":::
315316

316-
To find the client ID for the Microsoft Entra ID application, use the following CLI or see the first step in the [Create an Microsoft Entra ID application using the Azure portal](#create-an-microsoft-entra-id-application-using-the-azure-portal) section.
317+
To find the client ID for the Microsoft Entra ID application, use the following CLI or see the first step in the [Create an Microsoft Entra ID application using the Azure portal](#remote-write-using-microsoft-entra-id-application-authentication) section.
317318

318319
```azurecli
319320
$ az ad app list --display-name < application name>

articles/openshift/howto-remotewrite-prometheus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ To access the dashboard, in your Azure Managed Grafana workspace, go to **Home**
133133

134134
## Troubleshoot
135135

136-
For troubleshooting information, see [Azure Monitor managed service for Prometheus remote write](../azure-monitor/containers/prometheus-remote-write.md#hitting-your-ingestion-quota-limit).
136+
For troubleshooting information, see [Azure Monitor managed service for Prometheus remote write](../azure-monitor/containers/prometheus-remote-write-troubleshooting.md#ingestion-quotas-and-limits).
137137

138138
## Related content
139139

0 commit comments

Comments
 (0)