fixes

bwren · bwren · commit 0905ad7eae28 · 2022-10-31T17:37:33.000-07:00
diff --git a/.openpublishing.redirection.azure-monitor.json b/.openpublishing.redirection.azure-monitor.json
@@ -5465,30 +5465,31 @@
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-update-metrics.md",
             "redirect_url": "/azure/azure-monitor/containers/container-insights-custom-metrics",
             "redirect_document_id": false
-        }
-        ,
+        },
         {
             "source_path_from_root": "/articles/automation/migrate-oms-update-deployments.md",
             "redirect_url": "/azure/azure-monitor/terminology#april-2018---retirement-of-operations-management-suite-brand",
             "redirect_document_id": false
-        }
-        ,
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-virtual-machine-scale-sets.md",
             "redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-template",
             "redirect_document_id": false
-        }
-        ,
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-common-schema-integrations.md",
             "redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
             "redirect_document_id": false
-        }
-        ,
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/action-groups-logic-app.md",
             "redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-metrics-addon.md",
+            "redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-enable",
+            "redirect_document_id": false
         }
     ]
 }
diff --git a/articles/azure-monitor/containers/container-insights-metric-alerts.md b/articles/azure-monitor/containers/container-insights-metric-alerts.md
@@ -28,7 +28,7 @@ There are two types of metric rules used by Container insights based on either P
 
 ### Prerequisites
 
-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).
+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).
 
 ### Enable alert rules
 
diff --git a/articles/azure-monitor/containers/container-insights-onboard.md b/articles/azure-monitor/containers/container-insights-onboard.md
@@ -57,7 +57,7 @@ You can let the onboarding experience create a Log Analytics workspace in the de
 
 ### Azure Monitor workspace (preview)
 
-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.
+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.
 
 ### Permissions
 
diff --git a/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md b/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md
@@ -8,7 +8,7 @@ ms.reviewer: aul
 ---
 
 # Send Prometheus metrics to Azure Monitor Logs with Container insights
-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).
+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).
 
 
 ## Prometheus scraping settings
diff --git a/articles/azure-monitor/containers/container-insights-prometheus.md b/articles/azure-monitor/containers/container-insights-prometheus.md
@@ -18,7 +18,8 @@ Container insights can also scrape Prometheus metrics from your cluster and send
 ## Send data to Azure Monitor managed service for Prometheus
 [Azure Monitor managed service for Prometheus](../essentials/prometheus-metrics-overview.md) is a fully managed Prometheus-compatible service that supports industry standard features such as PromQL, Grafana dashboards, and Prometheus alerts. This requires configuring the *metrics addon* for the Azure Monitor agent, which sends data to Prometheus.
 
-You don't need to enable Container insights to configure your AKS cluster to send data to managed Prometheus. See [Collect Prometheus metrics from AKS cluster (preview)](../essentials/prometheus-metrics-enable.md) for details on how to configure your cluster without enabling Container insights.
+> [!TIP]
+> You don't need to enable Container insights to configure your AKS cluster to send data to managed Prometheus. See [Collect Prometheus metrics from AKS cluster (preview)](../essentials/prometheus-metrics-enable.md) for details on how to configure your cluster without enabling Container insights.
 
 
 Use the following procedure to add Promtheus collection to your cluster that's already using Container insights.
@@ -196,5 +197,5 @@ Container insights supports viewing metrics stored in your Log Analytics workspa
 
 ## Next steps
 
-- [See the default configuration for Prometheus metrics](prometheus-metrics-scrape-default.md).
-- [Customize Prometheus metric scraping for the cluster](prometheus-metrics-scrape-configuration.md).
+- [See the default configuration for Prometheus metrics](../essentials/prometheus-metrics-scrape-default.md).
+- [Customize Prometheus metric scraping for the cluster](../essentials/prometheus-metrics-scrape-configuration.md).
diff --git a/articles/azure-monitor/essentials/prometheus-grafana.md b/articles/azure-monitor/essentials/prometheus-grafana.md
@@ -127,6 +127,6 @@ Versions 9.x and greater of Grafana support Azure Authentication, but it's not e
 
 ## Next steps
 
-- [Collect Prometheus metrics for your AKS cluster](../containers/container-insights-prometheus-metrics-addon.md).
+- [Collect Prometheus metrics for your AKS cluster](../essentials/prometheus-metrics-enable.md).
 - [Configure Prometheus alerting and recording rules groups](prometheus-rule-groups.md).
-- [Customize scraping of Prometheus metrics](prometheus-metrics-scrape-configuration.md).
+- [Customize scraping of Prometheus metrics](prometheus-metrics-scrape-configuration.md).
diff --git a/articles/azure-monitor/essentials/prometheus-metrics-enable.md b/articles/azure-monitor/essentials/prometheus-metrics-enable.md
@@ -11,12 +11,12 @@ ms.reviewer: aul
 This article describes how to configure your Azure Kubernetes Service (AKS) cluster to send data to Azure Monitor managed service for Prometheus. When you configure your AKS cluster to send data to Azure Monitor managed service for Prometheus, a containerized version of the [Azure Monitor agent](../agents/agents-overview.md) is installed with a metrics extension. You just need to specify the Azure Monitor workspace that the data should be sent to.
 
 > [!NOTE]
