Merge pull request #909 from MicrosoftDocs/main

Publish to live, Monday 4 AM PST, 1/6

.openpublishing.redirection.azure-monitor.json

@@ -7664,6 +7664,11 @@
     "source_path": "articles/azure/azure-monitor/reference/supported-metrics/microsoft-netapp-netappaccounts-capacitypools-volumes-metrics.md",
     "redirect_url": "/azure/azure-monitor/reference",
     "redirect_document_id": false
-   }
+   },
+   {
+    "source_path_from_root": "/articles/azure-monitor/essentials/prometheus-self-managed-grafana-azure-active-directory.md",
+    "redirect_url": "/azure/azure-monitor/essentials/prometheus-grafana",
+    "redirect_document_id": false
+  }
  ]
 }

articles/azure-monitor/essentials/azure-monitor-workspace-manage.md

@@ -116,8 +116,10 @@ For information on deleting resources and Azure Resource Manager, see [Azure Res
 ## Link a Grafana workspace  
 Connect an Azure Monitor workspace to an [Azure Managed Grafana](/azure/managed-grafana/overview) workspace to allow Grafana to use the Azure Monitor workspace data in a Grafana dashboard. An Azure Monitor workspace can be connected to multiple Grafana workspaces, and a Grafana workspace can be connected to multiple Azure Monitor workspaces. Azure Managed Grafana and your Azure Monitor workspace can be in different regions. 
 
+To link your self-managed Grafana instance to an Azure Monitor workspace, see [Connect Grafana to Azure Monitor Prometheus metrics](./prometheus-grafana.md)
+
 > [!NOTE]
-> When you add the Azure Monitor workspace as a data source to Grafana, it islisted in as `Prometheus_<azure monitor workspace query endpoint>`.
+> When you add the Azure Monitor workspace as a data source to Grafana, it's listed in as `Prometheus_<azure monitor workspace query endpoint>`.
   
 ### [Azure portal](#tab/azure-portal)
 
@@ -162,8 +164,6 @@ To set up an Azure monitor workspace as a data source for Grafana using a Resour
 
 ---
 
-If your Grafana instance is self managed, see [Use Azure Monitor managed service for Prometheus as data source for self-managed Grafana using managed system identity](./prometheus-self-managed-grafana-azure-active-directory.md)
-
 
 ## Next steps
 - Learn more about the [Azure Monitor data platform](../data-platform.md).

articles/azure-monitor/toc.yml

@@ -1017,6 +1017,9 @@ items:
       - name: Prometheus remote-write from virtual machines
         displayName: Prometheus remote-write
         href: essentials/prometheus-remote-write-virtual-machines.md
+      - name: Connect Grafana to Azure Monitor Prometheus metrics
+        displayName: Prometheus Grafana
+        href: essentials/prometheus-grafana.md
       - name: Azure Monitor workspace
         items:
         - name: Overview
@@ -1041,14 +1044,6 @@ items:
         href: essentials/prometheus-rule-groups.md
       - name: Query Prometheus metrics
         items:
-        - name: Query using Grafana
-          items:
-          - name: Configure Grafana with managed system identity
-            displayName: Prometheus
-            href: essentials/prometheus-grafana.md
-          - name: Configure Grafana with Microsoft Entra ID
-            displayName: Prometheus
-            href: essentials/prometheus-self-managed-grafana-azure-active-directory.md
         - name: Query using Azure workbooks
           displayName: Prometheus
           href: essentials/prometheus-workbooks.md

articles/azure-monitor/visualize/grafana-plugin.md

@@ -2,7 +2,7 @@
 title: Monitor Azure services and applications by using Grafana
 description: Route Azure Monitor and Application Insights data so that you can view it in Grafana.
 ms.topic: conceptual
-ms.date: 06/21/2023
+ms.date: 01/05/2025
 
 ---
 
@@ -20,6 +20,8 @@ You can monitor Azure services and applications by using [Grafana](https://grafa
 
 * [Azure Resource Graph](/azure/governance/resource-graph/overview) to quickly query and identify Azure resources across subscriptions.
 
+You can also use the plug-in to query and visualize data from Azure Monitor managed service for Prometheus. For more information, see [Connect Grafana to Azure Monitor Prometheus metrics](../essentials/prometheus-grafana.md).
+
 You can then display this performance and availability data on your Grafana dashboard.
 
 Use the following steps to set up a Grafana server and build dashboards for metrics and logs from Azure Monitor.
@@ -178,10 +180,12 @@ Basic Logs provide a cost-effective way to manage data storage by allowing you t
 > * **Time range** will be **Dashboard** time. Switching **Time range** back to **Query** is not available.
 > * Basic logs incur per-query costs, see [Select a table plan based on data usage in a Log Analytics workspace](./../logs/logs-table-plans.md).
 
+<!--
 ### Use exemplars with Azure
 
 In Grafana 11, [exemplars](https://grafana.com/docs/mimir/latest/manage/use-exemplars/about-exemplars/) can link directly to trace data in Application Insights. This integration allows you to connect Prometheus metric data with detailed traces, providing a more comprehensive view of system performance and behavior. For more information about the trace view in Grafana, see [Traces in Explore](https://grafana.com/docs/grafana/latest/explore/trace-integration/#traces-in-explore).
 
+
 #### Configure exemplars to point to Azure
 
 1. In Grafana, go to **Connections** > **Data sources** > **Prometheus**.
@@ -206,6 +210,7 @@ In Grafana 11, [exemplars](https://grafana.com/docs/mimir/latest/manage/use-exem
 1. In the context menu, select **Azure** or the **URL Label** you gave the exemplar. This opens an **Azure** panel next to your current **Prometheus** panel with trace information in the Grafana viewer.
 
 :::image type="content" source="media/grafana-plugin/grafana-exemplar-application-insights-with-numbers.png" lightbox="media/grafana-plugin/grafana-exemplar-application-insights-with-numbers.png" alt-text="Screenshot showing Explore view with exemplars.":::
+-->
 
 ## Advanced Grafana features