Skip to content

Commit b7026b6

Browse files
Merge pull request #232014 from maud-lv/ml-amg-refresh
Refresh docset
2 parents 09825b6 + c41a55b commit b7026b6

12 files changed

+38
-38
lines changed

articles/managed-grafana/encryption.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ author: maud-lv
55
ms.author: malev
66
ms.service: managed-grafana
77
ms.topic: conceptual
8-
ms.date: 07/22/2022
9-
ms.custom: concept, ignite-2022
8+
ms.date: 03/23/2023
9+
ms.custom: concept, ignite-2022, engagement-fy23
1010
---
1111

1212
# Encryption in Azure Managed Grafana
@@ -22,17 +22,17 @@ This article provides a short description of encryption within Azure Managed Gra
2222

2323
## Encryption in Azure Cosmos DB and Azure Database for PostgreSQL
2424

25-
Managed Grafana leverages encryption offered by Azure Cosmos DB and Azure Database for PostgreSQL.
25+
Azure Managed Grafana leverages encryption offered by Azure Cosmos DB and Azure Database for PostgreSQL.
2626

2727
Data stored in Azure Cosmos DB and Azure Database for PostgreSQL is encrypted at rest on storage devices and in transport over the network.
2828

2929
For more information, go to [Encryption at rest in Azure Cosmos DB](../cosmos-db/database-encryption-at-rest.md) and [Security in Azure Database for PostgreSQL - Flexible Server](../postgresql/flexible-server/concepts-security.md).
3030

3131
## Server-side encryption
3232

33-
The encryption model used by Managed Grafana is the server-side encryption model with Service-Managed keys.
33+
The encryption model used by Azure Managed Grafana is the server-side encryption model with Service-Managed keys.
3434

