Skip to content

Commit 6e99a6e

Browse files
authored
Merge pull request #292054 from maud-lv/ml-grafanacli2
Engagement updates
2 parents cd3b422 + 5e4162d commit 6e99a6e

File tree

4 files changed

+71
-43
lines changed

4 files changed

+71
-43
lines changed

articles/managed-grafana/index.yml

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,52 +33,76 @@ landingContent:
3333
linkLists:
3434
- linkListType: how-to-guide
3535
links:
36-
- text: Manage data sources
37-
url: how-to-data-source-plugins-managed-identity.md
38-
- text: Manage plugins
39-
url: how-to-manage-plugins.md
40-
- text: Add an Azure Monitor workspace
41-
url: how-to-connect-azure-monitor-workspace.md
4236
- text: Create a dashboard
4337
url: how-to-create-dashboard.md
38+
- text: Manage data sources
39+
url: how-to-data-source-plugins-managed-identity.md
4440
- text: Share a dashboard
4541
url: how-to-share-dashboard.md
4642
- text: Use reporting and image rendering
4743
url: how-to-use-reporting-and-image-rendering.md
44+
- text: Use service accounts
45+
url: how-to-service-accounts.md
46+
47+
- title: Manage data sources
48+
linkLists:
49+
- linkListType: how-to-guide
50+
links:
51+
- text: Manage data sources
52+
url: how-to-data-source-plugins-managed-identity.md
53+
- text: Manage plugins
54+
url: how-to-manage-plugins.md
55+
- text: Add an Azure Monitor workspace
56+
url: how-to-connect-azure-monitor-workspace.md
57+
- text: Configure Azure Data Explorer
58+
url: how-to-connect-azure-data-explorer.md
59+
- text: Enable Grafana Enterprise
60+
url: how-to-grafana-enterprise.md
61+
- linkListType: tutorial
62+
links:
63+
- text: Connect to self-hosted Prometheus via managed private endpoint
64+
url: tutorial-mpe-oss-prometheus.md
4865

4966
- title: Manage access and networking
5067
linkLists:
5168
- linkListType: how-to-guide
5269
links:
53-
- text: Share an instance
70+
- text: Share a workspace
5471
url: how-to-share-grafana-workspace.md
55-
- text: Use Microsoft Entra groups
56-
url: how-to-sync-teams-with-entra-groups.md
5772
- text: Set up authentication and permissions
5873
url: how-to-authentication-permissions.md
74+
- text: Use Microsoft Entra groups
75+
url: how-to-sync-teams-with-entra-groups.md
5976
- text: Modify access to Azure Monitor
6077
url: how-to-permissions.md
6178
- text: Connect to a data source privately
6279
url: how-to-connect-to-data-source-privately.md
6380
- text: Set up private access
6481
url: how-to-set-up-private-access.md
65-
- text: Connect to self-hosted Prometheus via managed private endpoint
66-
url: tutorial-mpe-oss-prometheus.md
6782
- text: Call Grafana APIs programmatically
6883
url: how-to-api-calls.md
6984
- text: Grafana settings
7085
url: grafana-settings.md
71-
72-
- title: Set up Grafana monitoring
86+
- text: Use deterministic outbound IPs
87+
url: how-to-deterministic-ip.md
88+
- linkListType: concept
89+
links:
90+
- text: Encryption
91+
url: encryption.md
92+
- text: Azure RBAC
93+
url: concept-role-based-access-control.md
94+
- title: Configure monitoring
7395
linkLists:
7496
- linkListType: how-to-guide
7597
links:
7698
- text: Monitor an instance
7799
url: how-to-monitor-managed-grafana-workspace.md
78100
- text: Configure SMTP settings
79101
url: how-to-smtp-settings.md
102+
- text: Use Azure Monitor alerts with Grafana
103+
url: how-to-use-azure-monitor-alerts.md
80104

81-
- title: Manage availability
105+
- title: Understand availability
82106
linkLists:
83107
- linkListType: concept
84108
links:

articles/managed-grafana/known-limitations.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
2-
title: Azure Managed Grafana service limitations
2+
title: Azure Managed Grafana service limits
33
titlesuffix: Azure Managed Grafana
4-
description: Learn about current technical or feature limitations you may encounter in the Azure Managed Grafana service.
4+
description: Learn about current service limits, quotas, and constraints you may encounter using Azure Managed Grafana.
55
ms.service: azure-managed-grafana
66
ms.topic: troubleshooting
7-
ms.date: 10/08/2024
7+
ms.date: 12/17/2024
88
ms.author: malev
99
ms.custom: engagement-fy23
1010
author: maud-lv
1111
---
1212

