Skip to content

Commit 3b73315

Browse files
authored
Merge pull request #292254 from maud-lv/ml-grafanarefresh
Refresh content
2 parents 72f3fff + f909399 commit 3b73315

18 files changed

+45
-60
lines changed

articles/managed-grafana/encryption.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Encryption in Azure Managed Grafana
3-
description: Learn how data is encrypted in Azure Managed Grafana.
3+
description: In this guide, learn basic information about data storage and encryption within Azure Managed Grafana.
44
author: maud-lv
55
ms.author: malev
66
ms.service: azure-managed-grafana
7-
ms.topic: conceptual
8-
ms.date: 03/23/2023
7+
ms.topic: concept-article
8+
ms.date: 12/22/2024
99
ms.custom: concept, engagement-fy23
1010
---
1111

articles/managed-grafana/how-to-connect-azure-data-explorer.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: azure-managed-grafana
88
ms.custom: devx-track-azurecli
99
zone_pivot_groups: azure-red-hat-openshift-service-principal
1010
ms.topic: how-to
11-
ms.date: 11/29/2023
11+
ms.date: 12/19/2024
1212
# CustomerIntent: As an Azure Managed Grafana customer, I want to add and configure Azure Data Explorer so that I can use an Azure Data Explorer datasource in a Grafana dashboard.
1313
---
1414

@@ -29,11 +29,7 @@ Add an Azure Data Explorer data source to Grafana by following the steps below.
2929

3030
1. Open an Azure Managed Grafana instance in the Azure portal.
3131
1. In the **Overview** section, open the **Endpoint** URL.
32-
1. In the Grafana portal, deploy the menu on the left and select **Connections** > **Connect data**.
33-
34-
:::image type="content" source="media\azure-data-explorer\connect-data.png" alt-text="Screenshot of the Grafana platform showing the Connect data option.":::
35-
36-
1. Select **Azure Data Explorer Datasource** from the list, and add it to Grafana by selecting **Create a Azure Data Explorer Datasource data source**.
32+
1. In the Grafana portal, go to **Connections** > **Data sources** > **Add new data source**, then search and select **Azure Data Explorer Datasource**.
3733

3834
## Configure an Azure Data Explorer data source
3935

@@ -53,11 +49,8 @@ Enter Azure Data Explorer configuration settings.
5349
#### Add a new permission
5450

5551
1. In the Azure portal, open your Azure Data Explorer cluster.
56-
1. In the **Overview** section, select the database that contains your data.
52+
1. Select **Data** > **Databases** from the left menu, then select the database that contains your data.
5753
1. Select **Permissions > Add > Viewer**.
58-
59-
:::image type="content" source="media\azure-data-explorer\add-permission.png" alt-text="Screenshot of the Azure platform showing a user adding a viewer permission in an Azure Data Explorer database.":::
60-
6154
1. In the search box, enter your Azure Managed Grafana workspace name, select the workspace and then choose **Select**. A success notification appears.
6255

6356
#### Configure the data source in Grafana

articles/managed-grafana/how-to-connect-azure-monitor-workspace.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Add an Azure Monitor workspace to Azure Managed Grafana
3-
description: Learn how to add an Azure Monitor workspace to Azure Managed Grafana to collect Prometheus data.
3+
description: Learn how to connect an Azure Monitor workspace to Azure Managed Grafana to collect Prometheus data.
44
ms.service: azure-managed-grafana
55
ms.topic: how-to
66
author: maud-lv
77
ms.author: malev
8-
ms.date: 01/22/2024
8+
ms.date: 12/19/2024
99
---
1010

1111
# Add an Azure Monitor workspace to Azure Managed Grafana to collect Prometheus data
@@ -38,9 +38,6 @@ To assign the Monitoring Data Reader role:
3838

3939
1. Open your Azure Managed Grafana workspace.
4040
1. In the left menu, select **Integrations** > **Azure Monitor workspaces**.
41-
42-
:::image type="content" source="media\monitor-integration\add-azure-monitor.png" alt-text="Screenshot of the Grafana roles in the Azure platform.":::
43-
4441
1. Select **Add**.
4542
1. In the pane that opens, select an Azure Monitor workspace from the list and confirm with **Add**.
4643
1. Once the operation is complete, Azure displays all the Azure Monitor workspaces added to the Azure Managed Grafana workspace. You can add more Azure Monitor workspaces by selecting **Add** again.

articles/managed-grafana/how-to-data-source-plugins-managed-identity.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: maud-lv
55
ms.author: malev
66
ms.service: azure-managed-grafana
77
ms.topic: how-to
8-
ms.date: 12/08/2023
8+
ms.date: 12/18/2024
99
---
1010

