Skip to content

Commit 88284c4

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sfi-ropc-remediation
2 parents 6c45016 + 97169a1 commit 88284c4

29 files changed

+325
-61
lines changed

articles/automation/change-tracking/overview-monitoring-agent.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Automation Change Tracking and Inventory overview using Azure Monit
33
description: This article describes the Change Tracking and Inventory feature using Azure monitoring agent, which helps you identify software and Microsoft service changes in your environment.
44
services: automation
55
ms.subservice: change-inventory-management
6-
ms.date: 12/09/2024
6+
ms.date: 02/26/2025
77
ms.topic: overview
88
ms.service: azure-automation
99
---
@@ -39,10 +39,9 @@ Azure Change Tracking & Inventory service enhances the auditing and governance f
3939

4040
|**Component**| **Applies to**|
4141
|---| ---|
42-
| Operating systems| Windows </br> Linux |
43-
| Resource types | Azure VMs </br> Azure Arc-enabled VMs </br> Virtual machines scale set|
44-
| Data types | Windows registry </br> Windows services </br> Linux Daemons |
45-
| Files | Windows </br> Linux |
42+
|Operating systems| Windows </br> Linux |
43+
|Resource types | Azure VMs </br> Azure Arc-enabled VMs </br> Virtual machines scale set|
44+
|Data types | Windows registry </br> Windows services </br> Linux Daemons </br> Files </br> Software
4645

4746
## Key benefits
4847

articles/azure-netapp-files/large-volumes-requirements-considerations.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: b-ahibbard
66
ms.service: azure-netapp-files
77
ms.custom: references_regions
88
ms.topic: conceptual
9-
ms.date: 02/18/2025
9+
ms.date: 02/25/2025
1010
ms.author: anfdocs
1111
---
1212
# Requirements and considerations for large volumes
@@ -79,23 +79,38 @@ Whereas regular volumes use 32-bit file IDs, large volumes employ 64-bit file ID
7979

8080
Support for Azure NetApp Files large volumes is available in the following regions:
8181

82+
* Australia Central
83+
* Australia Central 2
8284
* Australia East
8385
* Australia Southeast
8486
* Brazil South
87+
* Brazil Southeast
8588
* Canada Central
89+
* Canada East
8690
* Central India
8791
* Central US
92+
* East Asia
8893
* East US
8994
* East US 2
9095
* France Central
96+
* Germany North
9197
* Germany West Central
98+
* Italy North
9299
* Japan East
100+
* Japan West
101+
* Korea Central
102+
* Korea South
103+
* North Central US
93104
* North Europe
105+
* Norway East
106+
* Norway West
94107
* Qatar Central
95108
* South Africa North
96109
* South Central US
97110
* Southeast Asia
111+
* Sweden Central
98112
* Switzerland North
113+
* Switzerland West
99114
* UAE North
100115
* UK West
101116
* UK South

articles/azure-vmware/enable-hcx-access-over-internet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Enable HCX access over the internet
33
description: This article describes how to access HCX over a public IP address using Azure VMware solution.
44
ms.topic: how-to
5-
ms.date: 01/08/2025
5+
ms.date: 02/26/2025
66
ms.custom: engagement-fy23
77
---
88
# Enable HCX access over the internet
@@ -135,4 +135,4 @@ After the network is extended to destination site, VMs can be migrated over Laye
135135
## Next steps
136136
[Enable Public IP to the NSX Edge for Azure VMware Solution](./enable-public-ip-nsx-edge.md)
137137

138-
For detailed information on HCX network underlay minimum requirements, see [Network Underlay Minimum Requirements](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-9/vmware-hcx-user-guide-4-9/preparing-for-hcx-installations/network-underlay-minimum-requirements.html).
138+
For detailed information on HCX network underlay minimum requirements, see [Network Underlay Minimum Requirements](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-10/vmware-hcx-user-guide-4-10/preparing-for-hcx-installations/network-underlay-minimum-requirements.html).

