Skip to content

Commit aef91b6

Browse files
Merge pull request #252833 from maud-lv/ml-grafanasku
Add Essential SKU, update impacted docs
2 parents d2d0c29 + 23758ab commit aef91b6

26 files changed

+194
-150
lines changed

articles/managed-grafana/high-availability.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ author: maud-lv
55
ms.author: malev
66
ms.service: managed-grafana
77
ms.topic: conceptual
8-
ms.date: 3/23/2023
8+
ms.date: 10/13/2023
99
ms.custom: references_regions, engagement-fy23
1010
---
1111

1212
# Azure Managed Grafana service reliability
1313

14+
This article provides information on availability zone support, disaster recovery and availability of Azure Managed Grafana for instances in the Standard plan. The Essential plan (preview) doesn't offer the same reliability and isn't recommended for use in production.
15+
1416
An Azure Managed Grafana instance in the Standard tier is hosted on a dedicated set of virtual machines (VMs). By default, two VMs are deployed to provide redundancy. Each VM runs a Grafana server. A network load balancer distributes browser requests amongst the Grafana servers. On the backend, the Grafana servers are connected to a common database that stores the configuration and other persistent data for an entire Managed Grafana instance.
1517

1618
:::image type="content" source="media/service-reliability/diagram.png" alt-text="Diagram of the Managed Grafana Standard tier instance setup.":::
@@ -21,7 +23,7 @@ Microsoft is not providing or setting up disaster recovery for this service. In
2123

2224
## Zone redundancy
2325

24-
Normally the network load balancer, VMs and database that underpin a Managed Grafana instance are located in a region based on system resource availability, and could end up being in a same Azure datacenter.
26+
The network load balancer, VMs and database that underpin a Managed Grafana instance are located in a region based on system resource availability, and could end up being in a same Azure datacenter.
2527

2628
### With zone redundancy enabled
2729

@@ -45,7 +47,6 @@ Zone redundancy support is enabled in the following regions:
4547
| East US | West Europe | | Australia East |
4648
| South Central US | | | |
4749

