Skip to content

Commit e47e53a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-acc
2 parents e05ed6a + b483992 commit e47e53a

14 files changed

+49
-47
lines changed

articles/api-management/azure-openai-api-from-specification.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ In addition to the `azure-openai-token-limit` and `azure-openai-emit-token-metri
136136

137137
## Related content
138138

139+
* [Generative AI gateway capabilities in Azure API Management](genai-gateway-capabilities.md)
139140
* [API Management policy reference](api-management-policies.md)
140-
* [Azure OpenAI Service as a central capability with Azure API Management](/samples/azure/enterprise-azureai/enterprise-azureai/)
141-
* [Azure API Management - Azure OpenAI sample](https://github.com/galiniliev/apim-azure-openai-sample)
142141

143142
[!INCLUDE [api-management-define-api-topics.md](../../includes/api-management-define-api-topics.md)]

articles/app-service/overview-managed-identity.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ For .NET apps and functions, the simplest way to work with a managed identity is
304304
See the respective documentation headings of the client library for information:
305305

306306
- [Add Azure Identity client library to your project](/dotnet/api/overview/azure/identity-readme#getting-started)
307-
- [Access Azure service with a system-assigned identity](/dotnet/api/overview/azure/identity-readme#authenticating-with-defaultazurecredential)
308-
- [Access Azure service with a user-assigned identity](/dotnet/api/overview/azure/identity-readme#specifying-a-user-assigned-managed-identity-with-the-defaultazurecredential)
307+
- [Access Azure service with a system-assigned identity](/dotnet/api/overview/azure/identity-readme#authenticate-with-defaultazurecredential)
308+
- [Access Azure service with a user-assigned identity](/dotnet/api/overview/azure/identity-readme#specify-a-user-assigned-managed-identity-with-defaultazurecredential)
309309

310310
The linked examples use [`DefaultAzureCredential`](/dotnet/api/overview/azure/identity-readme#defaultazurecredential). It's useful for the majority of the scenarios because the same pattern works in Azure (with managed identities) and on your local machine (without managed identities).
311311

@@ -316,8 +316,8 @@ For Node.js apps and JavaScript functions, the simplest way to work with a manag
316316
See the respective documentation headings of the client library for information:
317317

318318
- [Add Azure Identity client library to your project](/javascript/api/overview/azure/identity-readme#install-the-package)
319-
- [Access Azure service with a system-assigned identity](/javascript/api/overview/azure/identity-readme#authenticating-with-defaultazurecredential)
320-
- [Access Azure service with a user-assigned identity](/javascript/api/overview/azure/identity-readme#authenticating-a-user-assigned-managed-identity-with-defaultazurecredential)
319+
- [Access Azure service with a system-assigned identity](/javascript/api/overview/azure/identity-readme#authenticate-with-defaultazurecredential)
320+
- [Access Azure service with a user-assigned identity](/javascript/api/overview/azure/identity-readme#specify-a-user-assigned-managed-identity-with-defaultazurecredential)
321321

322322
The linked examples use [`DefaultAzureCredential`](/javascript/api/overview/azure/identity-readme#defaultazurecredential). It's useful for the majority of the scenarios because the same pattern works in Azure (with managed identities) and on your local machine (without managed identities).
323323

@@ -330,8 +330,8 @@ For Python apps and functions, the simplest way to work with a managed identity
330330
See the respective documentation headings of the client library for information:
331331

332332
- [Add Azure Identity client library to your project](/python/api/overview/azure/identity-readme#getting-started)
333-
- [Access Azure service with a system-assigned identity](/python/api/overview/azure/identity-readme#authenticating-with-defaultazurecredential)
334-
- [Access Azure service with a user-assigned identity](/python/api/overview/azure/identity-readme#authenticating-a-user-assigned-managed-identity-with-defaultazurecredential)
333+
- [Access Azure service with a system-assigned identity](/python/api/overview/azure/identity-readme#authenticate-with-defaultazurecredential)
334+
- [Access Azure service with a user-assigned identity](/python/api/overview/azure/identity-readme#authenticate-with-a-user-assigned-managed-identity)
335335

336336
The linked examples use [`DefaultAzureCredential`](/python/api/overview/azure/identity-readme#defaultazurecredential). It's useful for the majority of the scenarios because the same pattern works in Azure (with managed identities) and on your local machine (without managed identities).
337337

@@ -342,8 +342,8 @@ For Java apps and functions, the simplest way to work with a managed identity is
342342
See the respective documentation headings of the client library for information:
343343

344344
- [Add Azure Identity client library to your project](/java/api/overview/azure/identity-readme#include-the-package)
345-
- [Access Azure service with a system-assigned identity](/java/api/overview/azure/identity-readme#authenticating-with-defaultazurecredential)
346-
- [Access Azure service with a user-assigned identity](/java/api/overview/azure/identity-readme#authenticating-a-user-assigned-managed-identity-with-defaultazurecredential)
345+
- [Access Azure service with a system-assigned identity](/java/api/overview/azure/identity-readme#authenticate-with-defaultazurecredential)
346+
- [Access Azure service with a user-assigned identity](/java/api/overview/azure/identity-readme#authenticate-a-user-assigned-managed-identity-with-defaultazurecredential)
347347

348348
The linked examples use [`DefaultAzureCredential`](/azure/developer/java/sdk/identity-azure-hosted-auth#default-azure-credential). It's useful for the majority of the scenarios because the same pattern works in Azure (with managed identities) and on your local machine (without managed identities).
349349

articles/cost-management-billing/manage/avoid-unused-subscriptions.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.reviewer: mijeffer
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: concept-article
9-
ms.date: 10/08/2024
9+
ms.date: 10/22/2024
1010
ms.author: banders
1111
# customer intent: As a billing administrator, I want to prevent my subscriptions from getting blocked or deleted.
1212
---
@@ -16,7 +16,11 @@ ms.author: banders
1616
Unused and abandoned subscriptions can increase potential security risks to your Azure account. To reduce this risk, Microsoft takes measures to secure, protect, and ultimately delete unused Azure subscriptions.
1717

1818
>[!NOTE]
19-
> This article only applies to Microsoft Online Service Program (MOSP) and Cloud Solution Provider (CSP) subscriptions.
19+
> This article only applies to the following subscription types:
20+
> - Microsoft Online Service Program (MOSP)
21+
> - Cloud Solution Provider (CSP)
22+
> - Microsoft Customer Agreement (MCA) that you bought through the Azure website or Azure portal
23+
> - Microsoft Customer Agreement (MCA) that you bought through a Microsoft representative
2024
2125
## What is an unused subscription?
2226

articles/dev-box/how-to-customize-devbox-azure-image-builder.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,25 @@ ms.service: dev-box
77
ms.custom: devx-track-azurepowershell
88
author: RoseHJM
99
ms.author: rosemalcolm
10-
ms.date: 01/02/2024
10+
ms.date: 10/22/2024
1111
ms.topic: how-to
12+
ai-usage: ai-assisted
1213
---
1314

1415
# Configure a dev box by using Azure VM Image Builder and Microsoft Dev Box
1516

1617
In this article, you use Azure VM Image Builder to create a customized dev box in Microsoft Dev Box by using a template. The template includes a customization step to install Visual Studio Code (VS Code).
1718

18-
When your organization uses standardized virtual machine (VM) images, it can more easily migrate to the cloud and help ensure consistency in your deployments. Images ordinarily include predefined security, configuration settings, and any necessary software. Setting up your own imaging pipeline requires time, infrastructure, and many other details. With Azure VM Image Builder, you can create a configuration that describes your image. The service then builds the image and submits it to a dev box project.
19+
Using standardized virtual machine (VM) images helps you ensure consistent deployments as you migrate to the cloud. These images can include predefined security, configuration settings, and necessary software. Setting up an imaging pipeline can be time-consuming and complex. Azure VM Image Builder simplifies this process by allowing you to create a configuration for your image, which the service then builds and submits to a dev box project.
1920

20-
Although it's possible to create custom VM images by hand or by using other tools, the process can be cumbersome and unreliable. VM Image Builder, which is built on HashiCorp Packer, gives you the benefits of a managed service.
21+
Creating custom VM images manually or with other tools can be difficult and unreliable. VM Image Builder, which is built on HashiCorp Packer, offers the advantages of a managed service.
2122

22-
To reduce the complexity of creating VM images, VM Image Builder:
23+
To simplify VM image creation, VM Image Builder:
2324

24-
- Removes the need to use complex tooling, processes, and manual steps to create a VM image. VM Image Builder abstracts out all these details and hides Azure-specific requirements, such as the need to generalize the image (Sysprep). And it gives more advanced users the ability to override such requirements.
25-
26-
- Works with existing image build pipelines for a click-and-go experience. You can call VM Image Builder from your pipeline or use an Azure VM Image Builder service DevOps task.
27-
28-
- Fetches customization data from various sources, which removes the need to collect them all from one place.
29-
30-
- Integrates with Azure Compute Gallery, which creates an image management system for distributing, replicating, versioning, and scaling images globally. Additionally, you can distribute the same resulting image as a virtual hard disk or as one or more managed images, without having to rebuild them from scratch.
25+
- Eliminates the need for complex tools, processes, and manual steps. It abstracts these details and hides Azure-specific needs, like generalizing the image (Sysprep), while allowing advanced users to override if necessary.
26+
- Works with existing image build pipelines. You can call VM Image Builder from your pipeline or use an Azure VM Image Builder service DevOps task.
27+
- Gathers customization data from various sources, so you don't have to collect it all in one place.
28+
- Integrates with Azure Compute Gallery, creating an image management system for global distribution, replication, versioning, and scaling. You can distribute the same image as a virtual hard disk or managed images without rebuilding them.
3129

3230
> [!IMPORTANT]
3331
> Microsoft Dev Box supports only images that use the security type [Trusted Launch](/azure/virtual-machines/trusted-launch-portal?tabs=portal%2Cportal2) enabled.
@@ -43,7 +41,9 @@ To provision a custom image that you created by using VM Image Builder, you need
4341

4442
## Create a Windows image and distribute it to Azure Compute Gallery
4543

46-
The first step is to use Azure VM Image Builder and Azure PowerShell to create an image version in Azure Compute Gallery and then distribute the image globally. You can also do this task by using the Azure CLI.
44+
The first step is to use Azure VM Image Builder and Azure PowerShell to create an image in Azure Compute Gallery and distribute it globally.
45+
46+
The following example uses PowerShell. You can also use the Azure Command-Line Interface (CLI).
4747

4848
1. To use VM Image Builder, you need to register the features.
4949

@@ -101,7 +101,7 @@ The first step is to use Azure VM Image Builder and Azure PowerShell to create a
101101

102102
1. Create a user-assigned identity and set permissions on the resource group by running the following code in PowerShell.
103103

104-
VM Image Builder uses the provided user identity to inject the image into Azure Compute Gallery. The following example creates an Azure role definition with specific actions for distributing the image. The role definition is then assigned to the user identity.
104+
VM Image Builder uses the user identity you provide to store the image in Azure Compute Gallery. The following example creates an Azure role definition with specific actions for distributing the image. The role definition is then assigned to the user identity.
105105

106106
```powershell
107107
# Set up role definition names, which need to be unique
@@ -121,7 +121,7 @@ The first step is to use Azure VM Image Builder and Azure PowerShell to create a
121121

