Skip to content

Commit 1bed9c8

Browse files
authored
Merge pull request #294910 from maud-lv/ml-amgworkspace3
Bulk wording fix
2 parents 2ea1e01 + bf7b57b commit 1bed9c8

29 files changed

+221
-223
lines changed

articles/managed-grafana/encryption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ In this model, all key management aspects such as key issuance, rotation, and ba
3737
## Next steps
3838

3939
> [!div class="nextstepaction"]
40-
> [Monitor your Azure Managed Grafana instance](how-to-monitor-managed-grafana-workspace.md)
40+
> [Monitor Azure Managed Grafana](how-to-monitor-managed-grafana-workspace.md)

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/high-availability.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@ ms.custom: references_regions, engagement-fy23
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.
14+
This article provides information on availability zone support, disaster recovery and availability of Azure Managed Grafana for workspaces in the Standard plan. The Essential plan (preview) doesn't offer the same reliability and isn't recommended for use in production.
1515

16-
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.
16+
An Azure Managed Grafana workspace 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 Azure Managed Grafana workspace.
1717

18-
:::image type="content" source="media/service-reliability/diagram.png" alt-text="Diagram of the Managed Grafana Standard tier instance setup.":::
18+
:::image type="content" source="media/service-reliability/diagram.png" alt-text="Diagram of the Azure Managed Grafana Standard tier workspace setup.":::
1919

20-
The load balancer always keeps track of which Grafana servers are available. In a dual-server setup, if it detects that one server is down, the load balancer starts sending all requests to the remaining server. That server should be able to pick up the browser sessions previously served by the other one based on information saved in the shared database. In the meantime, the Managed Grafana service will work to repair the unhealthy server or bring up a new one.
20+
The load balancer always keeps track of which Grafana servers are available. In a dual-server setup, if it detects that one server is down, the load balancer starts sending all requests to the remaining server. That server should be able to pick up the browser sessions previously served by the other one based on information saved in the shared database. In the meantime, the Azure Managed Grafana service will work to repair the unhealthy server or bring up a new one.
2121

22-
Microsoft is not providing or setting up disaster recovery for this service. In case of a region level outage, service will experience downtime and users can set up additional instances in other regions for disaster recovery purposes.
22+
Microsoft is not providing or setting up disaster recovery for this service. In case of a region level outage, service will experience downtime and users can set up additional workspaces in other regions for disaster recovery purposes.
2323

2424
## Zone redundancy
2525

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.
26+
The network load balancer, VMs and database that underpin an Azure Managed Grafana workspace are located in a region based on system resource availability, and could end up being in a same Azure datacenter.
2727

2828
### With zone redundancy enabled
2929

3030
When the zone redundancy option is enabled, VMs are spread across [availability zones](../reliability/availability-zones-overview.md). Other resources such as network load balancer and database are also configured for availability zones.
3131

32-
In a zone-wide outage, no user action is required. An impacted Managed Grafana instance will rebalance itself to take advantage of the healthy zone automatically. The Managed Grafana service will attempt to heal the affected instances during zone recovery.
32+
In a zone-wide outage, no user action is required. An impacted Azure Managed Grafana workspace will rebalance itself to take advantage of the healthy zone automatically. The Azure Managed Grafana service will attempt to heal the affected workspaces during zone recovery.
3333

3434
> [!NOTE]
35-
> Zone redundancy can only be enabled when creating the Azure Managed Grafana instance, and can't be modified subsequently. The zone redundancy option comes with an additional cost. Go to [Azure Managed Grafana pricing](https://azure.microsoft.com/pricing/details/managed-grafana/) for details.
35+
> Zone redundancy can only be enabled when creating the Azure Managed Grafana workspace, and can't be modified subsequently. The zone redundancy option comes with an additional cost. Go to [Azure Managed Grafana pricing](https://azure.microsoft.com/pricing/details/managed-grafana/) for details.
3636
3737
### With zone redundancy disabled
3838

@@ -48,7 +48,7 @@ Zone redundancy support is enabled in the following regions:
4848
| South Central US | | | East Asia |
4949
| West US 3 | | | |
5050

51-
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)
51+
For a complete list of regions where Azure 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)
5252

5353
## Next steps
5454

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ In this tutorial, you learn how to:
2424
## Prerequisites
2525

2626
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/).
27-
- An Azure Managed Grafana workspace. [Create an Azure Managed Grafana instance](./quickstart-managed-grafana-portal.md).
28-
- A Microsoft Entra application with a service principal. [Create a Microsoft Entra application and service principal](../active-directory/develop/howto-create-service-principal-portal.md). For simplicity, use an application located in the same Microsoft Entra tenant as your Azure Managed Grafana instance.
27+
- An Azure Managed Grafana workspace. [Create an Azure Managed Grafana workspace](./quickstart-managed-grafana-portal.md).
28+
- A Microsoft Entra application with a service principal. [Create a Microsoft Entra application and service principal](../active-directory/develop/howto-create-service-principal-portal.md). For simplicity, use an application located in the same Microsoft Entra tenant as your Azure Managed Grafana workspace.
2929

3030
## Sign in to Azure
3131

