Skip to content

Commit 864ee2b

Browse files
committed
PR review
1 parent dc2cd22 commit 864ee2b

8 files changed

+16
-16
lines changed

articles/managed-grafana/high-availability.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ author: maud-lv
55
ms.author: malev
66
ms.service: managed-grafana
77
ms.topic: conceptual
8-
ms.date: 10/06/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 doesn't offer the same reliability and isn't recommended for use in production.
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.
1515

1616
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.
1717

articles/managed-grafana/how-to-authentication-permissions.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: 10/06/2023
8+
ms.date: 10/13/2023
99
ms.custom: engagement-fy23
1010
---
1111

@@ -59,7 +59,7 @@ 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-
| Pricing Plan | Choose between an Essential and a Standard plan. The Standard tier offers additional features. [More information about pricing plans](overview.md#service-tiers). | *Essential* |
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

6464
1. Keep all other default values and select the tab **Permission** to control access rights for your Grafana instance and data sources:
6565

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

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

1111
# How to configure data sources for Azure Managed Grafana
@@ -20,7 +20,7 @@ By design, Grafana can be configured with multiple *data sources*. A data source
2020

2121
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.
2222

23-
| Data sources | Essential | Standard |
23+
| Data sources | Essential (preview) | Standard |
2424
|-------------------------------------------------------------------------------------------------------------------------------|-----------|----------|
2525
| [Alertmanager](https://grafana.com/docs/grafana/latest/datasources/alertmanager/) | - ||
2626
| [AWS CloudWatch](https://grafana.com/docs/grafana/latest/datasources/aws-cloudwatch/) | - ||

articles/managed-grafana/how-to-smtp-settings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: maud-lv
66
ms.author: malev
77
ms.service: managed-grafana
88
ms.topic: how-to
9-
ms.date: 09/29/2023
9+
ms.date: 10/13/2023
1010
---
1111

1212
# Configure SMTP settings
@@ -20,7 +20,7 @@ SMTP settings can be enabled on an existing Azure Managed Grafana instance via t
2020
To follow the steps in this guide, you must have:
2121

2222
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free).
23-
- An Azure Managed Grafana instance in the Standrd tier. If you don't have one yet, [create a new instance](quickstart-managed-grafana-portal.md).
23+
- An Azure Managed Grafana instance in the Standard plan. If you don't have one yet, [create a new instance](quickstart-managed-grafana-portal.md).
2424
- An SMTP server. If you don't have one yet, you may want to consider using [Twilio SendGrid's email API for Azure](https://azuremarketplace.microsoft.com/marketplace/apps/sendgrid.tsg-saas-offer).
2525

2626
## Enable and configure SMTP settings

articles/managed-grafana/known-limitations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Azure Managed Grafana has the following known limitations:
4242

4343
## Quotas
4444

45-
The following quotas apply to the Essential and Standard tiers.
45+
The following quotas apply to the Essential (preview) and Standard plans.
4646

4747
| Limit | Description | Essential | Standard |
4848
|--------------------------------------|-----------------------------------------------------------------------------------------------------|-----------------|------------------|
@@ -59,4 +59,4 @@ The following quotas apply to the Essential and Standard tiers.
5959

6060
> [!div class="nextstepaction"]
6161
> [Troubleshooting](./troubleshoot-managed-grafana.md)
62-
> [Support](./find-help-open-support-ticket.md)
62+
> [Support](./find-help-open-support-ticket.md)

articles/managed-grafana/overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ Azure Managed Grafana is available in the two service tiers presented below.
3838

3939
| Tier | Description |
4040
|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
41-
| Essential | Provides the core Grafana functionalities in use with Azure data sources. Since it doesn't provide an SLA guarantee, this tier should be used only for non-production environments. |
41+
| Essential (preview) | Provides the core Grafana functionalities in use with Azure data sources. Since it doesn't provide an SLA guarantee, this tier should be used only for non-production environments. |
4242
| Standard | The default tier, offering better performance, more features and an SLA. It's recommended for most situations. |
4343

4444
The [Azure Managed Grafana pricing page](https://azure.microsoft.com/pricing/details/managed-grafana/) gives more information on these tiers and the following table lists which main features are supported in each tier:
4545

46-
| Feature | Essential | Standard |
46+
| Feature | Essential (preview) | Standard |
4747
|------------------------------------------------------------------------------------------|-------------------------------------|-----------------------------------------------------------------------------------------------------------------|
4848
| [Zone redundancy](how-to-enable-zone-redundancy.md) | - | ✔ |
4949
| [Deterministic outbound IPs](how-to-deterministic-ip.md) | - | ✔ |
@@ -56,11 +56,11 @@ The [Azure Managed Grafana pricing page](https://azure.microsoft.com/pricing/det
5656
| [Grafana Enterprise](how-to-grafana-enterprise.md) | - | Optional, with licensing costs |
5757

5858
> [!NOTE]
59-
> Users can upgrade an instance from Essential to Standard by going to **Settings** > **Configuration** > **Pricing Plans**. Downgrading from Standard to Essential however isn't supported.
59+
> Users can upgrade an instance from Essential (preview) to Standard by going to **Settings** > **Configuration** > **Pricing Plans**. Downgrading from Standard to Essential (preview) however isn't supported.
6060

6161
## Quotas
6262

63-
Different quotas apply to Azure Managed Grafana service instances depending on their service tiers. For a list of the quotas that apply to the Essential and Standard pricing plans, see [quotas](known-limitations.md#quotas).
63+
Different quotas apply to Azure Managed Grafana service instances depending on their service tiers. For a list of the quotas that apply to the Essential (preview) and Standard pricing plans, see [quotas](known-limitations.md#quotas).
6464

6565
## Next steps
6666

articles/managed-grafana/quickstart-managed-grafana-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: engagement-fy23, devx-track-azurecli
1515
Get started by creating an Azure Managed Grafana workspace using the Azure CLI. Creating a workspace will generate an Azure Managed Grafana instance.
1616

1717
> [!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 plan, [use the Azure portal](quickstart-managed-grafana-portal.md). We are working on enabling the creation of a workspace in the Essential plan using the Azure CLI.
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.
1919

2020
## Prerequisites
2121

articles/managed-grafana/quickstart-managed-grafana-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Get started by creating an Azure Managed Grafana workspace using the Azure porta
3939
| Resource group name | *my-resource-group* | Create a resource group for your Azure Managed Grafana resources. |
4040
| Location | *(US) East US* | Use Location to specify the geographic location in which to host your resource. Choose the location closest to you. |
4141
| Name | *my-grafana* | Enter a unique resource name. It will be used as the domain name in your Managed Grafana instance URL. |
42-
| Pricing Plan | *Essential* | Choose between the Essential or the Standard plan. The Essential plan is the cheapest option you can use to evaluate the service. This plan isn't recommended for production use. For more information about Azure Managed Grafana plans, go to [pricing plans](overview.md#service-tiers). |
42+
| Pricing Plan | *Essential (preview)* | Choose between the Essential (preview) or the Standard plan. The Essential plan is the cheapest option you can use to evaluate the service. This plan isn't recommended for production use. For more information about Azure Managed Grafana plans, go to [pricing plans](overview.md#service-tiers). |
4343

4444
1. If you've chosen the Standard plan, optionally enable zone redundancy for your new instance.
4545
1. Select **Next : Advanced >** to access additional options:

0 commit comments

Comments
 (0)