Skip to content

Commit 9cc7843

Browse files
authored
Merge pull request #255400 from MicrosoftDocs/main
Publish to Live Wednesday 4AM PST, 10/18
2 parents d1cd5cb + 9141dd1 commit 9cc7843

File tree

58 files changed

+8132
-372
lines changed

Some content is hidden

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

58 files changed

+8132
-372
lines changed

.openpublishing.redirection.azure-productivity.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,16 @@
204204
"source_path": "articles/lab-services/how-to-create-lab-template.md",
205205
"redirect_url": "/azure/lab-services/how-to-create-lab-bicep",
206206
"redirect_document_id": false
207+
},
208+
{
209+
"source_path": "articles/lab-services/migrate-to-2022-update.md",
210+
"redirect_url": "/azure/lab-services/how-to-migrate-lab-acounts-to-lab-plans",
211+
"redirect_document_id": true
212+
},
213+
{
214+
"source_path": "articles/lab-services/lab-services-whats-new.md",
215+
"redirect_url": "/azure/lab-services/concept-lab-accounts-versus-lab-plans",
216+
"redirect_document_id": true
207217
}
208218
]
209219
}

articles/active-directory/develop/msal-acquire-cache-tokens.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ In public client applications like desktop and mobile apps, you can:
9898
For confidential client applications (web app, web API, or a daemon application like a Windows service), you can;
9999