48-
4950
For a complete list of regions where Managed Grafana is available, see [Products available by region - Azure Managed Grafana](https://azure.microsoft.com/explore/global-infrastructure/products-by-region/?products=managed-grafana&regions=all)
5051

5152
## Next steps

articles/managed-grafana/how-to-authentication-permissions.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.service: managed-grafana
55
ms.topic: how-to
66
author: maud-lv
77
ms.author: malev
8-
ms.date: 12/13/2022
8+
ms.date: 10/13/2023
99
ms.custom: engagement-fy23
1010
---
1111

@@ -43,7 +43,7 @@ Create a workspace with the Azure portal or the CLI.
4343

4444
### [Portal](#tab/azure-portal)
4545

46-
#### Create a workspace: basic and advanced settings
46+
#### Configure basic settings
4747

4848
1. In the upper-left corner of the home page, select **Create a resource**. In the **Search resources, services, and docs (G+/)** box, enter *Azure Managed Grafana* and select **Azure Managed Grafana**.
4949

@@ -59,15 +59,11 @@ Create a workspace with the Azure portal or the CLI.
5959
| Resource group name | Create a resource group for your Azure Managed Grafana resources. | *my-resource-group* |
6060
| Location | Use Location to specify the geographic location in which to host your resource. Choose the location closest to you. | *(US) East US* |
6161
| Name | Enter a unique resource name. It will be used as the domain name in your Managed Grafana instance URL. | *my-grafana* |
62-
| Zone redundancy | Zone redundancy is disabled by default. Zone redundancy automatically provisions and manages a standby replica of the Managed Grafana instance in a different availability zone within one region. There's an [additional charge](https://azure.microsoft.com/pricing/details/managed-grafana/#pricing) for this option. | *Disabled* |
62+
| Pricing Plan | Choose between an Essential (preview) and a Standard plan. The Standard tier offers additional features. [More information about pricing plans](overview.md#service-tiers). | *Essential (preview)* |
6363

64-
:::image type="content" source="media/authentication/create-form-basics.png" alt-text="Screenshot of the Azure portal. Create workspace form. Basics.":::
64+
1. Keep all other default values and select the tab **Permission** to control access rights for your Grafana instance and data sources:
6565

66-
1. Select **Next : Advanced >** to access API key creation and statics IP address options. **Enable API key creation** and **Deterministic outbound IP** options are set to **Disable** by default. Optionally enable API key creation and enable a static IP address.
67-
68-
1. Select **Next : Permission >** to control access rights for your Grafana instance and data sources:
69-
70-
#### Create a workspace: permission settings
66+
#### Configure permission settings
7167

7268
Review below different methods to manage permissions to access data sources within Azure Managed Grafana.
7369

@@ -99,13 +95,11 @@ Azure Managed Grafana can also access data sources with managed identity disable
9995
> [!NOTE]
10096
> Turning off system-assigned managed identity disables the Azure Monitor data source plugin for your Azure Managed Grafana instance. In this scenario, use a service principal instead of Azure Monitor to access data sources.
10197
102-
#### Create a workspace: tags and review + create
103-
104-
1. Select **Next : Tags** and optionally add tags to categorize resources.
98+
#### Review and create the new instance
10599

106-
1. Select **Next : Review + create >**. After validation runs, select **Create**. Your Azure Managed Grafana resource is deploying.
100+
Select the **Review + create** tab. After validation runs, select **Create**. Your Azure Managed Grafana resource is deploying.
107101

108-
:::image type="content" source="media/authentication/create-form-validation.png" alt-text="Screenshot of the Azure portal. Create workspace form. Validation.":::
102+
:::image type="content" source="media/authentication/create-form-validation.png" alt-text="Screenshot of the Azure portal. Create workspace form. Validation.":::
109103

110104
### [Azure CLI](#tab/azure-cli)
111105

articles/managed-grafana/how-to-connect-to-data-source-privately.md

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

1111
# Connect to a data source privately (preview)
@@ -36,7 +36,7 @@ Managed private endpoints work with Azure services that support private link. Us
3636
To follow the steps in this guide, you must have:
3737

3838
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free).
39-
- An Azure Managed Grafana instance. If you don't have one yet, [create a new instance](quickstart-managed-grafana-portal.md).
39+
- An Azure Managed Grafana instance in the Standard tier. If you don't have one yet, [create a new instance](quickstart-managed-grafana-portal.md).
4040

4141
## Create a managed private endpoint for Azure Monitor workspace
4242

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

Lines changed: 59 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -5,87 +5,79 @@ author: maud-lv
55
ms.author: malev
66
ms.service: managed-grafana
77
ms.topic: how-to
8-
ms.date: 1/12/2023
8+
ms.date: 10/13/2023
99
---
1010

1111
# How to configure data sources for Azure Managed Grafana
1212

1313
## Prerequisites
1414

15-
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free).
16-
- An Azure Managed Grafana instance. If you don't have one yet, [create an Azure Managed Grafana instance](./how-to-permissions.md).
17-
- A resource including monitoring data with Managed Grafana monitoring permissions. Read [how to configure permissions](how-to-permissions.md) for more information.
18-
19-
## Sign in to Azure
20-
21-
Sign in to the Azure portal at [https://portal.azure.com/](https://portal.azure.com/) with your Azure account.
15+
[An Azure Managed Grafana instance](./how-to-permissions.md)
2216

2317
## Supported Grafana data sources
2418

25-
By design, Grafana can be configured with multiple data sources. A data source is an externalized storage backend that holds your telemetry information. Azure Managed Grafana supports many popular data sources.
26-
27-
Azure-specific data sources available for all customers:
28-
29-
- [Azure Data Explorer](https://github.com/grafana/azure-data-explorer-datasource?utm_source=grafana_add_ds)
30-
- [Azure Monitor](https://grafana.com/docs/grafana/latest/datasources/azuremonitor/). Is preloaded in all Grafana instances.
31-
32-
Data sources reserved for Grafana Enterprise customers - exclusively preloaded in instances with a Grafana Enterprise subscription:
33-
34-
- [AppDynamics](https://grafana.com/grafana/plugins/dlopes7-appdynamics-datasource)
35-
- [Azure Devops](https://grafana.com/grafana/plugins/grafana-azuredevops-datasource)
36-
- [DataDog](https://grafana.com/grafana/plugins/grafana-datadog-datasource)
37-
- [Dynatrace](https://grafana.com/grafana/plugins/grafana-dynatrace-datasource)
38-
- [Gitlab](https://grafana.com/grafana/plugins/grafana-gitlab-datasource)
39-
- [Honeycomb](https://grafana.com/grafana/plugins/grafana-honeycomb-datasource)
40-
- [Jira](https://grafana.com/grafana/plugins/grafana-jira-datasource)
41-
- [MongoDB](https://grafana.com/grafana/plugins/grafana-mongodb-datasource)
42-
- [New Relic](https://grafana.com/grafana/plugins/grafana-newrelic-datasource)
43-
- [Oracle Database](https://grafana.com/grafana/plugins/grafana-oracle-datasource)
44-
- [Salesforce](https://grafana.com/grafana/plugins/grafana-salesforce-datasource)
45-
- [SAP HANA®](https://grafana.com/grafana/plugins/grafana-saphana-datasource)
46-
- [ServiceNow](https://grafana.com/grafana/plugins/grafana-servicenow-datasource)
47-
- [Snowflake](https://grafana.com/grafana/plugins/grafana-snowflake-datasource)
48-
- [Splunk](https://grafana.com/grafana/plugins/grafana-splunk-datasource)
49-
- [Splunk Infrastructure monitoring (SignalFx)](https://grafana.com/grafana/plugins/grafana-splunk-monitoring-datasource)
50-
- [Wavefront](https://grafana.com/grafana/plugins/grafana-wavefront-datasource)
51-
52-
Other data sources:
53-
54-
- [Alertmanager](https://grafana.com/docs/grafana/latest/datasources/alertmanager/)
55-
- [CloudWatch](https://grafana.com/docs/grafana/latest/datasources/aws-cloudwatch/)
56-
- Direct Input
57-
- [Elasticsearch](https://grafana.com/docs/grafana/latest/datasources/elasticsearch/)
58-
- [Google Cloud Monitoring](https://grafana.com/docs/grafana/latest/datasources/google-cloud-monitoring/)
59-
- [Graphite](https://grafana.com/docs/grafana/latest/datasources/graphite/)
60-
- [InfluxDB](https://grafana.com/docs/grafana/latest/datasources/influxdb/)
61-
- [Jaeger](https://grafana.com/docs/grafana/latest/datasources/jaeger/)
62-
- [Loki](https://grafana.com/docs/grafana/latest/datasources/loki/)
63-
- [Microsoft SQL Server](https://grafana.com/docs/grafana/latest/datasources/mssql/)
64-
- [MySQL](https://grafana.com/docs/grafana/latest/datasources/mysql/)
65-
- [OpenTSDB](https://grafana.com/docs/grafana/latest/datasources/opentsdb/)
66-
- [PostgreSQL](https://grafana.com/docs/grafana/latest/datasources/postgres/)
67-
- [Prometheus](https://grafana.com/docs/grafana/latest/datasources/prometheus/)
68-
- [Tempo](https://grafana.com/docs/grafana/latest/datasources/tempo/)
69-
- [TestData DB](https://grafana.com/docs/grafana/latest/datasources/testdata/)
70-
- [Zipkin](https://grafana.com/docs/grafana/latest/datasources/zipkin/)
19+
By design, Grafana can be configured with multiple *data sources*. A data source is an externalized storage backend that holds telemetry information.
20+
21+
Azure Managed Grafana supports many popular data sources. The table below lists the data sources that can be added to Azure Managed Grafana for each service tier.
22+
23+
| Data sources | Essential (preview) | Standard |
24+
|-------------------------------------------------------------------------------------------------------------------------------|-----------|----------|
25+
| [Alertmanager](https://grafana.com/docs/grafana/latest/datasources/alertmanager/) | - ||
26+
| [AWS CloudWatch](https://grafana.com/docs/grafana/latest/datasources/aws-cloudwatch/) | - ||
27+
| [Azure Data Explorer](https://github.com/grafana/azure-data-explorer-datasource?utm_source=grafana_add_ds) | - ||
28+
| [Azure Monitor](https://grafana.com/docs/grafana/latest/datasources/azuremonitor/) |||
29+
| [Elasticsearch](https://grafana.com/docs/grafana/latest/datasources/elasticsearch/) | - ||
30+
| [GitHub](https://grafana.com/docs/grafana-cloud/monitor-infrastructure/integrations/integration-reference/integration-github) | - ||
31+
| [Google Cloud Monitoring](https://grafana.com/docs/grafana/latest/datasources/google-cloud-monitoring/) | - ||
32+
| [Graphite](https://grafana.com/docs/grafana/latest/datasources/graphite/) | - ||
33+
| [InfluxDB](https://grafana.com/docs/grafana/latest/datasources/influxdb/) | - ||
34+
| [Jaeger](https://grafana.com/docs/grafana/latest/datasources/jaeger/) | - ||
35+
| [JSON API](https://grafana.com/grafana/plugins/grafana-jira-datasource) | - ||
36+
| [Loki](https://grafana.com/docs/grafana/latest/datasources/loki/) | - ||
37+
| [Microsoft SQL Server](https://grafana.com/docs/grafana/latest/datasources/mssql/) | - ||
38+
| [MySQL](https://grafana.com/docs/grafana/latest/datasources/mysql/) | - ||
39+
| [OpenTSDB](https://grafana.com/docs/grafana/latest/datasources/opentsdb/) | - ||
40+
| [PostgreSQL](https://grafana.com/docs/grafana/latest/datasources/postgres/) | - ||
41+
| [Prometheus](https://grafana.com/docs/grafana/latest/datasources/prometheus/) |||
42+
| [Tempo](https://grafana.com/docs/grafana/latest/datasources/tempo/) | - ||
43+
| [TestData](https://grafana.com/docs/grafana/latest/datasources/testdata/) |||
44+
| [Zipkin](https://grafana.com/docs/grafana/latest/datasources/zipkin/) | - ||
45+
46+
Within the Standard service tier, users who have subscribed to the Grafana Enterprise option can also access the following data sources.
47+
48+
* [AppDynamics](https://grafana.com/grafana/plugins/dlopes7-appdynamics-datasource)
49+
* [Azure Devops](https://grafana.com/grafana/plugins/grafana-azuredevops-datasource)
50+
* [DataDog](https://grafana.com/grafana/plugins/grafana-datadog-datasource)
51+
* [Dynatrace](https://grafana.com/grafana/plugins/grafana-dynatrace-datasource)
52+
* [GitLab](https://grafana.com/grafana/plugins/grafana-gitlab-datasource)
53+
* [Honeycomb](https://grafana.com/grafana/plugins/grafana-honeycomb-datasource)
54+
* [MongoDB](https://grafana.com/grafana/plugins/grafana-mongodb-datasource)
55+
* [New Relic](https://grafana.com/grafana/plugins/grafana-newrelic-datasource)
56+
* [Oracle Database](https://grafana.com/grafana/plugins/grafana-oracle-datasource)
57+
* [Salesforce](https://grafana.com/grafana/plugins/grafana-salesforce-datasource)
58+
* [SAP HANA®](https://grafana.com/grafana/plugins/grafana-saphana-datasource)
59+
* [ServiceNow](https://grafana.com/grafana/plugins/grafana-servicenow-datasource)
60+
* [Snowflake](https://grafana.com/grafana/plugins/grafana-snowflake-datasource)
61+
* [Splunk](https://grafana.com/grafana/plugins/grafana-splunk-datasource)
62+
* [Splunk Infrastructure monitoring (SignalFx)](https://grafana.com/grafana/plugins/grafana-splunk-monitoring-datasource)
63+
* [Wavefront](https://grafana.com/grafana/plugins/grafana-wavefront-datasource)
7164

7265
For more information about data sources, go to [Data sources](https://grafana.com/docs/grafana/latest/datasources/) on the Grafana Labs website.
7366

74-
## Add a datasource
67+
## Add a data source
7568

76-
A number of data sources are added by in your Grafana instance by default. To add more data sources, follow the steps below using the Azure portal or the Azure CLI.
69+
A number of data sources, such as Azure Monitor, are added to your Grafana instance by default. To add more data sources, follow the steps below using the Azure portal or the Azure CLI.
7770

7871
### [Portal](#tab/azure-portal)
7972

80-
1. Open the Grafana UI of your Azure Managed Grafana instance and select **Configuration** > **Data sources** from the left menu.
81-
1. Select **Add data source**, search for the data source you need from the available list, and select it.
73+
1. Open your Azure Managed Grafana instance in the Azure portal.
74+
1. Select **Overview** from the left menu, then open the **Endpoint** URL.
75+
1. In the Grafana portal, deploy the menu on the left and select **Connections**.
76+
1. Under Connect data, select a data source from the list, and add the data source to your instance.
8277
1. Fill out the form with the data source settings and select **Save and test** to validate the connection to your data source.
8378

8479
:::image type="content" source="media/data-sources/add-data-source.png" alt-text="Screenshot of the Add data source page.":::
8580

86-
> [!NOTE]
87-
> Installing Grafana plugins listed on the page **Configuration** > **Plugins** isn’t currently supported.
88-
8981
### [Azure CLI](#tab/azure-cli)
9082

9183
Run the [az grafana data-source create](/cli/azure/grafana/data-source#az-grafana-data-source-create) command to add and manage Azure Managed Grafana data sources with the Azure CLI.
@@ -113,15 +105,18 @@ az grafana data-source create --name <instance-name> --definition '{
113105

114106
---
115107

108+
> [!TIP]
109+
> If you can't connect to a data source, you may need to [modify access permissions](how-to-permissions.md) to allow access from your Azure Managed Grafana instance.
110+
116111
## Update a data source
117112

118113
### Azure Monitor configuration
119114

120-
The Azure Monitor data source is automatically added to all new Managed Grafana resources. To review or modify its configuration, follow these steps below in the Grafana UI of your Azure Managed Grafana instance or in the Azure CLI.
115+
The Azure Monitor data source is automatically added to all new Managed Grafana resources. To review or modify its configuration, follow the steps below in the Grafana portal of your Azure Managed Grafana instance or in the Azure CLI.
121116

122117
### [Portal](#tab/azure-portal)
123118

124-
1. From the left menu, select **Configuration** > **Data sources**.
119+
1. Deploy the menu on the left and select **Connections** > **Data sources**.
125120

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

@@ -173,7 +168,7 @@ az grafana data-source update --data-source 'Azure Monitor' --name <instance-nam
173168
---
174169

175170
> [!NOTE]
176-
> User-assigned managed identity isn't supported currently.
171+
> User-assigned managed identity isn't currently supported.
177172
178173
### Azure Data Explorer configuration
179174

0 commit comments

Comments
 (0)