13-
# Limitations of Azure Managed Grafana
13+
# Service limits, quotas, and constraints
1414

1515
Azure Managed Grafana delivers the native Grafana functionality in the highest possible fidelity. There are some differences between what it provides and what you can get by self-hosting Grafana. As a general rule, Azure Managed Grafana disables features and settings that might affect the security or reliability of the service and individual Grafana instances it manages.
1616

17-
## Current limitations
17+
## Service limits
1818

1919
Azure Managed Grafana has the following known limitations:
2020

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,35 @@
11
---
2-
title: Create an Azure Managed Grafana instance using the Azure CLI
3-
description: Learn how to create a Managed Grafana instance using the Azure CLI
2+
title: Create an Azure Managed Grafana instance with the Azure CLI
3+
description: Learn how to get started with Azure Managed Grafana and create an Azure Managed Grafana instance using the Azure CLI.
44
ms.service: azure-managed-grafana
55
ms.topic: quickstart
66
author: maud-lv
77
ms.author: malev
8-
ms.date: 10/06/2023
8+
ms.date: 12/17/2024
99
ms.devlang: azurecli
1010
ms.custom: engagement-fy23, devx-track-azurecli
11+
# customer intent: As a developer or a data analyst, I want to create a new Azure Managed Grafana workspace using the Azure CLI.
1112
---
1213

1314
# Quickstart: Create an Azure Managed Grafana instance using the Azure CLI
1415

15-
Get started by creating an Azure Managed Grafana workspace using the Azure CLI. Creating a workspace will generate a Grafana instance.
16+
Get started using Azure Managed Grafana by creating an Azure Managed Grafana workspace using the Azure CLI.
1617

