Skip to content

Commit f140fac

Browse files
committed
Additional bulk fixes
1 parent 9134ca1 commit f140fac

11 files changed

+22
-22
lines changed

articles/managed-grafana/faq.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ No. Azure Managed Grafana hosts a commercial version called [Grafana Enterprise]
1919
> [!NOTE]
2020
> [Grafana Enterprise plugins](https://grafana.com/grafana/plugins/?enterprise=1&orderBy=weight&direction=asc) aren't included in the base service. They're purchasable as a separately licensed [add-on option](./how-to-grafana-enterprise.md) for Azure Managed Grafana.
2121
22-
## Does Managed Grafana encrypt my data?
22+
## Does Azure Managed Grafana encrypt my data?
2323

2424
Yes. Azure Managed Grafana always encrypts all data at rest and in transit. It supports [encryption at rest](./encryption.md) using Microsoft-managed keys. All network communication is over TLS 1.2. You can further restrict network traffic using a [private link](./how-to-set-up-private-access.md) for connecting to Grafana and [managed private endpoints](./how-to-connect-to-data-source-privately.md) for data sources.
2525

@@ -33,7 +33,7 @@ No. Azure Managed Grafana uses its implementation for Microsoft Entra authentica
3333

3434
## Can I install more plugins?
3535

36-
No. Currently all Grafana plugins are preinstalled. Managed Grafana supports all popular plugins for Azure data sources.
36+
No. Currently all Grafana plugins are preinstalled. Azure Managed Grafana supports all popular plugins for Azure data sources.
3737

3838
## In terms of pricing, what constitutes an active user in Azure Managed Grafana?
3939

articles/managed-grafana/how-to-api-calls.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Sign in to the Azure portal at [https://portal.azure.com/](https://portal.azure.
3333

3434
## Assign an Azure Managed Grafana role to the service principal of your application
3535

36-
1. In the Azure portal, open your Managed Grafana workspace.
36+
1. In the Azure portal, open your Azure Managed Grafana workspace.
3737
1. Select **Access control (IAM)** in the navigation menu.
3838
1. Select **Add**, then **Add role assignment**.
3939
1. Select the **Grafana Editor** role and then **Next**.
@@ -77,7 +77,7 @@ You now need to gather some information, which you'll use to get a Grafana API a
7777
1. Find the Grafana endpoint URL:
7878

7979
1. In the Azure portal, enter *Azure Managed Grafana* in the **Search resources, services, and docs (G+ /)** bar.
80-
1. Select **Azure Managed Grafana** and open your Managed Grafana workspace.
80+
1. Select **Azure Managed Grafana** and open your Azure Managed Grafana workspace.
8181
1. Select **Overview** from the left menu and save the **Endpoint** value.
8282

8383
:::image type="content" source="media/tutorial-api/endpoint-url.png" alt-text="Screenshot of the Azure platform. Endpoint displayed in the Overview page.":::

articles/managed-grafana/how-to-create-dashboard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ A Grafana dashboard contains panels and rows. You can import a Grafana dashboard
2727

2828
## Import a Grafana dashboard
2929

30-
To quickly create a dashboard, import an existing dashboard and add it to your Managed Grafana workspace. You can do so by importing a dashboard template from Grafana Labs, uploading a JSON file or pasting JSON code.
30+
To quickly create a dashboard, import an existing dashboard and add it to your Azure Managed Grafana workspace. You can do so by importing a dashboard template from Grafana Labs, uploading a JSON file or pasting JSON code.
3131

3232
### Import a dashboard from Grafana Labs
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ The content below shows how to configure some of the most popular data sources i
131131

132132
### Azure Monitor
133133

134-
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 workspace or in the Azure CLI.
134+
The Azure Monitor data source is automatically added to all new Azure Managed Grafana resources. To review or modify its configuration, follow the steps below in the Grafana portal of your Azure Managed Grafana workspace or in the Azure CLI.
135135

136136
### [Portal](#tab/azure-portal)
137137

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: How to enable zone redundancy in Azure Managed Grafana
3-
description: Learn how to create a zone-redundant Managed Grafana workspace for protection against datacenter failure.
3+
description: Learn how to create a zone-redundant Azure Managed Grafana workspace for protection against datacenter failure.
44
ms.service: azure-managed-grafana
55
ms.topic: how-to
66
author: maud-lv
@@ -12,9 +12,9 @@ ms.date: 12/20/2024
1212

1313
# Enable zone redundancy in Azure Managed Grafana
1414

15-
Azure Managed Grafana offers a zone-redundant option to protect your workspace against datacenter failure. Enabling zone redundancy for Managed Grafana lets you deploy your Managed Grafana resources across a minimum of three [Azure availability zones](../reliability/availability-zones-region-support.md) within the same Azure region.
15+
Azure Managed Grafana offers a zone-redundant option to protect your workspace against datacenter failure. Enabling zone redundancy for Azure Managed Grafana lets you deploy your Azure Managed Grafana resources across a minimum of three [Azure availability zones](../reliability/availability-zones-region-support.md) within the same Azure region.
1616

17-
In this how-to guide, learn how to enable zone redundancy for Azure Managed Grafana during the creation of your Managed Grafana workspace.
17+
In this how-to guide, learn how to enable zone redundancy for Azure Managed Grafana during the creation of your Azure Managed Grafana workspace.
1818

1919
> [!NOTE]
2020
> Zone redundancy for Azure Managed Grafana is a billable option. [See prices](https://azure.microsoft.com/pricing/details/managed-grafana/#pricing). Zone redundancy can only be enabled when creating the Azure Managed Grafana workspace, and can't be modified subsequently.
@@ -62,11 +62,11 @@ 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 is used as the domain name in your Managed Grafana workspace URL. | *my-grafana* |
65+
| Name | Enter a unique resource name. It is used as the domain name in your Azure Managed Grafana workspace 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

69-
Zone redundancy automatically provisions and manages a standby replica of the Managed Grafana workspace 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.
69+
Zone redundancy automatically provisions and manages a standby replica of the Azure Managed Grafana workspace 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.
7070

7171
1. Keep all other options set to their default values and select **Review + create**.
7272

@@ -81,7 +81,7 @@ Create a workspace and enable zone redundancy with the Azure portal or the CLI.
8181
| Parameter | Description | Example |
8282
|------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
8383
| --name | Choose a unique name for your new resource group. | *grafana-rg* |
84-
| --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* |
84+
| --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* |
8585

8686
```azurecli
8787
az group create --location <location> --name <resource-group-name>
@@ -91,8 +91,8 @@ Create a workspace and enable zone redundancy with the Azure portal or the CLI.
9191
9292
| Parameter | Description | Example |
9393
|-------------------|------------------------------------------------------------------|-----------------------------|
94-
| --name | Choose a unique name for your new Managed Grafana workspace. | *grafana-test* |
95-
| --resource-group | Choose a resource group for your Managed Grafana workspace. | *my-resource-group* |
94+
| --name | Choose a unique name for your new Azure Managed Grafana workspace. | *grafana-test* |
95+
| --resource-group | Choose a resource group for your Azure Managed Grafana workspace. | *my-resource-group* |
9696
| --zone-redundancy | Enter `enabled` to enable zone redundancy for this new workspace. | *--zone-redundancy enabled* |
9797
9898
```azurecli

articles/managed-grafana/how-to-manage-access-permissions-users-identities.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This guide walks you through the supported Grafana roles and shows you how to us
2121
## Prerequisites
2222

2323
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free).
24-
- An Azure Managed Grafana workspace. If you don't have one yet, [create a Managed Grafana workspace](./how-to-permissions.md).
24+
- An Azure Managed Grafana workspace. If you don't have one yet, [create an Azure Managed Grafana workspace](./how-to-permissions.md).
2525
- You must have Grafana Admin permissions on the workspace.
2626

2727
## Learn about Grafana roles

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ You can create up to five different diagnostic settings to send different logs t
5757

5858
Now that you've configured your diagnostic settings, Azure streams all new events to your selected destinations and generate logs. You can now create queries and access logs to monitor your application.
5959

60-
1. In your Managed Grafana workspace, select **Logs** from the left menu. The Azure platform displays a **Queries** page, with suggestions of queries to choose from.
60+
1. In your Azure Managed Grafana workspace, select **Logs** from the left menu. The Azure platform displays a **Queries** page, with suggestions of queries to choose from.
6161

6262
:::image type="content" source="media/monitoring-logs/menu.png" alt-text="Screenshot of the Azure platform. Open Logs.":::
6363

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ To edit permissions for a specific resource, follow these steps.
4848

4949
:::image type="content" source="media/permissions/permissions-members.png" alt-text="Screenshot of the Azure platform selecting members.":::
5050

51-
1. Select the **Subscription** containing your Managed Grafana workspace.
51+
1. Select the **Subscription** containing your Azure Managed Grafana workspace.
5252
1. For **Managed identity**, select **Azure Managed Grafana**.
53-
1. Select one or several Managed Grafana workspaces.
53+
1. Select one or several Azure Managed Grafana workspaces.
5454
1. Click **Select** to confirm
5555

5656
:::image type="content" source="media/permissions/permissions-managed-identities.png" alt-text="Screenshot of the Azure platform selecting the workspace.":::
5757

5858
1. Select **Next**, then **Review + assign** to confirm the assignment of the new permission.
5959

60-
For more information about how to use Managed Grafana with Azure Monitor, go to [Monitor your Azure services in Grafana](/azure/azure-monitor/visualize/grafana-plugin).
60+
For more information about how to use Azure Managed Grafana with Azure Monitor, go to [Monitor your Azure services in Grafana](/azure/azure-monitor/visualize/grafana-plugin).
6161

6262
### [Azure CLI](#tab/azure-cli)
6363

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ If you have issues with a private endpoint, check the following guide: [Troubles
209209

210210
## 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:
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 an Azure Managed Grafana workspace and a data source, see:
213213

214214
> [!div class="nextstepaction"]
215215
> [Connect to a data source privately](how-to-connect-to-data-source-privately.md)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Follow these steps to activate SMTP settings, enable email notifications and con
8989
> Here are some tips for properly configuring SMTP:
9090
>- When using a business email account such as Office 365, you may need to contact your email administrator to enable SMTP AUTH (for example, [enable-smtp-auth-for-specific-mailboxes](/exchange/clients-and-mobile-in-exchange-online/authenticated-client-smtp-submission#enable-smtp-auth-for-specific-mailboxes)). You should be able to create an app password afterwards and use it as the SMTP *password* setting.
9191
>- When using a personal email account such as Outlook or Gmail, you should create an app password and use it as the SMTP *password* setting. Note that your account won't work for email notification if it's configured with multi-factor authentication.
92-
>- It's recommended that you verify the SMTP configurations to be working as expected before applying them to your Managed Grafana workspace. For example, you can use an open source tool such as [swaks (Swiss Army Knife for SMTP)](https://github.com/jetmore/swaks) to send a test email using the SMTP configurations by running the following command in a terminal window:
92+
>- It's recommended that you verify the SMTP configurations to be working as expected before applying them to your Azure Managed Grafana workspace. For example, you can use an open source tool such as [swaks (Swiss Army Knife for SMTP)](https://github.com/jetmore/swaks) to send a test email using the SMTP configurations by running the following command in a terminal window:
9393
> ```bash
9494
> # fill in all the empty values for the following parameters
9595
> host="" # SMTP host name with port separated by a ":", e.g. smtp.office365.com:587

0 commit comments

Comments
 (0)