3232
Sign in to the Azure portal at [https://portal.azure.com/](https://portal.azure.com/) with your Azure account.
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 instance.
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.":::
@@ -145,7 +145,7 @@ curl -X GET \
145145
https://<grafana-url>/api/user
146146
```
147147

148-
Replace `<access-token>` and `<grafana-url>` with the access token retrieved in the previous step and the endpoint URL of your Grafana instance. For example `https://my-grafana-abcd.cuse.grafana.azure.com`.
148+
Replace `<access-token>` and `<grafana-url>` with the access token retrieved in the previous step and the endpoint URL of your Grafana workspace. For example `https://my-grafana-abcd.cuse.grafana.azure.com`.
149149

150150
## Clean up resources
151151

articles/managed-grafana/how-to-connect-azure-data-explorer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Azure Data Explorer is a logs & telemetry data exploration service. In this guid
1818

1919
## Prerequisites
2020

21-
* [An Azure Managed Grafana instance](./quickstart-managed-grafana-portal.md) in the Standard plan.
21+
* [An Azure Managed Grafana workspace](./quickstart-managed-grafana-portal.md) in the Standard plan.
2222
* [An Azure Data Explorer database](/azure/data-explorer/create-cluster-database)
2323

2424
::: zone pivot="aro-azureportal"
@@ -27,7 +27,7 @@ Azure Data Explorer is a logs & telemetry data exploration service. In this guid
2727

2828
Add an Azure Data Explorer data source to Grafana by following the steps below.
2929

30-
1. Open an Azure Managed Grafana instance in the Azure portal.
30+
1. Open an Azure Managed Grafana workspace in the Azure portal.
3131
1. In the **Overview** section, open the **Endpoint** URL.
3232
1. In the Grafana portal, go to **Connections** > **Data sources** > **Add new data source**, then search and select **Azure Data Explorer Datasource**.
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ In this guide, learn how to connect an Azure Monitor workspace to Grafana direct
1515
## Prerequisites
1616

1717
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free).
18-
- An Azure Managed Grafana instance in the Standard tier. [Create a new instance](quickstart-managed-grafana-portal.md) if you don't have one.
18+
- An Azure Managed Grafana workspace in the Standard tier. [Create a new workspace](quickstart-managed-grafana-portal.md) if you don't have one.
1919
- An [Azure Monitor workspace with Prometheus data](/azure/azure-monitor/containers/monitor-kubernetes).
2020

2121
## Add a new role assignment

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: How to connect to a data source privately in Azure Managed Grafana
3-
description: Learn how to connect an Azure Managed Grafana instance to a data source using Managed Private Endpoint
3+
description: Learn how to connect an Azure Managed Grafana workspace to a data source using Managed Private Endpoint
44
ms.service: azure-managed-grafana
55
ms.topic: how-to
66
author: maud-lv
@@ -10,7 +10,7 @@ ms.date: 02/05/2024
1010

1111
# Connect to a data source privately
1212

13-
In this guide, you learn how to connect your Azure Managed Grafana instance to a data source using Managed Private Endpoint. Azure Managed Grafana’s managed private endpoints are endpoints created in a Managed Virtual Network that the Azure Managed Grafana service uses. They establish private links from that network to your Azure data sources. Azure Managed Grafana sets up and manages these private endpoints on your behalf. You can create managed private endpoints from your Azure Managed Grafana to access other Azure managed services (for example, Azure Monitor private link scope or Azure Monitor workspace) and your own self-hosted data sources (for example, connecting to your self-hosted Prometheus behind a private link service).
13+
In this guide, you learn how to connect your Azure Managed Grafana workspace to a data source using Managed Private Endpoint. Azure Managed Grafana’s managed private endpoints are endpoints created in a Managed Virtual Network that the Azure Managed Grafana service uses. They establish private links from that network to your Azure data sources. Azure Managed Grafana sets up and manages these private endpoints on your behalf. You can create managed private endpoints from your Azure Managed Grafana to access other Azure managed services (for example, Azure Monitor private link scope or Azure Monitor workspace) and your own self-hosted data sources (for example, connecting to your self-hosted Prometheus behind a private link service).
1414

1515
When you use managed private endpoints, traffic between your Azure Managed Grafana and its data sources traverses exclusively over the Microsoft backbone network without going through the internet. Managed private endpoints protect against data exfiltration. A managed private endpoint uses a private IP address from your Managed Virtual Network to effectively bring your Azure Managed Grafana workspace into that network. Each managed private endpoint is mapped to a specific resource in Azure and not the entire service. Customers can limit connectivity to only resources approved by their organizations.
1616

@@ -33,7 +33,7 @@ Managed private endpoints work with Azure services that support private link. Us
3333
- Azure Data Explorer
3434
- Azure Monitor private link scope (for example, Log Analytics workspace)
3535
- Azure Monitor workspace, for Managed Service for Prometheus
36-
- Azure SQL managed instance
36+
- Azure SQL managed workspace
3737
- Azure SQL server
3838
- Private link services
3939
- Azure Databricks
@@ -44,7 +44,7 @@ Managed private endpoints work with Azure services that support private link. Us
4444
To follow the steps in this guide, you must have:
4545

4646
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free).
47-
- 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).
47+
- An Azure Managed Grafana workspace in the Standard tier. If you don't have one yet, [create a new instance](quickstart-managed-grafana-portal.md).
4848

4949
## Create a managed private endpoint for Azure Monitor workspace
5050

0 commit comments

Comments
 (0)