1111
# How to manage data sources in Azure Managed Grafana
@@ -86,13 +86,12 @@ To add a data source to Azure Managed Grafana, follow the steps below.
8686

8787
### [Portal](#tab/azure-portal)
8888

89-
1. [Core Grafana plugins](https://grafana.com/docs/grafana/latest/datasources/#built-in-core-data-sources) are installed in your workspace by default. If you want to use another type of data source, you first need to install its plugin. To install a new data source plugin, follow the instructions available at [Add a plugin](how-to-manage-plugins.md#add-a-plugin).
89+
1. [Core Grafana plugins](https://grafana.com/docs/grafana/latest/datasources/#built-in-core-data-sources) are installed in your workspace by default. If you want to use another type of data source, you first need to install its plugin by following the instructions available at [Add a plugin](how-to-manage-plugins.md#add-a-plugin).
9090
1. Add the data source to your instance.
9191

9292
1. Open your Azure Managed Grafana workspace in the Azure portal and go to **Overview** > **Endpoint** to open the Grafana UI.
93-
1. In the Grafana portal, deploy the menu on the left and select **Connections** > **Data sources** > **Add new data source**.
94-
1. Select a data source from the list. The data source is added to your instance.
95-
1. Fill out the required fields and select **Save & test** to update the data source configuration and make sure it works.
93+
1. In the Grafana UI, deploy the menu on the left and select **Connections** > **Data sources** > **Add new data source**.
94+
1. Select a data source from the list, then fill out the required fields and select **Save & test** to update the data source configuration and test it.
9695

9796
:::image type="content" source="media/data-sources/add-data-source.png" alt-text="Screenshot of the Add data source page in Grafana.":::
9897

@@ -140,10 +139,8 @@ The Azure Monitor data source is automatically added to all new Managed Grafana
140139

141140
:::image type="content" source="media/data-sources/configuration.png" alt-text="Screenshot of the Add data sources page.":::
142141

143-
1. Azure Monitor is listed as a built-in data source for your Managed Grafana instance. Select **Azure Monitor**.
144-
1. In the **Settings** tab, authenticate through **Managed Identity** and select your subscription from the dropdown list, or alternatively enter your **App Registration** details. When you select **Managed identity**, the authentication and authorization are made through the system-assigned or the user-assigned managed identity you [configured in your Azure Managed Grafana workspace](how-to-authentication-permissions.md). Using a managed identity lets you assign permissions for your Managed Grafana instance to access Azure Monitor data without having to manually manage service principals in Microsoft Entra ID.
145-
146-
:::image type="content" source="media/data-sources/configure-Azure-Monitor.png" alt-text="Screenshot of the Azure Monitor page in data sources.":::
142+
1. Azure Monitor is listed as a built-in data source for your Azure Managed Grafana instance. Select **Azure Monitor**.
143+
1. In the **Settings** tab, authenticate through **Managed Identity** and select your subscription from the dropdown list, or alternatively enter your **App Registration** details. When you select **Managed identity**, the authentication and authorization are made through the system-assigned or the user-assigned managed identity you [configured in your Azure Managed Grafana workspace](how-to-authentication-permissions.md). Using a managed identity lets you assign permissions for your Azure Managed Grafana instance to access Azure Monitor data without having to manually manage service principals in Microsoft Entra ID.
147144

148145
### [Azure CLI](#tab/azure-cli)
149146

articles/managed-grafana/how-to-deterministic-ip.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
2-
title: How to set up and use deterministic outbound APIs in Azure Managed Grafana
3-
description: Learn how to set up and use deterministic outbound APIs in Azure Managed Grafana
2+
title: How to set up and use deterministic outbound APIs
3+
titleSuffix: Azure Managed Grafana
4+
description: Learn how to activate deterministic outbound IP support used by Azure Managed Grafana to communicate with data sources.
45
ms.service: azure-managed-grafana
56
ms.topic: how-to
67
author: maud-lv
78
ms.author: malev
8-
ms.date: 10/06/2023
9+
ms.date: 12/20/2024
910
---
1011

1112
# Use deterministic outbound IPs

articles/managed-grafana/how-to-enable-zone-redundancy.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: How to enable zone redundancy in Azure Managed Grafana
3-
description: Learn how to create a zone-redundant Managed Grafana instance.
3+
description: Learn how to create a zone-redundant Managed Grafana instance for protection against datacenter failure.
44
ms.service: azure-managed-grafana
55
ms.topic: how-to
66
author: maud-lv
77
ms.author: malev
88
ms.custom: engagement-fy23
9-
ms.date: 10/06/2023
9+
ms.date: 12/20/2024
1010

1111
---
1212

@@ -39,7 +39,7 @@ Open your CLI and run the `az login` command to sign in to Azure.
3939
az login
4040
```
4141

42-
This command will prompt your web browser to launch and load an Azure sign-in page. If the browser fails to open, use device code flow with `az login --use-device-code`. For more sign-in options, go to [sign in with the Azure CLI](/cli/azure/authenticate-azure-cli).
42+
This command prompts your web browser to launch and load an Azure sign-in page. If the browser fails to open, use device code flow with `az login --use-device-code`. For more sign-in options, go to [sign in with the Azure CLI](/cli/azure/authenticate-azure-cli).
4343

4444
---
4545

@@ -62,7 +62,7 @@ Create a workspace and enable zone redundancy with the Azure portal or the CLI.
6262
| Subscription ID | Select the Azure subscription you want to use. | *my-subscription* |
6363
| Resource group name | Create a resource group for your Azure Managed Grafana resources. | *my-resource-group* |
6464
| Location | Specify the geographic location in which to host your resource. Choose the location closest to you. | *(US) East US* |
65-
| Name | Enter a unique resource name. It will be used as the domain name in your Managed Grafana instance URL. | *my-grafana* |
65+
| Name | Enter a unique resource name. It is used as the domain name in your Managed Grafana instance URL. | *my-grafana* |
6666
| Pricing plan | Select the **Standard** plan to get access to the zone redundancy feature. This feature is only available for customers using a [Standard plan](overview.md#service-tiers). | *Standard* |
6767
| Zone Redundancy | Set **Enable Zone Redundancy** to **Enable**. | *Enabled* |
6868

@@ -99,7 +99,7 @@ Create a workspace and enable zone redundancy with the Azure portal or the CLI.
9999
az grafana create --name <managed-grafana-resource-name> --resource-group <resource-group-name> --zone-redundancy enabled
100100
```
101101
102-
Once the deployment is complete, you'll see a note in the output of the command line stating that the instance was successfully created, alongside with additional information about the deployment.
102+
Once the deployment is complete, you see a note in the output of the command line stating that the instance was successfully created, alongside with additional information about the deployment.
103103
104104
> [!NOTE]
105105
> The CLI experience for Azure Managed Grafana is part of the amg extension for the Azure CLI (version 2.30.0 or higher). The extension will automatically install the first time you run an `az grafana` command.

articles/managed-grafana/how-to-manage-plugins.md

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: maud-lv
55
ms.author: malev
66
ms.service: azure-managed-grafana
77
ms.topic: how-to
8-
ms.date: 01/22/2024
8+
ms.date: 12/19/2024
99
---
1010

1111
# How to manage Grafana plugins
@@ -32,32 +32,26 @@ To install Grafana plugins, follow the process below.
3232
> [!NOTE]
3333
> This page only shows optional plugins. Core Grafana plugins that are included in your pricing plan by default aren't listed here.
3434
35-
1. Select a plugin to add to your Grafana instance by checking its checkbox. A refresh icon appears in the table next to the plugin you selected, indicating that a change is pending.
35+
1. Select a plugin to add to your Grafana instance by checking its checkbox.
3636

37-
:::image type="content" source="media/plugin-management/add-plugin.png" alt-text="Screenshot of the Plugin management feature data source page.":::
37+
:::image type="content" source="media/plugin-management/add-plugin.png" alt-text="Screenshot of the Plugin management feature data source page."lightbox="media/plugin-management/add-plugin.png":::
3838

39-
1. Select **Save**. Azure displays a message stating which plugins will be added or removed. Select **Yes** to confirm.
40-
1. An **Updating** status bar indicates that the update is in progress. The update might take a while.
41-
1. A notification appears, indicating if the update operation has been successful.
42-
1. Select **Refresh** above the table to get an updated list of installed plugins.
39+
1. Select **Save**. Azure displays a message stating which plugins will be added or removed. Select **Yes** to confirm. Once the update is complete, a success message is displayed and the list of plugins is updated.
4340

4441
## Remove a plugin
4542

46-
To remove a plugin that isn't part of the Grafana built-in core plugins, follow the steps below:
43+
To remove a plugin that isn't part of the Grafana built-in core plugins, follow the steps below.
4744

48-
1. Open your Azure Managed Grafana instance in the Azure portal.
49-
1. Select **Plugin management**. This page displays a table with data source plugins. It contains three columns including checkboxes, plugin names, and plugin IDs. Review the checkboxes. A checked box indicates that the corresponding plugin is already installed and can be removed, an unchecked box indicates that the corresponding plugin can be added.
50-
1. Select a plugin to remove from your Grafana instance by unchecking its checkbox. A refresh icon appears in the table next to the plugin you selected, indicating that a change is pending.
45+
> [!CAUTION]
46+
> Removing a data source that is used in a dashboard will make the dashboard unable to collect the corresponding data and will trigger an error or result in no data being shown in the panel.
5147
52-
:::image type="content" source="media/plugin-management/remove-plugin.png" alt-text="Screenshot of the Plugin management feature data source page. Remove plugin.":::
48+
1. Open your Azure Managed Grafana instance in the Azure portal.
49+
1. Select **Plugin management**. This page displays a table with data source plugins. It contains three columns including checkboxes, plugin names, and plugin IDs. Installed plugins are displayed at the top of the list and have an **Installed** tag.
50+
1. Select a plugin to remove from your Grafana instance by checking its checkbox.
5351

54-
1. Select **Save**. Azure displays a message stating which plugins will be added or removed. Select **Yes** to confirm.
55-
1. An **Updating** status bar indicates that the update is in progress. The update might take a while.
56-
1. A notification appears, indicating if the update operation has been successful.
57-
1. Select **Refresh** above the table to get an updated list of installed plugins.
52+
:::image type="content" source="media/plugin-management/remove-plugin.png" alt-text="Screenshot of the Plugin management feature data source page. Remove plugin."lightbox="media/plugin-management/remove-plugin.png":::
5853

59-
> [!CAUTION]
60-
> Removing a data source that is used in a dashboard will make the dashboard unable to collect the corresponding data and will trigger an error or result in no data being shown in the panel.
54+
1. Select **Save**. Azure displays a message stating which plugins will be added or removed. Select **Yes** to confirm. Once the update is complete, a success message is displayed and the list of plugins is updated.
6155

6256
## Next steps
6357

articles/managed-grafana/how-to-set-up-private-access.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: maud-lv
77
ms.author: malev
88
ms.service: azure-managed-grafana
99
ms.topic: how-to
10-
ms.date: 01/31/2024
10+
ms.date: 12/19/2024
1111
ms.custom: how-to, devx-track-azurecli
1212
---
1313

@@ -161,7 +161,7 @@ Go to **Networking** > **Private Access** in your Azure Managed Grafana workspac
161161
162162
1. To manually approve, reject or remove a connection, select the checkbox next to the endpoint you want to edit and select an action item from the top menu.
163163
164-
1. Select the name of the private endpoint to open the private endpoint resource and access more information or to edit the private endpoint.
164+
1. Optionally select the name of the private endpoint to open the private endpoint resource and access more information or to edit the private endpoint.
165165
166166
:::image type="content" source="media/private-endpoints/create-endpoint-approval.png" alt-text="Screenshot of the Azure portal, manage private endpoint.":::
167167
@@ -207,6 +207,9 @@ For more CLI commands, go to [az network private-endpoint-connection](/cli/azure
207207

208208
If you have issues with a private endpoint, check the following guide: [Troubleshoot Azure Private Endpoint connectivity problems](../private-link/troubleshoot-private-endpoint-connectivity.md).
209209

210-
## Next steps
210+
## Next step
211211

212-
In this how-to guide, you learned how to set up private access from your users to an Azure Managed Grafana workspace. To learn how to configure private access between a Managed Grafana workspace and a data source, see [Connect to a data source privately](how-to-connect-to-data-source-privately.md).
212+
In this how-to guide, you learned how to set up private access from your users to an Azure Managed Grafana workspace. To learn how to configure private access between a Managed Grafana workspace and a data source, see:
213+
214+
> [!div class="nextstepaction"]
215+
> [Connect to a data source privately](how-to-connect-to-data-source-privately.md)

articles/managed-grafana/how-to-use-azure-monitor-alerts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Use Azure Monitor alerts with Azure Managed Grafana
3-
description: Learn how to set up Azure Monitor alerts and use them with Azure Managed Grafana
3+
description: Learn how to set up Azure Monitor alerts and use them with Azure Managed Grafana to monitor and respond to important events.
44
ms.service: azure-managed-grafana
55
ms.topic: how-to
66
author: maud-lv
77
ms.author: malev
8-
ms.date: 11/14/2023
8+
ms.date: 12/19/2024
99
---
1010

1111
# Use Azure Monitor alerts with Grafana
@@ -42,6 +42,6 @@ Define alert rules in Azure Monitor based on the type of alerts:
4242

4343
You can view alert state and conditions using the Azure Alert Consumption dashboard in your Azure Managed Grafana workspace.
4444

45-
## Next steps
45+
## Related content
4646

4747
In this how-to guide, you learned how to set up alerts for Azure Monitor and consume them in Azure Managed Grafana. To learn how to use Grafana alerts for other data sources, see [Grafana alerting](https://grafana.com/docs/grafana/latest/alerting/) and [setting up email notifications in Azure Managed Grafana](how-to-smtp-settings.md).
Binary file not shown.

0 commit comments

Comments
 (0)