Skip to content

Commit e97b880

Browse files
authored
Merge pull request #276169 from maud-lv/ml-grafanachina
Update feature availability
2 parents ce624c8 + 35e6d1d commit e97b880

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

articles/azure-government/compare-azure-government-global-azure.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,10 @@ The following Azure Lighthouse **features aren't currently available** in Azure
308308
- Delegation of subscriptions across a national cloud and the Azure public cloud, or across two separate national clouds, isn't supported
309309
- Privileged Identity Management (PIM) feature isn't enabled, for example, just-in-time (JIT) / eligible authorization capability
310310

311+
### [Azure Managed Grafana](../managed-grafana/index.yml)
312+
313+
The following document contains information about Azure Managed Grafana feature availability in Azure Government: [Azure Managed Grafana: Feature availability in sovereign clouds](../managed-grafana/known-limitations.md?#feature-availability-in-sovereign-clouds).
314+
311315
### [Azure Monitor](../azure-monitor/index.yml)
312316

313317
Azure Monitor enables the same features in both Azure and Azure Government.

articles/managed-grafana/known-limitations.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titlesuffix: Azure Managed Grafana
44
description: Learn about current technical or feature limitations you may encounter in the Azure Managed Grafana service.
55
ms.service: managed-grafana
66
ms.topic: troubleshooting
7-
ms.date: 01/23/2024
7+
ms.date: 05/23/2024
88
ms.author: malev
99
ms.custom: engagement-fy23
1010
author: maud-lv
@@ -32,14 +32,16 @@ Azure Managed Grafana has the following known limitations:
3232

3333
* Unified alerting is enabled by default for all instances created after December 2022. For instances created before this date, unified alerting must be enabled manually by the Azure Managed Grafana team. For activation, [contact us](mailto:[email protected])
3434

35-
* Some Azure Managed Grafana features aren't available in Azure Government and Microsoft Azure operated by 21Vianet due to limitations in these specific environments. This following table lists the feature differences.
35+
## Feature availability in sovereign clouds
3636

37-
| Feature | Azure Government | Microsoft Azure operated by 21Vianet |
38-
|---------|:------------:|:------------:|
39-
| Private link | ❌ | ❌ |
40-
| Managed private endpoint | ❌ | ❌ |
41-
| Team sync with Microsoft Entra ID | ❌ | ❌ |
42-
| Enterprise plugins | ❌ | ❌ |
37+
Some Azure Managed Grafana features aren't available in Azure Government and Microsoft Azure operated by 21Vianet due to limitations in these specific environments. The following table lists these differences.
38+
39+
| Feature | Azure Government | Microsoft Azure operated by 21Vianet (Preview) |
40+
|-----------------------------------|:----------------:|:----------------------------------------------:|
41+
| Private link | Not supported | Not supported |
42+
| Managed private endpoint | Not supported | Not supported |
43+
| Team sync with Microsoft Entra ID | Preview | Preview |
44+
| Enterprise plugins | Not supported | Not supported |
4345

4446
## Throttling limits and quotas
4547

articles/reliability/sovereign-cloud-china.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ This section outlines variations and considerations when using Azure Container A
104104
|---------|--------|------------|
105105
| Azure Monitor| The Azure Monitor integration isn't supported for Azure in China |
106106

107+
### Azure Managed Grafana
108+
109+
| Product | Unsupported, limited, and/or modified features | Notes |
110+
|-----------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|-------|
111+
| Azure Managed Grafana | See [Azure Managed Grafana: Feature availability in sovereign clouds](../managed-grafana/known-limitations.md?#feature-availability-in-sovereign-clouds). | |
112+
107113
### Azure China Commercial Marketplace operated by 21Vianet
108114

109115
To learn which commercial marketplace features are available in Azure China Commercial Marketplace operated by 21Vianet, as compared to the Azure global commercial marketplace, see [Feature availability for Azure China Commercial Marketplace operated by 21Vianet](/partner-center/marketplace/azure-in-china-feature-availability).

0 commit comments

Comments
 (0)