-> The process described here doesn't enable [Container insights](../containers/container-insights-overview.md) on the cluster even though the Azure Monitor agent installed in this process is the same one used by Container insights. See [Enable Container insights](..containers/../../containers/container-insights-onboard.md) for different methods to enable Container insights on your cluster. See [Collect Prometheus metrics with Container insights](../containers/container-insights-prometheus.md) for details on adding Prometheus collection to a cluster that already has Container insights enabled.
+> The process described here doesn't enable [Container insights](../containers/container-insights-overview.md) on the cluster even though the Azure Monitor agent installed in this process is the same one used by Container insights. See [Enable Container insights](../containers/container-insights-onboard.md) for different methods to enable Container insights on your cluster. See [Collect Prometheus metrics with Container insights](../containers/container-insights-prometheus.md) for details on adding Prometheus collection to a cluster that already has Container insights enabled.
 
 ## Prerequisites
 
 - You must either have an [Azure Monitor workspace](azure-monitor-workspace-overview.md) or [create a new one](azure-monitor-workspace-overview.md#create-an-azure-monitor-workspace).
-- The cluster must use [managed identity authentication](container-insights-enable-aks.md#migrate-to-managed-identity-authentication).
+- The cluster must use [managed identity authentication](../containers/container-insights-enable-aks.md#migrate-to-managed-identity-authentication).
 - The following resource providers must be registered in the subscription of the AKS cluster and the Azure Monitor Workspace.
   - Microsoft.ContainerService
   - Microsoft.Insights
@@ -255,7 +255,7 @@ ama-metrics-ksm-5fcf8dffcd      1         1         1       11h
 - Ensure that you update the `kube-state metrics` Annotations and Labels list with proper formatting. There's a limitation in the Resource Manager template deployments that require exact values in the `kube-state` metrics pods. If the kuberenetes pod has any issues with malformed parameters and isn't running, then the feature won't work as expected.
 - A data collection rule and data collection endpoint is created with the name `MSPROM-\<cluster-name\>-\<cluster-region\>`. These names can't currently be modified.
 - You must get the existing Azure Monitor workspace integrations for a Grafana workspace and update the Resource Manager template with it, otherwise it will overwrite and remove the existing integrations from the grafana workspace.
-- CPU and Memory requests and limits can't be changed for [Container insights metrics addon](../containers/container-insights-prometheus-metrics-addon.md). If changed, they'll be reconciled and replaced by original values in a few seconds.
+- CPU and Memory requests and limits can't be changed for Container insights metrics addon. If changed, they'll be reconciled and replaced by original values in a few seconds.
 - Metrics addon doesn't work on AKS clusters configured with HTTP proxy. 
 
 
@@ -264,7 +264,7 @@ Currently, Azure CLI is the only option to remove the metrics addon and stop sen
 
 If you don't already have it, install the aks-preview extension with the following command. 
 
-The aks-preview extension needs to be installed using the following command. For more information on how to install a CLI extension, see [Use and manage extensions with the Azure CLI](https://learn.microsoft.com/cli/azure/azure-cli-extensions-overview).
+The `aks-preview` extension needs to be installed using the following command. For more information on how to install a CLI extension, see [Use and manage extensions with the Azure CLI](/cli/azure/azure-cli-extensions-overview).
 
 ```azurecli
 az extension add --name aks-preview
diff --git a/articles/azure-monitor/essentials/prometheus-metrics-multiple-workspaces.md b/articles/azure-monitor/essentials/prometheus-metrics-multiple-workspaces.md
@@ -13,7 +13,7 @@ Routing metrics to more Azure Monitor Workspaces can be done through the creatio
 
 ## Send same metrics to multiple Azure Monitor workspaces
 
-You can create multiple Data Collection Rules that point to the same Data Collection Endpoint for metrics to be sent to additional Azure Monitor Workspaces from the same Kubernetes cluster. Currently, this is only available through onboarding through Resource Manager templates. You can follow the [regular onboarding process](../containers/container-insights-prometheus-metrics-addon.md#enable-prometheus-metric-collection) and then edit the same Resource Manager templates to add additional DCRs for your additional Azure Monitor Workspaces. You'll need to edit the template to add an additional parameters for every additional Azure Monitor workspace, add another DCR for every additional Azure Monitor workspace, and add an additional Azure Monitor workspace integration for Grafana.
+You can create multiple Data Collection Rules that point to the same Data Collection Endpoint for metrics to be sent to additional Azure Monitor Workspaces from the same Kubernetes cluster. Currently, this is only available through onboarding through Resource Manager templates. You can follow the [regular onboarding process](prometheus-metrics-enable.md) and then edit the same Resource Manager templates to add additional DCRs for your additional Azure Monitor Workspaces. You'll need to edit the template to add an additional parameters for every additional Azure Monitor workspace, add another DCR for every additional Azure Monitor workspace, and add an additional Azure Monitor workspace integration for Grafana.
 
 - Add the following parameters:
   ```json
@@ -197,4 +197,4 @@ scrape_configs:
 ## Next steps
 
 - [Learn more about Azure Monitor managed service for Prometheus](prometheus-metrics-overview.md).
-- [Collect Prometheus metrics from AKS cluster](../containers/container-insights-prometheus-metrics-addon.md).
+- [Collect Prometheus metrics from AKS cluster](prometheus-metrics-enable.md).
diff --git a/articles/azure-monitor/essentials/prometheus-metrics-overview.md b/articles/azure-monitor/essentials/prometheus-metrics-overview.md
@@ -15,18 +15,17 @@ Azure Monitor managed service for Prometheus is a component of [Azure Monitor Me
 > [!IMPORTANT] 
 > Azure Monitor managed service for Prometheus is intended for storing information about service health of customer machines and applications. It is not intended for storing any data classified as Personal Identifiable Information (PII) or End User Identifiable Information (EUII). We strongly recommend that you do not send any sensitive information (usernames, credit card numbers etc.) into Azure Monitor managed service for Prometheus fields like metric names, label names, or label values.
 
-## Enable
-The only requirement to enable Azure Monitor managed service for Prometheus is to create an [Azure Monitor workspace](azure-monitor-workspace-overview.md), which is where Prometheus metrics are stored. Once this workspace is created, you can onboard services that collect Prometheus metrics.
-
-- To collect Prometheus metrics from your AKS cluster without using Container insights, see [Collect Prometheus metrics from AKS cluster (preview)](prometheus-metrics-enable.md).
-- To add collection of Prometheus metrics to your cluster using Container insights, see [Collect Prometheus metrics with Container insights](../containers/container-insights-prometheus.md#send-data-to-azure-monitor-managed-service-for-prometheus).
-
 ## Data sources
 Azure Monitor managed service for Prometheus can currently collect data from any of the following data sources.
 
-- Azure Kubernetes service (AKS). [Configure the Azure Monitor managed service for Prometheus AKS add-on](../containers/container-insights-prometheus-metrics-addon.md) to scrape metrics from an AKS cluster.
+- Azure Kubernetes service (AKS
 - Any Kubernetes cluster running self-managed Prometheus using [remote-write](https://aka.ms/azureprometheus-promio-prw). In this configuration, metrics are collected by a local Prometheus server for each cluster and then consolidated in Azure Monitor managed service for Prometheus.
 
+## Enable
+The only requirement to enable Azure Monitor managed service for Prometheus is to create an [Azure Monitor workspace](azure-monitor-workspace-overview.md), which is where Prometheus metrics are stored. Once this workspace is created, you can onboard services that collect Prometheus metrics.
+
+- To collect Prometheus metrics from your AKS cluster without using Container insights, see [Collect Prometheus metrics from AKS cluster (preview)](prometheus-metrics-enable.md).
+- To add collection of Prometheus metrics to your cluster using Container insights, see [Collect Prometheus metrics with Container insights](../containers/container-insights-prometheus.md#send-data-to-azure-monitor-managed-service-for-prometheus).
 
 ## Grafana integration
 The primary method for visualizing Prometheus metrics is [Azure Managed Grafana](../../managed-grafana/overview.md). [Connect your Azure Monitor workspace to a Grafana workspace](azure-monitor-workspace-overview.md#link-a-grafana-workspace) so that it can be used as a data source in a Grafana dashboard. You then have access to multiple prebuilt dashboards that use Prometheus metrics and the ability to create any number of custom dashboards.
diff --git a/articles/azure-monitor/essentials/prometheus-metrics-scrape-configuration.md b/articles/azure-monitor/essentials/prometheus-metrics-scrape-configuration.md
@@ -9,7 +9,7 @@ ms.reviewer: aul
 
 # Customize scraping of Prometheus metrics in Azure Monitor (preview)
 
-This article provides instructions on customizing metrics scraping for a Kubernetes cluster with the [metrics addon](../containers/container-insights-prometheus-metrics-addon.md) in Azure Monitor.
+This article provides instructions on customizing metrics scraping for a Kubernetes cluster with the [metrics addon](prometheus-metrics-enable.md) in Azure Monitor.
 
 ## Configmaps
 
diff --git a/articles/azure-monitor/essentials/prometheus-metrics-scrape-default.md b/articles/azure-monitor/essentials/prometheus-metrics-scrape-default.md
@@ -9,7 +9,7 @@ ms.reviewer: aul
 
 # Default Prometheus metrics configuration in Azure Monitor (preview)
 
-This article lists the default targets, dashboards, and recording rules when you [configure Container insights to collect Prometheus metrics by enabling metrics-addon](../containers/container-insights-prometheus-metrics-addon.md) for any AKS cluster.
+This article lists the default targets, dashboards, and recording rules when you [configure Prometheus metrics to be scraped from an AKS cluster](prometheus-metrics-enable.md) for any AKS cluster.
 
 ## Scrape frequency
 