122122
1. Assign permissions for the identity to distribute the images.
123123

124-
Use this command to download an Azure role definition template, and then update it with the previously specified parameters:
124+
Use this command to download an Azure role definition template, and update it with the previously specified parameters:
125125

126126
```powershell
127127
$aibRoleImageCreationUrl="https://raw.githubusercontent.com/azure/azvmimagebuilder/master/solutions/12_Creating_AIB_Security_Roles/aibRoleImageCreation.json"
@@ -142,7 +142,7 @@ The first step is to use Azure VM Image Builder and Azure PowerShell to create a
142142

143143
## Create a gallery
144144

145-
To use VM Image Builder with Azure Compute Gallery, you need to have an existing gallery and image definition. VM Image Builder doesn't create the gallery and image definition for you.
145+
To use VM Image Builder with Azure Compute Gallery, make sure you have an existing gallery and image definition. VM Image Builder doesn't create the gallery and image definition for you.
146146

147147
1. Run the following commands to create a new gallery and image definition.
148148

@@ -310,11 +310,11 @@ To use VM Image Builder with Azure Compute Gallery, you need to have an existing
310310
311311
## Configure the gallery
312312
313-
After your custom image is provisioned in the gallery, you can configure the gallery to use the images in the dev center. For more information, see [Configure Azure Compute Gallery](./how-to-configure-azure-compute-gallery.md).
313+
When your custom image is stored in the gallery, you can configure the gallery to use the images in the dev center. For more information, see [Configure Azure Compute Gallery](./how-to-configure-azure-compute-gallery.md).
314314
315315
## Set up Microsoft Dev Box with a custom image
316316
317-
After the gallery images are available in the dev center, you can use the custom image with Microsoft Dev Box. For more information, see [Quickstart: Configure Microsoft Dev Box](./quickstart-configure-dev-box-service.md).
317+
When the gallery images are available in the dev center, you can use the custom image with Microsoft Dev Box. For more information, see [Quickstart: Configure Microsoft Dev Box](./quickstart-configure-dev-box-service.md).
318318
319319
## Related content
320320

articles/expressroute/expressroute-troubleshooting-arp-classic.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ The following section provides information about how to view the ARP tables that
5050
## Prerequisites for using ARP tables
5151
Ensure that you have the following before you continue:
5252

53-
* A valid ExpressRoute circuit that's configured with at least one peering. The circuit must be fully configured by the connectivity provider. You (or your connectivity provider) must configure at least one of the peerings (Azure private, Azure public, or Microsoft) on this circuit.
54-
* IP address ranges that are used for configuring the peerings (Azure private, Azure public, and Microsoft). Review the IP address assignment examples in the [ExpressRoute routing requirements page](expressroute-routing.md) to get an understanding of how IP addresses are mapped to interfaces on your side and on the ExpressRoute side. You can get information about the peering configuration by reviewing the [ExpressRoute peering configuration page](expressroute-howto-routing-classic.md).
53+
* A valid ExpressRoute circuit that's configured with at least one peering. The circuit must be fully configured by the connectivity provider. You (or your connectivity provider) must configure at least one of the peerings (Azure private or Microsoft) on this circuit.
54+
* IP address ranges that are used for configuring the peerings (Azure private and Microsoft). Review the IP address assignment examples in the [ExpressRoute routing requirements page](expressroute-routing.md) to get an understanding of how IP addresses are mapped to interfaces on your side and on the ExpressRoute side. You can get information about the peering configuration by reviewing the [ExpressRoute peering configuration page](expressroute-howto-routing-classic.md).
5555
* Information from your networking team or connectivity provider about the MAC addresses of the interfaces that are used with these IP addresses.
5656
* The latest Windows PowerShell module for Azure (version 1.50 or later).
5757

@@ -63,7 +63,7 @@ The following cmdlet provides the ARP tables for Azure private peering:
6363

6464
```azurepowershell
6565
# Required variables
66-
$ckt = "<your Service Key here>
66+
$ckt = "<your Service Key here>"
6767
6868
# ARP table for Azure private peering--primary path
6969
Get-AzureDedicatedCircuitPeeringArpInfo -ServiceKey $ckt -AccessType Private -Path Primary
@@ -110,7 +110,7 @@ The ARP table of a peering can be used to validate Layer 2 configuration and con
110110
* The ARP table has an entry for the on-premises side with a valid IP and MAC address, and a similar entry for the Microsoft side.
111111
* The last octet of the on-premises IP address is always an odd number.
112112
* The last octet of the Microsoft IP address is always an even number.
113-
* The same MAC address appears on the Microsoft side for all three peerings (primary/secondary).
113+
* The same MAC address appears on the Microsoft side for the peerings (Azure private and Microsoft).
114114