35-
In this model, all key management aspects such as key issuance, rotation, and backup are managed by Microsoft. The Azure resource providers create the keys, place them in secure storage, and retrieve them when needed. For more information, go to [Server-side encryption using Service-Managed key](../security/fundamentals/encryption-models.md).
35+
In this model, all key management aspects such as key issuance, rotation, and backup are managed by Microsoft. The Azure resource providers create the keys, place them in secure storage, and retrieve them when needed. For more information, go to [Server-side encryption using service-managed keys](../security/fundamentals/encryption-models.md#server-side-encryption-using-service-managed-keys).
3636

3737
## Next steps
3838

articles/managed-grafana/grafana-app-ui.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ author: maud-lv
55
ms.author: malev
66
ms.service: managed-grafana
77
ms.topic: reference
8-
ms.date: 3/31/2022
8+
ms.date: 3/23/2022
9+
ms.custom: engagement-fy23
910
---
1011

11-
# Grafana UI
12+
# Grafana user interface
1213

13-
This reference covers the Grafana web application's main UI components, including panels, visualizations, and dashboards. For consistency, it links to the corresponding topics in the Grafana documentation.
14+
This reference covers the Grafana web application's main UI components, including panels, visualizations, and dashboards. For consistency, this document links to the corresponding topics in the Grafana documentation.
1415

1516
## Panels
1617

17-
A Grafana panel is a basic building block in Grafana. Each panel displays a dataset from a data source query using a [visualization](#visualizations). For more information about panels, refer to the following items:
18+
A Grafana panel is a basic building block in Grafana. Each panel displays a dataset from a data source query using a visualization For more information about panels, refer to the following items:
1819

19-
* [Working with Grafana panels](https://grafana.com/docs/grafana/latest/panels/working-with-panels/)
20+
* [Working with Grafana panels](https://grafana.com/docs/grafana/latest/panels-visualizations/#panels-and-visualizations/)
2021
* [Query a data source](https://grafana.com/docs/grafana/latest/panels/query-a-data-source/)
21-
* [Modify visualization text and background colors](https://grafana.com/docs/grafana/latest/panels/specify-thresholds/)
2222
* [Override field values](https://grafana.com/docs/grafana/latest/panels/override-field-values/)
2323
* [Transform data](https://grafana.com/docs/grafana/latest/panels/transform-data/)
2424
* [Format data using value mapping](https://grafana.com/docs/grafana/latest/panels/format-data/)
@@ -30,7 +30,7 @@ A Grafana panel is a basic building block in Grafana. Each panel displays a data
3030

3131
## Visualizations
3232

33-
Grafana [panels](#panels) support various visualizations, which are visual representations of underlying data. These representations are often graphical and include:
33+
Grafana panels support various visualizations, which are visual representations of underlying data. These representations are often graphical and include:
3434

3535
* Graphs and charts
3636
* [Time series](https://grafana.com/docs/grafana/latest/visualizations/time-series/)
@@ -76,4 +76,4 @@ A Grafana dashboard is a collection of [panels](#panels) arranged in rows and co
7676
## Next steps
7777

7878
> [!div class="nextstepaction"]
79-
> [How to share an Azure Managed Grafana instance](./how-to-share-grafana-workspace.md)
79+
> [Create a Grafana dashboard](./how-to-create-dashboard.md)

articles/managed-grafana/high-availability.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ author: maud-lv
55
ms.author: malev
66
ms.service: managed-grafana
77
ms.topic: conceptual
8-
ms.date: 7/27/2022
9-
ms.custom: references_regions
8+
ms.date: 3/23/2023
9+
ms.custom: references_regions, engagement-fy23
1010
---
1111

1212
# Azure Managed Grafana service reliability
@@ -30,17 +30,16 @@ When the zone redundancy option is enabled, VMs are spread across [availability
3030
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.
3131

3232
> [!NOTE]
33-
> Zone redundancy can only be enabled when creating the 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.
33+
> 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.
3434
3535
### With zone redundancy disabled
3636

37-
Zone redundancy is disabled in the Managed Grafana Standard tier by default. In this scenario, virtual machines are created as single-region resources and should not be expected to survive zone-downs scenarios as they can go down at same time.
37+
Zone redundancy is disabled in the Azure Managed Grafana Standard tier by default. In this scenario, virtual machines are created as single-region resources and should not be expected to survive zone-downs scenarios as they can go down at same time.
3838

3939
## Supported regions
4040

4141
Zone redundancy support is enabled in the following regions:
4242

43-
4443
| Americas | Europe | Africa | Asia Pacific |
4544
|------------------|-------------------|-------------------|-------------------|
4645
| East US | West Europe | | Australia East |
@@ -52,4 +51,4 @@ For a complete list of regions where Managed Grafana is available, see [Products
5251
## Next steps
5352

5453
> [!div class="nextstepaction"]
55-
> [Create an Azure Managed Grafana instance](./quickstart-managed-grafana-portal.md)
54+
> [Enable zone redundancy](./how-to-enable-zone-redundancy.md)

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ author: maud-lv
66
ms.author: malev
77
ms.service: managed-grafana
88
ms.topic: tutorial
9-
ms.date: 08/11/2022
9+
ms.date: 03/23/2023
10+
ms.custom: engagement-fy23
1011
---
1112

1213
# Tutorial: Call Grafana APIs programmatically
@@ -21,9 +22,9 @@ In this tutorial, you learn how to:
2122
2223
## Prerequisites
2324

24-
* An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/).
25-
* An Azure Managed Grafana workspace. [Create an Azure Managed Grafana instance](./quickstart-managed-grafana-portal.md).
26-
* An Azure Active Directory (Azure AD) application with a service principal. [Create an Azure AD application and service principal](../active-directory/develop/howto-create-service-principal-portal.md). For simplicity, use an application located in the same Azure AD tenant as your Managed Grafana instance.
25+
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/).
26+
- An Azure Managed Grafana workspace. [Create an Azure Managed Grafana instance](./quickstart-managed-grafana-portal.md).
27+
- An Azure Active Directory (Azure AD) application with a service principal. [Create an Azure AD application and service principal](../active-directory/develop/howto-create-service-principal-portal.md). For simplicity, use an application located in the same Azure AD tenant as your Azure Managed Grafana instance.
2728

2829
## Sign in to Azure
2930

@@ -72,7 +73,7 @@ You now need to gather some information, which you'll use to get a Grafana API a
7273
> [!NOTE]
7374
> You can only access a secret's value immediately after creating it. Copy the value before leaving the page to use it in the next step of this tutorial.
7475
75-
1. Find your Grafana endpoint URL:
76+
1. Find the Grafana endpoint URL:
7677

7778
1. In the Azure portal, enter *Azure Managed Grafana* in the **Search resources, services, and docs (G+ /)** bar.
7879
1. Select **Azure Managed Grafana** and open your Managed Grafana workspace.

articles/managed-grafana/how-to-deterministic-ip.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ ms.service: managed-grafana
55
ms.topic: how-to
66
author: maud-lv
77
ms.author: malev
8-
ms.date: 08/24/2022
8+
ms.date: 03/23/2022
99
---
1010

1111
# Use deterministic outbound IPs
1212

13-
In this guide, learn how to activate deterministic outbound IP support used by Azure Managed Grafana to communicate with its data sources, disable public access and set up a firewall rule to allow inbound requests from your Grafana instance.
13+
In this guide, learn how to activate deterministic outbound IP support used by Azure Managed Grafana to communicate with data sources, disable public access and set up a firewall rule to allow inbound requests from your Grafana instance.
1414

1515
## Prerequisites
1616

@@ -19,7 +19,7 @@ In this guide, learn how to activate deterministic outbound IP support used by A
1919

2020
## Enable deterministic outbound IPs
2121

22-
Deterministic outbound IP support is disabled by default in Azure Managed Grafana. You can enable this feature during the creation of the instance, or you can activate it on an instance that's already been created.
22+
Deterministic outbound IP support is disabled by default in Azure Managed Grafana. You can enable this feature during the creation of the instance, or you can activate it on an existing instance.
2323

2424
### Create an Azure Managed Grafana workspace with deterministic outbound IPs enabled
2525

@@ -33,7 +33,7 @@ For more information about creating a new instance, go to [Quickstart: Create an
3333

3434
Run the [az grafana create](/cli/azure/grafana#az-grafana-create) command to create an Azure Managed Grafana instance with deterministic outbound IPs enabled. Replace `<azure-managed-grafana-name>` and `<resource-group>` with the name of the new Azure Managed Grafana instance and a resource group.
3535

36-
```azurecli-interactive
36+
```azurecli
3737
az grafana create --name <azure-managed-grafana-name> --resource-group <resource-group> --deterministic-outbound-ip Enabled
3838
```
3939

@@ -43,7 +43,7 @@ az grafana create --name <azure-managed-grafana-name> --resource-group <resource
4343

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

46-
1. In the Azure portal, under **Settings** select **Configuration**, and then under **Deterministic outbound IP**, select **Enable**.
46+
1. In the Azure portal, under **Settings** select **Configuration**, and then under **General settings** > **Deterministic outbound IP**, select **Enable**.
4747

4848
:::image type="content" source="media/deterministic-ips/enable-deterministic-ip-addresses.png" alt-text="Screenshot of the Azure platform. Enable deterministic IPs.":::
4949
1. Select **Save** to confirm the activation of deterministic outbound IP addresses.
@@ -53,7 +53,7 @@ az grafana create --name <azure-managed-grafana-name> --resource-group <resource
5353

5454
Run the [az grafana update](/cli/azure/grafana#az-grafana-update) command to update your Azure Managed Grafana instance and enable deterministic outbound IPs. Replace `<azure-managed-grafana-name>` with the name of your Azure Managed Grafana instance.
5555

56-
```azurecli-interactive
56+
```azurecli
5757
az grafana update --name <azure-managed-grafana-name> --deterministic-outbound-ip Enabled
5858
```
5959

@@ -90,7 +90,7 @@ Check if the Azure Managed Grafana endpoint can still access your data source.
9090

9191
Run the [az grafana data-source query](/cli/azure/grafana/data-source#az-grafana-data-source-query) command to query the data source. Replace `<azure-managed-grafana-name>` and `<data-source-name>` with the name of your Azure Managed Grafana instance and the name of your data source.
9292

93-
```azurecli-interactive
93+
```azurecli
9494
az grafana data-source query --name <azure-managed-grafana-name> --data-source <data-source-name> --output table
9595
```
9696

@@ -104,4 +104,4 @@ If the following error message is displayed, Azure Managed Grafana can't access
104104
## Next steps
105105

106106
> [!div class="nextstepaction"]
107-
> [Call Grafana APIs](how-to-api-calls.md)
107+
> [Set up private access](how-to-set-up-private-access.md)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: malev
66
ms.service: managed-grafana
77
ms.custom: engagement-fy23
88
ms.topic: how-to
9-
ms.date: 3/08/2022
9+
ms.date: 02/23/2023
1010
---
1111

1212
# How to modify access permissions to Azure Monitor
-122 KB
Loading
-18.1 KB
Loading
-36.6 KB
Loading
-18.4 KB
Loading

0 commit comments

Comments
 (0)