100100
- Acquire tokens **for the application itself** and not for a user, using the [client credentials flow](msal-authentication-flows.md#client-credentials). This technique can be used for syncing tools, or tools that process users in general and not a specific user.
101-
- Use the [on-behalf-of (OBO) flow](msal-authentication-flows.md#on-behalf-of-obo) for a web API to call an API on behalf of the user. The application is identified with client credentials in order to acquire a token based on a user assertion (SAML, for example, or a JWT token). This flow is used by applications that need to access resources of a particular user in service-to-service calls.
102-
- Acquire tokens using the [authorization code flow](msal-authentication-flows.md#authorization-code) in web apps after the user signs in through the authorization request URL. OpenID Connect application typically use this mechanism, which lets the user sign in using OpenID Connect and then access web APIs on behalf of the user.
101+
- Use the [on-behalf-of (OBO) flow](msal-authentication-flows.md#on-behalf-of-obo) for a web API to call an API on behalf of the user. The application is identified with client credentials in order to acquire a token based on a user assertion (SAML, for example, or a JWT token). This flow is used by applications that need to access resources of a particular user in service-to-service calls. Tokens should be cached on a session basis, not on a user basis.
102+
- Acquire tokens using the [authorization code flow](msal-authentication-flows.md#authorization-code) in web apps after the user signs in through the authorization request URL. OpenID Connect application typically use this mechanism, which lets the user sign in using OpenID Connect and then access web APIs on behalf of the user. Tokens may be cached on a user or on a session basis. If caching tokens on a user basis, we recommend to limit the session lifetime, so that Microsoft Entra ID may check the state of the Conditional Access policies frequently.
103103

104104
## Authentication results
105105

articles/aks/supported-kubernetes-versions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ For the past release history, see [Kubernetes history](https://github.com/kubern
5050
| 1.26 | Dec 2022 | Feb 2023 | Apr 2023 | Mar 2024 | Until 1.30 GA |
5151
| 1.27* | Apr 2023 | Jun 2023 | Jul 2023 | Jul 2024, LTS until Jul 2025 | Until 1.31 GA |
5252
| 1.28 | Aug 2023 | Sep 2023 | Oct 2023 || Until 1.32 GA|
53+
| 1.29 | Dec 2023 | Jan 2024 | Feb 2024 | | Until 1.33 GA |
5354

5455
*\* Indicates the version is designated for Long Term Support*
5556

articles/azure-arc/vmware-vsphere/perform-vm-ops-through-azure.md

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
title: Perform VM operations on VMware VMs through Azure
33
description: Learn how to view the operations that you can do on VMware virtual machines and install the Log Analytics agent.
44
ms.topic: how-to
5-
ms.date: 08/18/2023
5+
ms.date: 10/17/2023
66
ms.service: azure-arc
77
ms.subservice: azure-arc-vmware-vsphere
88
---
99

1010
# Manage VMware VMs in Azure through Arc-enabled VMware vSphere
1111

12-
In this article, you will learn how to perform various operations on the Azure Arc-enabled VMware vSphere (preview) VMs such as:
12+
In this article, you learn how to perform various operations on the Azure Arc-enabled VMware vSphere (preview) VMs such as:
1313

1414
- Start, stop, and restart a VM
1515

@@ -21,31 +21,12 @@ In this article, you will learn how to perform various operations on the Azure A
2121

2222
- Enable guest management
2323

24-
- Install extensions (enabling guest management is required)
24+
- Install extensions (enabling guest management is required). All the [extensions](../servers/manage-vm-extensions.md#extensions) that are available with Arc-enabled Servers are supported.
2525

2626
:::image type="content" source="media/browse-virtual-machines.png" alt-text="Screenshot showing the VMware virtual machine operations." lightbox="media/manage-virtual-machines.png":::
2727

2828
To perform guest OS operations on Arc-enabled VMs, you must enable guest management on the VMs. When you enable guest management, the Arc Connected Machine Agent is installed on the VM.
2929

30-
## Supported extensions and management services
31-
32-
### Windows extensions
33-
34-
|Extension |Publisher |Type |
35-
|----------|----------|-----|
36-
|Custom Script extension |Microsoft.Compute | CustomScriptExtension |
37-
|Log Analytics agent |Microsoft.EnterpriseCloud.Monitoring |MicrosoftMonitoringAgent |
38-
|Azure Automation Hybrid Runbook Worker extension (preview) |Microsoft.Compute | HybridWorkerForWindows|
39-
40-
41-
### Linux extensions
42-
43-
|Extension |Publisher |Type |
44-
|----------|----------|-----|
45-
|Custom Script extension |Microsoft.Azure.Extensions |CustomScript |
46-
|Log Analytics agent |Microsoft.EnterpriseCloud.Monitoring |OmsAgentForLinux |
47-
|Azure Automation Hybrid Runbook Worker extension (preview) | Microsoft.Compute | HybridWorkerForLinux|
48-
4930
## Enable guest management
5031

5132
Before you can install an extension, you must enable guest management on the VMware VM.
@@ -54,7 +35,7 @@ Before you can install an extension, you must enable guest management on the VMw
5435

5536
- is running a [supported operating system](../servers/prerequisites.md#supported-operating-systems).
5637

57-
- is able to connect through the firewall to communicate over the internet and these [URLs](../servers/network-requirements.md#urls) are not blocked.
38+
- is able to connect through the firewall to communicate over the internet and these [URLs](../servers/network-requirements.md#urls) aren't blocked.
5839

5940
- has VMware tools installed and running.
6041

@@ -73,18 +54,6 @@ Before you can install an extension, you must enable guest management on the VMw
7354

7455
For Linux, use the root account, and for Windows, use an account that is a member of the Local Administrators group.
7556

76-
## Install the LogAnalytics extension
77-
78-
1. From your browser, go to the [Azure portal](https://portal.azure.com).
79-
80-
1. Search for and select the VMware VM that you want to install extension.
81-
82-
1. Navigate to **Extensions** and select **Add**.
83-
84-
1. Select the extension you want to install. Based on the extension, you'll need to provide configuration details, such as the workspace ID and primary key for Log Analytics extension. Then select **Review + create**.
85-
86-
The deployment starts the installation of the extension on the selected VM.
87-
8857
## Delete a VM
8958

9059
If you no longer need the VM, you can delete it.
@@ -102,4 +71,4 @@ If you no longer need the VM, you can delete it.
10271
10372
## Next steps
10473

105-
[Create a VM using Azure Arc-enabled vSphere](quick-start-create-a-vm.md)
74+
[Create a VM using Azure Arc-enabled vSphere](quick-start-create-a-vm.md).

0 commit comments

Comments
 (0)