articles/azure-vmware/move-azure-vmware-solution-across-regions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ In this article, walk through the steps to:
4242
4343
## Prerequisites
4444

45-
- [VMware HCX appliance is upgraded to the latest patch](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-9/vmware-hcx-user-guide-4-9/updating-vmware-hcx.html) to avoid migration issues if any.
45+
- [VMware HCX appliance is upgraded to the latest patch](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-10/vmware-hcx-user-guide-4-10/updating-vmware-hcx.html) to avoid migration issues if any.
4646

4747
- Source's local content library is a [published content library](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/8-0/vsphere-virtual-machine-administration-guide-8-0/using-content-librariesvsphere-vm-admin/publish-the-contents-of-a-library-and-a-single-template-to-a-subscribervsphere-vm-admin.html).
4848

articles/communication-services/concepts/rooms/room-concept.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ The following table provides detailed capabilities mapped to the roles. At a hig
168168
| - Show if a participant is muted | ✔️ | ✔️ | ✔️ |
169169
| - Show the reason why a participant left a call | ✔️ | ✔️ | ✔️ |
170170
| - Start call captions | ✔️ | ✔️ | ✔️ |
171-
| - Change captions language | ✔️ | ✔️ | |
171+
| - Change captions language | ✔️ | ✔️ | ✔️ |
172172
| - Invite to join a Virtual Room participant to a call | ✔️ |||
173173
| **Screen sharing** | | |
174174
| - Share screen | ✔️ * |||