1718
>[!NOTE]
18-
> Azure Managed Grafana now has [two pricing plans](overview.md#service-tiers). This guides takes you through creating a new workspace in the Standard plan. To generate a workspace in the newly released Essential (preview) plan, [use the Azure portal](quickstart-managed-grafana-portal.md). We are working on enabling the creation of a workspace in the Essential (preview) plan using the Azure CLI.
19+
> Azure Managed Grafana has [two pricing plans](overview.md#service-tiers). This guides takes you through creating a new workspace in the Standard plan. To generate a workspace in the Essential (preview) plan, [use the Azure portal](quickstart-managed-grafana-portal.md).
1920

2021
## Prerequisites
2122

22-
- An Azure account for work or school and an active subscription. [Create an account for free](https://azure.microsoft.com/free).
23-
- The [Azure CLI](/cli/azure/install-azure-cli).
23+
- An Azure account for work or school with an active subscription. [Create an account for free](https://azure.microsoft.com/free).
24+
2425
- Minimum required role to create an instance: resource group Contributor.
26+
2527
- Minimum required role to access an instance: resource group Owner.
2628
>[!NOTE]
2729
> If you don't meet this requirement, once you've created a new Azure Managed Grafana instance, ask a User Access Administrator, subscription Owner or resource group Owner to grant you a Grafana Admin, Grafana Editor or Grafana Viewer role on the instance.
2830

31+
[!INCLUDE [azure-cli-prepare-your-environment-no-header.md](~/reusable-content/azure-cli/azure-cli-prepare-your-environment-no-header.md)]
32+
2933
## Sign in to Azure
3034

3135
Open your CLI and run the `az login` command:
@@ -34,26 +38,26 @@ Open your CLI and run the `az login` command:
3438
az login
3539
```
3640

37-
This command will prompt your web browser to launch and load an Azure sign-in page.
41+
This command prompts your web browser to launch and load an Azure sign-in page.
3842

39-
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 the `az grafana` command.
43+
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 automatically installs the first time you run the `az grafana` command.
4044

4145
## Create a resource group
4246

43-
Run the code below to create resource group to organize the Azure resources needed to complete this quickstart. Skip this step if you already have a resource group you want to use.
47+
Run the following code to create a resource group to organize the Azure resources needed to complete this quickstart. Skip this step if you already have a resource group you want to use.
4448

4549
| Parameter | Description | Example |
4650
|--------------|-----------------------------------------------------------------------------------------|----------|
4751
| --name | Choose a unique name for your new resource group. | *grafana-rg* |
48-
| --location | Choose an Azure region where Managed Grafana is available. For more info, go to [Products available by region](https://azure.microsoft.com/global-infrastructure/services/?products=managed-grafana).| *eastus* |
52+
| --location | Choose an Azure region where Azure Managed Grafana is available. For more info, go to [Products available by region](https://azure.microsoft.com/global-infrastructure/services/?products=managed-grafana).| *eastus* |
4953

5054
```azurecli
5155
az group create --location <location> --name <resource-group-name>
5256
```
5357

5458
## Create an Azure Managed Grafana workspace
5559

56-
Run the code below to create an Azure Managed Grafana workspace.
60+
Run the following code to create an Azure Managed Grafana workspace.
5761

5862
| Parameter | Description | Example |
5963
|--------------|-----------------------------------------------------------------------------------------|----------|
@@ -64,30 +68,30 @@ Run the code below to create an Azure Managed Grafana workspace.
6468
az grafana create --name <managed-grafana-resource-name> --resource-group <resource-group-name>
6569
```
6670

67-
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.
71+
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.
6872

6973
> [!NOTE]
70-
>Azure Managed Grafana has a system-assigned managed identity enabled by default. You can use a user-assigned managed identity or a service principal instead. To learn more, go to [Set up Azure Managed Grafana authentication and permissions (preview)](how-to-authentication-permissions.md).
74+
> Azure Managed Grafana has a system-assigned managed identity enabled by default. You can use a user-assigned managed identity or a service principal instead. To learn more, go to [Set up Azure Managed Grafana authentication and permissions (preview)](how-to-authentication-permissions.md).
7175

7276
## Access your new Managed Grafana instance
7377

7478
Now let's check if you can access your new Managed Grafana instance.
7579

7680
1. Take note of the **endpoint** URL ending by `eus.grafana.azure.com`, listed in the CLI output.
7781

78-
1. Open a browser and enter the endpoint URL. Single sign-on via Microsoft Entra ID has been configured for you automatically. If prompted, enter your Azure account. You should now see your Azure Managed Grafana instance. From there, you can finish setting up your Grafana installation.
82+
1. Open a browser and enter the endpoint URL. Single sign-on via Microsoft Entra ID is automatically configured. If prompted, log in with your Azure account. You should now see your Azure Managed Grafana instance. From there, you can finish setting up your Grafana installation.
7983

8084
:::image type="content" source="media/quickstart-portal/grafana-ui.png" alt-text="Screenshot of a Managed Grafana instance.":::
8185

82-
You can now start interacting with the Grafana application to configure data sources, create dashboards, reports and alerts. Suggested read: [Monitor Azure services and applications using Grafana](/azure/azure-monitor/visualize/grafana-plugin).
83-
8486
## Clean up resources
8587

8688
In the preceding steps, you created an Azure Managed Grafana workspace in a new resource group. If you don't expect to need these resources again in the future, delete the resource group.
8789

8890
`az group delete -n <resource-group-name> --yes`
8991

90-
## Next steps
92+
## Related content
93+
94+
You can now start interacting with the Grafana application to configure data sources, create dashboards, reports, and alerts. Suggested read:
9195

92-
> [!div class="nextstepaction"]
93-
> [How to configure data sources for Azure Managed Grafana](./how-to-data-source-plugins-managed-identity.md)
96+
- [Monitor Azure services and applications using Grafana](/azure/azure-monitor/visualize/grafana-plugin).
97+
- [Configure data sources for Azure Managed Grafana](./how-to-data-source-plugins-managed-identity.md)

articles/managed-grafana/toc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ items:
55
items:
66
- name: About Azure Managed Grafana
77
href: overview.md
8+
- name: Service limits
9+
href: known-limitations.md
810
- name: Quickstarts
911
expanded: true
1012
items:
@@ -64,15 +66,15 @@ items:
6466
href: how-to-create-dashboard.md
6567
- name: Share a dashboard
6668
href: how-to-share-dashboard.md
69+
- name: Use reporting and image rendering
70+
href: how-to-use-reporting-and-image-rendering.md
6771
- name: Alerts and notifications
6872
expanded: false
6973
items:
7074
- name: Use Azure Monitor alerts with Grafana
7175
href: how-to-use-azure-monitor-alerts.md
7276
- name: Configure SMTP settings
7377
href: how-to-smtp-settings.md
74-
- name: Use reporting and image rendering
75-
href: how-to-use-reporting-and-image-rendering.md
7678
- name: Networking
7779
expanded: false
7880
items:
@@ -100,8 +102,6 @@ items:
100102
href: how-to-migrate.md
101103
- name: Troubleshoot common issues
102104
href: troubleshoot-managed-grafana.md
103-
- name: Known limitations
104-
href: known-limitations.md
105105
- name: Reference
106106
items:
107107
- name: Azure CLI

0 commit comments

Comments
 (0)