115115
```output
116116
Age InterfaceProperty IpAddress MacAddress

articles/storage/files/files-whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ The experience for domain joining an Azure storage account has been improved to
201201
For more information, see:
202202

203203
- [Overview of Azure Files identity-based authentication options for SMB access](storage-files-active-directory-overview.md)
204-
- [Overview - on-premises Active Directory Domain Services authentication over SMB for Azure file shares](storage-files-identity-auth-active-directory-enable.md)
204+
- [Overview - on-premises Active Directory Domain Services authentication over SMB for Azure file shares](storage-files-identity-ad-ds-overview.md)
205205

206206
### 2021 quarter 1 (January, February, March)
207207
#### Azure Files management now available through the control plane

articles/storage/files/smb-performance.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ Currently the metadata caching preview is only available in the following Azure
227227
- Switzerland North
228228
- UAE North
229229
- UK West
230+
- UK South
230231
- US South Central
231232
- US West Central
232233
- US West 3

articles/storage/files/storage-files-identity-ad-ds-enable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ recommendations: false
1515
This article describes the process for enabling Active Directory Domain Services (AD DS) authentication on your storage account in order to use on-premises Active Directory (AD) credentials for authenticating to Azure file shares.
1616

1717
> [!IMPORTANT]
18-
> Before you enable AD DS authentication, make sure you understand the supported scenarios and requirements in the [overview article](storage-files-identity-ad-ds-overview.md) and complete the necessary [prerequisites](storage-files-identity-auth-active-directory-enable.md#prerequisites). If your Active Directory environment spans multiple forests, see [Use Azure Files with multiple Active Directory forests](storage-files-identity-multiple-forests.md).
18+
> Before you enable AD DS authentication, make sure you understand the supported scenarios and requirements in the [overview article](storage-files-identity-ad-ds-overview.md) and complete the necessary [prerequisites](storage-files-identity-ad-ds-overview.md#prerequisites). If your Active Directory environment spans multiple forests, see [Use Azure Files with multiple Active Directory forests](storage-files-identity-multiple-forests.md).
1919
2020
To enable AD DS authentication over SMB for Azure file shares, you need to register your Azure storage account with your on-premises AD DS and then set the required domain properties on the storage account. To register your storage account with AD DS, you create a computer account (or service logon account) representing it in your AD DS. Think of this process as if it were like creating an account representing an on-premises Windows file server in your AD DS. When the feature is enabled on the storage account, it applies to all new and existing file shares in the account.
2121

0 commit comments

Comments
 (0)