articles/iot-operations/deploy-iot-ops/howto-prepare-cluster.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ Connect your cluster to Azure Arc so that it can be managed remotely.
199199
```
200200

201201
> [!NOTE]
202-
>If you receive the error: "Unable to fetch oid of 'custom-locations' app. Proceeding without enabling the feature. Insufficient privileges to complete the operation", then your service principal might lack the necessary permissions to retrieve the object ID of the custom location. Log into Azure CLI with a Microsoft Entra user account that meets the prerequisites. For more information, see [Create and manage custom locations](https://aka.ms/enable-cl-sp).
202+
>If you receive the error: "Unable to fetch oid of 'custom-locations' app. Proceeding without enabling the feature. Insufficient privileges to complete the operation," then your service principal might lack the necessary permissions to retrieve the object ID of the custom location. Log into Azure CLI with a Microsoft Entra user account that meets the prerequisites. For more information, see [Create and manage custom locations](https://aka.ms/enable-cl-sp).
203203
204204
1. Use the [az connectedk8s enable-features](/cli/azure/connectedk8s#az-connectedk8s-enable-features) command to enable the custom location feature on your Arc cluster. This command uses the OBJECT_ID environment variable saved from the previous step to set the value for the custom-locations-oid parameter. Run this command on the machine where you deployed the Kubernetes cluster:
205205

@@ -215,10 +215,12 @@ Connect your cluster to Azure Arc so that it can be managed remotely.
215215

216216
### Configure multi-node clusters for Azure Container Storage
217217

218-
On multi-node clusters with at least three nodes, you have the option of enabling fault tolerance for storage with [Azure Container Storage enabled by Azure Arc](/azure/azure-arc/container-storage/overview) when you deploy Azure IoT Operations.
218+
On multi-node Ubuntu clusters with at least three nodes, you have the option of enabling fault tolerance for storage with [Azure Container Storage enabled by Azure Arc](/azure/azure-arc/container-storage/overview) when you deploy Azure IoT Operations.
219219

220220
If you want to enable fault tolerance during deployment, configure your clusters by following the steps in [Prepare Linux for Edge Volumes using a multi-node Ubuntu cluster](/azure/azure-arc/container-storage/multi-node-cluster-edge-volumes?pivots=ubuntu).
221221

222+
If you're running your cluster on a Kubernetes distribution other than k3s, review the guidance to [Prepare Linux with other platforms](/azure/azure-arc/container-storage/multi-node-cluster-edge-volumes?pivots=other).
223+
222224
### [AKS Edge Essentials](#tab/aks-edge-essentials)
223225

224226
[Azure Kubernetes Service Edge Essentials](/azure/aks/hybrid/aks-edge-overview) is an on-premises Kubernetes implementation of Azure Kubernetes Service (AKS) that automates running containerized applications at scale. AKS Edge Essentials includes a Microsoft-supported Kubernetes platform that includes a lightweight Kubernetes distribution with a small footprint and simple installation experience that supports PC-class or "light" edge hardware.

articles/load-balancer/load-balancer-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ Key scenarios that you can accomplish by using Azure Standard Load Balancer incl
6767

6868
### <a name="securebydefault"></a>Security by default
6969

70-
- Standard Load Balancer is built on the Zero Trust network security model.
70+
- [Standard Load Balancer](https://github.com/MicrosoftDocs/azure-docs/blob/main/articles/load-balancer/skus.md) is built on the Zero Trust network security model.
7171

72-
- Standard Load Balancer is part of your virtual network, which is private and isolated for security.
72+
- [Standard Load Balancer](https://github.com/MicrosoftDocs/azure-docs/blob/main/articles/load-balancer/skus.md) is part of your virtual network, which is private and isolated for security.
7373

7474
- Standard load balancers and standard public IP addresses are closed to inbound connections, unless network security groups (NSGs) open them. You use NSGs to explicitly permit allowed traffic. If you don't have an NSG on a subnet or network interface card (NIC) of your virtual machine resource, traffic isn't allowed to reach the resource. To learn about NSGs and how to apply them to your scenario, see [Network security groups](../virtual-network/network-security-groups-overview.md).
7575

76-
- Basic Load Balancer is open to the internet by default.
76+
- [Basic Load Balancer](https://github.com/MicrosoftDocs/azure-docs/blob/main/articles/load-balancer/skus.md) is open to the internet by default.
7777

7878
- Azure Load Balancer doesn't store customer data.
7979

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
---
2+
title: Upgrade Azure Managed Grafana to Grafana 11
3+
titleSuffix: Azure Managed Grafana
4+
description: "Learn how to upgrade an Azure Managed Grafana workspace from Grafana 10 to Grafana 11."
5+
ms.service: azure-managed-grafana
6+
author: maud-lv
7+
ms.author: malev
8+
ms.date: 02/28/2025
9+
ms.topic: how-to
10+
# customerIntent: As a user of Azure Managed Grafana, I want to upgrade my workspce from Grafana 10 to Grafana 11.
11+
---
12+
13+
# Upgrade to Grafana 11
14+
15+
Azure Managed Grafana will stop offering Grafana 10 as a supported software version on July 31, 2025. This guide provides information about the retirement of Grafana 10 and guides you through updating your Azure Managed Grafana workspace to Grafana 11.
16+
17+
> [!IMPORTANT]
18+
> We recommend that you familiarize yourself with the [breaking changes introduced in Grafana 11](https://grafana.com/docs/grafana/latest/breaking-changes/breaking-changes-v11-0/) and upgrade your workspace to Grafana 11 before August 2025. If your workspace is still running Grafana version 10 in August 2025, it will be automatically upgraded to Grafana 11.
19+
20+
## Prerequisites
21+
22+
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free).
23+
- An existing Azure Managed Grafana instance. [Create one if you haven't already](quickstart-managed-grafana-portal.md).
24+
25+
## Retirement timeline
26+
27+
The following table outlines the retirement timeline.
28+
29+
| Key dates | Status |
30+
|-------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|
31+
| March 2025 | Users can start to upgrade existing workspaces to Grafana 11. |
32+
| June 2025 | <li>All new workspaces use Grafana 11. Creating new workspaces on Grafana 10 is disabled. <li> Users can still upgrade existing workspaces to Grafana 11. |
33+
| August 2025 | All workspaces are forcibly upgraded to Grafana 11. |
34+
35+
## Check the version of your Grafana workspace
36+
37+
To find out if your Azure Managed Grafana workspace needs to be upgraded, check the version of Grafana your workspace is running.
38+
39+
### [Portal](#tab/azure-portal)
40+
41+
In the Azure portal:
42+
43+
1. Open your Azure Managed Grafana workspace.
44+
1. In the left menu, under **Settings** select **Configuration**.
45+
1. Review the Grafana version listed under **Grafana Version**. If version 10 is selected in the dropdown menu, your workspace is on the Grafana version that is reaching end of life and is scheduled for retirement. We recommend that you upgrade your workspace to Grafana 11 by following the steps below. If your Grafana version is Grafana 11, no further action is necessary.
46+
47+
:::image type="content" source="media/grafana-11-upgrade/check-grafana-version.jpg" alt-text="Screenshot of the Azure platform showing Grafana Version 9.":::
48+
49+
### [Azure CLI](#tab/azure-cli)
50+
51+
Run the command [az grafana show](/cli/azure/grafana#az-grafana-show) in the Azure CLI to retrieve the properties of the Azure Managed Grafana workspace. Replace the placeholder `<azure-managed-grafana-workspace>` with the name of the Azure Managed Grafana instance.
52+
53+
```azurecli
54+
az grafana show --name <azure-managed-grafana-workspace>
55+
```
56+
57+
The version number is listed in the output after `grafanaMajorVersion`. If version is `10`, your workspace is on the Grafana version that is reaching end of life and is scheduled for retirement. We recommend that you upgrade your workspace to Grafana 11 by following the steps below. If your Grafana version is `11`, no further action is necessary.
58+
59+
---
60+
61+
## Upgrade to Grafana 11
62+
63+
Upgrade from Grafana 10 to Grafana 11 by following the steps below.
64+
65+
> [!IMPORTANT]
66+
> Grafana 11 includes significant breaking changes. Make sure to review the [Grafana Breaking changes in Grafana v11.0](https://grafana.com/docs/grafana/latest/breaking-changes/breaking-changes-v11-0/) article thoroughly before upgrading your workspace.
67+
68+
> [!CAUTION]
69+
> Upgrading to Grafana 11 is irreversible.
70+
71+
### [Portal](#tab/azure-portal)
72+
73+
In the Azure portal:
74+
75+
1. Once you have reviewed the breaking changes in Grafana 11 and are ready to proceed with the upgrade, open your workspace and select **Settings** > **Configuration** from the left menu.
76+
1. Under **Grafana Version**, select **11**.
77+
1. Select **Save** on top to save the new settings and trigger the upgrade to Grafana version 11.
78+
79+
:::image type="content" source="media/grafana-11-upgrade/save-upgrade.jpg" alt-text="Screenshot of the Azure portal showing Grafana version 11 selected in the dropdown menu and the Save button highlighted.":::
80+
81+
1. A notification appears, indicating that the upgrade is in progress. In the **Overview** page, Grafana’s **Provisioning State** is **Provisioning** until the upgrade is complete. After a few minutes, a notification appears, and the provisioning state becomes **Succeeded**.
82+
83+
### [Azure CLI](#tab/azure-cli)
84+
85+
In the Azure CLI:
86+
87+
1. Once you have reviewed the breaking changes in Grafana 11 and are ready to proceed with the upgrade, run the [az grafana update](/cli/azure/grafana#az-grafana-update) command and replace `<azure-managed-grafana-workspace>` with the name of your Azure Managed Grafana workspace.
88+
89+
```azurecli
90+
az grafana update --name <azure-managed-grafana-workspace> --major-version 11
91+
```
92+
93+
1. The CLI displays a warning indicating that upgrading to Grafana version 11 is a permanent an irreversible operation.
94+
---
95+
96+
## Next step
97+
98+
In this article, you have been guided through upgrading your Azure Managed Grafana workspace from Grafana 10 to Grafana 11. If needed, go to the following guide for additional support.
99+
100+
> [!div class="nextstepaction"]
101+
> [Find help or open a support ticket](./find-help-open-support-ticket.md)
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)