Skip to content

Commit 9ab54fe

Browse files
authored
Merge pull request #257584 from MicrosoftDocs/main
Request to merge Release Branch "release-vmware-ga" at 7:45 AM PST on 11/6 to main and then to live
2 parents 972d19b + f5c7bb5 commit 9ab54fe

File tree

91 files changed

+869
-704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+869
-704
lines changed

.openpublishing.redirection.defender-for-iot.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/faqs-eiot.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise#frequently-asked-questions",
6+
"redirect_document_id": false
7+
},
8+
39
{
410
"source_path_from_root": "/articles/defender-for-iot/organizations/best-practices/plan-network-monitoring.md",
511
"redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-prepare-deploy",

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,11 @@
790790
"redirect_url": "/previous-versions/azure/active-directory/azuread-dev/active-directory-acs-migration",
791791
"redirect_document_id": false
792792
},
793+
{
794+
"source_path": "articles/azure-arc/vmware-vsphere/switch-to-new-preview-version.md",
795+
"redirect_url": "/azure/azure-arc/vmware-vsphere/switch-to-new-version-vmware",
796+
"redirect_document_id": false
797+
},
793798
{
794799
"source_path": "articles/active-directory/azuread-dev/active-directory-authentication-libraries.md",
795800
"redirect_url": "/previous-versions/azure/active-directory/azuread-dev/active-directory-authentication-libraries",

articles/aks/manage-ssh-node-access.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.date: 11/01/2023
88

99
# Manage SSH for secure access to Azure Kubernetes Service (AKS) nodes
1010

11-
This article describes how to update the SSH key on your AKS clusters or node pools.
11+
This article describes how to update the SSH key (preview) on your AKS clusters or node pools.
1212

1313
[!INCLUDE [preview features callout](./includes/preview/preview-callout.md)]
1414

@@ -17,7 +17,7 @@ This article describes how to update the SSH key on your AKS clusters or node po
1717
* You need the Azure CLI version 2.46.0 or later installed and configured. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
1818
* This feature supports Linux, Mariner, and CBLMariner node pools on existing clusters.
1919

20-
## Update SSH public key on an existing AKS cluster
20+
## Update SSH public key (preview) on an existing AKS cluster
2121

2222
Use the [az aks update][az-aks-update] command to update the SSH public key on your cluster. This operation updates the key on all node pools. You can either specify the key or a key file using the `--ssh-key-value` argument.
2323

articles/azure-arc/servers/deliver-extended-security-updates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ If any problems occur during the enablement process, see [Troubleshoot delivery
8585

8686
There are some scenarios in which you may be eligible to receive Extended Security Updates patches at no additional cost. Two of these scenarios supported by Azure Arc include the following:
8787

88-
- Dev/Test (Visual Studio)
89-
- Disaster Recovery (Entitled benefit DR instances from Software Assurance or subscription only)
88+
- [Dev/Test (Visual Studio)](/azure/devtest/offer/overview-what-is-devtest-offer-visual-studio)
89+
- Disaster Recovery ([Entitled benefit DR instances from Software Assurance](https://www.microsoft.com/en-us/licensing/licensing-programs/software-assurance-by-benefits) or subscription only)
9090

9191
To qualify for these scenarios, you must have:
9292

articles/azure-arc/servers/prepare-extended-security-updates.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.topic: conceptual
77

88
# Prepare to deliver Extended Security Updates for Windows Server 2012
99

10-
With Windows Server 2012 and Windows Server 2012 R2 reaching end of support on October 10, 2023, Azure Arc-enabled servers lets you enroll your existing Windows Server 2012/2012 R2 machines in [Extended Security Updates (ESUs)](/windows-server/get-started/extended-security-updates-overview). Affording both cost flexibility and an enhanced delivery experience, Azure Arc better positions you to migrate to Azure.
10+
With Windows Server 2012 and Windows Server 2012 R2 having reached end of support on October 10, 2023, Azure Arc-enabled servers lets you enroll your existing Windows Server 2012/2012 R2 machines in [Extended Security Updates (ESUs)](/windows-server/get-started/extended-security-updates-overview). Affording both cost flexibility and an enhanced delivery experience, Azure Arc better positions you to migrate to Azure.
1111

1212
The purpose of this article is to help you understand the benefits and how to prepare to use Arc-enabled servers to enable delivery of ESUs.
1313

@@ -28,6 +28,7 @@ Delivering ESUs to your Windows Server 2012/2012 R2 machines provides the follow
2828
For Azure Arc-enabled servers enrolled in WS2012 ESUs enabled by Azure Arc, free access is provided to these Azure services from October 10, 2023:
2929

3030
* [Azure Update Manager](../../update-center/overview.md) - Unified management and governance of update compliance that includes not only Azure and hybrid machines, but also ESU update compliance for all your Windows Server 2012/2012 R2 machines.
31+
Enrollment in ESUs does not impact Azure Update Manager. After enrollment in ESUs through Azure Arc, the server becomes eligible for ESU patches. These patches can be delivered through Azure Update Manager or any other patching solution. You'll still need to configure updates from Microsoft Updates or Windows Server Update Services.
3132
* [Azure Automation Change Tracking and Inventory](/azure/automation/change-tracking/overview?tabs=python-2) - Track changes in virtual machines hosted in Azure, on-premises, and other cloud environments.
3233
* [Azure Policy Guest Configuration](/azure/cloud-adoption-framework/manage/azure-server-management/guest-configuration-policy) - Audit the configuration settings in a virtual machine. Guest configuration supports Azure VMs natively and non-Azure physical and virtual servers through Azure Arc-enabled servers.
3334

@@ -37,13 +38,13 @@ Other Azure services through Azure Arc-enabled servers are available as well, wi
3738
* [Microsoft Sentinel](scenario-onboard-azure-sentinel.md) - Collect security-related events and correlate them with other data sources.
3839

3940
>[!NOTE]
40-
>Activation of ESU is planned for the third quarter of 2023. Using Azure services such as Azure Update Manager (preview) and Azure Policy to support managing ESU-eligible Windows Server 2012/2012 R2 machines are also planned for the third quarter.
41+
>Activation of ESU is planned for the third quarter of 2023. Using Azure services such as Azure Update Manager and Azure Policy to support managing ESU-eligible Windows Server 2012/2012 R2 machines are also planned for the third quarter.
4142
4243
## Prepare delivery of ESUs
4344

4445
To prepare for this new offer, you need to plan and prepare to onboard your machines to Azure Arc-enabled servers through the installation of the [Azure Connected Machine agent](agent-overview.md) (version 1.34 or higher) and establishing a connection to Azure. Windows Server 2012 Extended Security Updates supports Windows Server 2012 and R2 Standard and Datacenter editions. Windows Server 2012 Storage is not supported.
4546

46-
We recommend you deploy your machines to Azure Arc in preparation for when the related Azure services deliver supported functionality to manage ESU. Once these machines are onboarded to Azure Arc-enabled servers, you'll have visibility into their ESU coverage and enroll through the Azure portal or using Azure Policy one month before Windows Server 2012 end of support. Billing for this service starts from October 2023, after Windows Server 2012 end of support.
47+
We recommend you deploy your machines to Azure Arc in preparation for when the related Azure services deliver supported functionality to manage ESU. Once these machines are onboarded to Azure Arc-enabled servers, you'll have visibility into their ESU coverage and enroll through the Azure portal or using Azure Policy. Billing for this service starts from October 2023 (i.e., after Windows Server 2012 end of support).
4748

4849

4950

articles/azure-arc/vmware-vsphere/administer-arc-vmware.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
title: Perform ongoing administration for Arc-enabled VMware vSphere
33
description: Learn how to perform administrator operations related to Azure Arc-enabled VMware vSphere
44
ms.topic: how-to
5-
ms.date: 08/18/2023
5+
ms.date: 11/06/2023
66
ms.service: azure-arc
77
ms.subservice: azure-arc-vmware-vsphere
88
ms.custom: devx-track-azurecli
99
---
1010

1111
# Perform ongoing administration for Arc-enabled VMware vSphere
1212

13-
In this article, you learn how to perform various administrative operations related to Azure Arc-enabled VMware vSphere (preview):
13+
In this article, you learn how to perform various administrative operations related to Azure Arc-enabled VMware vSphere:
1414

15-
- Upgrading the Azure Arc resource bridge (preview)
15+
- Upgrading the Azure Arc resource bridge
1616
- Updating the credentials
1717
- Collecting logs from the Arc resource bridge
1818

articles/azure-arc/vmware-vsphere/azure-arc-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Azure Arc agent
33
description: Learn about Azure Arc agent
44
ms.topic: conceptual
5-
ms.date: 10/31/2023
5+
ms.date: 11/06/2023
66
ms.service: azure-arc
77
ms.subservice: azure-arc-vmware-vsphere
88
author: Farha-Bano

articles/azure-arc/vmware-vsphere/enable-guest-management-at-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Install Arc agent at scale for your VMware VMs
33
description: Learn how to enable guest management at scale for Arc enabled VMware vSphere VMs.
44
ms.topic: how-to
5-
ms.date: 08/21/2023
5+
ms.date: 11/06/2023
66
ms.service: azure-arc
77
ms.subservice: azure-arc-vmware-vsphere
88
author: Farha-Bano
960 KB
Loading
1.8 MB
Loading

0 commit comments

Comments
 (0)