Skip to content

Commit ef196b9

Browse files
authored
Merge pull request #215907 from bwren/prom-onboard
Restructure Prometheus onboarding
2 parents bb49cdd + 7974f81 commit ef196b9

13 files changed

+265
-95
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5465,30 +5465,31 @@
54655465
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-update-metrics.md",
54665466
"redirect_url": "/azure/azure-monitor/containers/container-insights-custom-metrics",
54675467
"redirect_document_id": false
5468-
}
5469-
,
5468+
},
54705469
{
54715470
"source_path_from_root": "/articles/automation/migrate-oms-update-deployments.md",
54725471
"redirect_url": "/azure/azure-monitor/terminology#april-2018---retirement-of-operations-management-suite-brand",
54735472
"redirect_document_id": false
5474-
}
5475-
,
5473+
},
54765474
{
54775475
"source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-virtual-machine-scale-sets.md",
54785476
"redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-template",
54795477
"redirect_document_id": false
5480-
}
5481-
,
5478+
},
54825479
{
54835480
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-common-schema-integrations.md",
54845481
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
54855482
"redirect_document_id": false
5486-
}
5487-
,
5483+
},
54885484
{
54895485
"source_path_from_root": "/articles/azure-monitor/alerts/action-groups-logic-app.md",
54905486
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
54915487
"redirect_document_id": false
5488+
},
5489+
{
5490+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-metrics-addon.md",
5491+
"redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-enable",
5492+
"redirect_document_id": false
54925493
}
54935494
]
54945495
}

articles/azure-monitor/containers/container-insights-metric-alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ There are two types of metric rules used by Container insights based on either P
2828

2929
### Prerequisites
3030

31-
Your cluster must be configured to send metrics to [Azure Monitor managed service for Prometheus](../essentials/prometheus-metrics-overview.md). For more information, see [Collect Prometheus metrics from Kubernetes cluster with Container insights](container-insights-prometheus-metrics-addon.md).
31+
Your cluster must be configured to send metrics to [Azure Monitor managed service for Prometheus](../essentials/prometheus-metrics-overview.md). For more information, see [Collect Prometheus metrics with Container insights](container-insights-prometheus-metrics-addon.md).
3232

3333
### Enable alert rules
3434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ You can let the onboarding experience create a Log Analytics workspace in the de
5757

5858
### Azure Monitor workspace (preview)
5959

60-
If you're going to configure the cluster to [collect Prometheus metrics](container-insights-prometheus-metrics-addon.md) with [Azure Monitor managed service for Prometheus](../essentials/prometheus-metrics-overview.md), you must have an Azure Monitor workspace where Prometheus metrics are stored. You can let the onboarding experience create an Azure Monitor workspace in the default resource group of the AKS cluster subscription or use an existing Azure Monitor workspace.
60+
If you're going to configure the cluster to [collect Prometheus metrics](container-insights-prometheus.md) with [Azure Monitor managed service for Prometheus](../essentials/prometheus-metrics-overview.md), you must have an Azure Monitor workspace where Prometheus metrics are stored. You can let the onboarding experience create an Azure Monitor workspace in the default resource group of the AKS cluster subscription or use an existing Azure Monitor workspace.
6161

6262
### Permissions
6363

articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.reviewer: aul
88
---
99

1010
# Send Prometheus metrics to Azure Monitor Logs with Container insights
11-
This article describes how to send Prometheus metrics to a Log Analytics workspace with the Container insights monitoring addon. You can also send metrics to Azure Monitor managed service for Prometheus with the metrics addon which that supports standard Prometheus features such as PromQL and Prometheus alert rules. See [Send Kubernetes metrics to Azure Monitor managed service for Prometheus with Container insights](container-insights-prometheus-metrics-addon.md).
11+
This article describes how to send Prometheus metrics to a Log Analytics workspace with the Container insights monitoring addon. You can also send metrics to Azure Monitor managed service for Prometheus with the metrics addon which that supports standard Prometheus features such as PromQL and Prometheus alert rules. See [Collect Prometheus metrics with Container insights](container-insights-prometheus.md).
1212

1313

1414
## Prometheus scraping settings

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

Lines changed: 179 additions & 9 deletions
Large diffs are not rendered by default.

articles/azure-monitor/essentials/prometheus-grafana.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,6 @@ Versions 9.x and greater of Grafana support Azure Authentication, but it's not e
127127

128128
## Next steps
129129

130-
- [Collect Prometheus metrics for your AKS cluster](../containers/container-insights-prometheus-metrics-addon.md).
130+
- [Collect Prometheus metrics for your AKS cluster](../essentials/prometheus-metrics-enable.md).
131131
- [Configure Prometheus alerting and recording rules groups](prometheus-rule-groups.md).
132-
- [Customize scraping of Prometheus metrics](prometheus-metrics-scrape-configuration.md).
132+
- [Customize scraping of Prometheus metrics](prometheus-metrics-scrape-configuration.md).

0 commit comments

Comments
 (0)