Skip to content

Commit 23758ab

Browse files
committed
PR review updates
1 parent be7c4f6 commit 23758ab

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

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

Lines changed: 2 additions & 3 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: 09/29/2023
8+
ms.date: 10/27/2023
99
ms.custom: how-to, devx-track-azurecli
1010
---
1111

@@ -29,7 +29,6 @@ Public access is enabled by default when you create an Azure Grafana workspace.
2929
> [!NOTE]
3030
> When private access (preview) is enabled, pinging charts using the [*Pin to Grafana*](../azure-monitor/visualize/grafana-plugin.md#pin-charts-from-the-azure-portal-to-azure-managed-grafana) feature will no longer work as the Azure portal can’t access a Managed Grafana workspace on a private IP address.
3131
32-
instance
3332
### [Portal](#tab/azure-portal)
3433

3534
1. Navigate to your Azure Managed Grafana workspace in the Azure portal.
@@ -95,7 +94,7 @@ Once you have disabled public access, set up a [private endpoint](../private-lin
9594

9695
1. Select **Next : DNS >** to configure a DNS record. If you don't want to make changes to the default settings, you can move forward to the next tab.
9796

98-
1. For **Integrate with private DNS zone**, select **Yes** to integrate your private endpoint with a private DNS zone. You may also use your own DNS servers or create DNS records using the host files on your virtual machines.
97+
1. For **Integrate with private DNS zone**, select **Yes** to integrate your private endpoint with a private DNS zone. You can also use your own DNS servers or create DNS records using the host files on your virtual machines.
9998

10099
1. A subscription and resource group for your private DNS zone are preselected. You can change them optionally.
101100

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ ms.date: 10/13/2023
1313

1414
In this guide, you learn how to configure SMTP settings to generate email alerts in Azure Managed Grafana. Notifications alert users when some given scenarios occur on a Grafana dashboard.
1515

16-
SMTP settings can be enabled on an existing Azure Managed Grafana instance via the Azure Portal and the Azure CLI. Enabling SMTP settings while creating a new instance is currently not supported.
16+
SMTP settings can be enabled on an existing Azure Managed Grafana instance via the Azure portal and the Azure CLI. Enabling SMTP settings while creating a new instance is currently not supported.
1717

1818
## Prerequisites
1919

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).
2323
- 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).
24-
- 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).
24+
- An SMTP server. If you don't have one yet, you might 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
2727

@@ -45,7 +45,7 @@ Follow these steps to activate SMTP settings, enable email notifications and con
4545
| Skip Verify | Disable |This setting controls whether a client verifies the server's certificate chain and host name. If **Skip Verify** is **Enable**, client accepts any certificate presented by the server and any host name in that certificate. In this mode, TLS is susceptible to machine-in-the-middle attacks unless custom verification is used. Default is **Disable** (toggled off). [More information](https://pkg.go.dev/crypto/tls#Config). |
4646
| StartTLS Policy | OpportunisticStartTLS | There are three options. [More information](https://pkg.go.dev/github.com/go-mail/mail#StartTLSPolicy).<br><ul><li>**OpportunisticStartTLS** means that SMTP transactions are encrypted if STARTTLS is supported by the SMTP server. Otherwise, messages are sent in the clear. It's the default setting.</li><li>**MandatoryStartTLS** means that SMTP transactions must be encrypted. SMTP transactions are aborted unless STARTTLS is supported by the SMTP server.</li><li>**NoStartTLS** means encryption is disabled and messages are sent in the clear.</li></ul> |
4747

48-
1. Select **Save** to save the SMTP settings. Updating may take a couple of minutes.
48+
1. Select **Save** to save the SMTP settings. Updating might take a couple of minutes.
4949

5050
:::image type="content" source="media/smtp-settings/save-updated-settings.png" alt-text="Screenshot of the Azure platform. Email Settings tab with new data.":::
5151

@@ -163,7 +163,7 @@ To disable SMTP settings, follow these steps.
163163
164164
Within the Grafana portal, you can find a list of all Grafana alerting error messages that occurred in **Alerting > Notifications**.
165165
166-
The following are some common error messages you may encounter:
166+
The following are some common error messages you might encounter:
167167
168168
- "Authentication failed: The provided authorization grant is invalid, expired, or revoked". Grafana couldn't connect to the SMTP server. Check if the password entered in the SMTP settings in the Azure portal is correct.
169169
- "Failed to sent test alert: SMTP not configured". SMTP is disabled. Open the Azure Managed Grafana instance in the Azure portal and enable SMTP settings.

articles/managed-grafana/known-limitations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ author: maud-lv
1111

1212
# Limitations of Azure Managed Grafana
1313

14-
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 may affect the security or reliability of the service and individual Grafana instances it manages.
14+
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.
1515

1616
## Current limitations
1717

@@ -21,7 +21,7 @@ Azure Managed Grafana has the following known limitations:
2121

2222
* Installing, uninstalling and upgrading plugins from the Grafana Catalog isn't possible.
2323

24-
* Querying Azure Data Explorer may take a long time or return 50x errors. To resolve these issues, use a table format instead of a time series, shorten the time duration, or avoid having many panels querying the same data cluster that can trigger throttling.
24+
* Querying Azure Data Explorer might take a long time or return 50x errors. To resolve these issues, use a table format instead of a time series, shorten the time duration, or avoid having many panels querying the same data cluster that can trigger throttling.
2525

2626
* Users can be assigned the following Grafana Organization level roles: Admin, Editor, or Viewer. The Grafana Server Admin role isn't available to customers.
2727

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

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

@@ -33,13 +33,13 @@ Get started by creating an Azure Managed Grafana workspace using the Azure porta
3333

3434
1. In the **Basics** pane, enter the following settings.
3535

36-
| Setting | Sample value | Description |
37-
|---------------------|---------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
38-
| Subscription ID | *my-subscription* | Select the Azure subscription you want to use. |
39-
| Resource group name | *my-resource-group* | Create a resource group for your Azure Managed Grafana resources. |
40-
| Location | *(US) East US* | Use Location to specify the geographic location in which to host your resource. Choose the location closest to you. |
41-
| 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 (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). |
36+
| Setting | Sample value | Description |
37+
|---------------------|---------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
38+
| Subscription ID | *my-subscription* | Select the Azure subscription you want to use. |
39+
| Resource group name | *my-resource-group* | Create a resource group for your Azure Managed Grafana resources. |
40+
| Location | *(US) East US* | Use Location to specify the geographic location in which to host your resource. Choose the location closest to you. |
41+
| 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 (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)