Skip to content

Commit 875d71a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into retireedgio
2 parents 17dca5b + a8346dd commit 875d71a

29 files changed

+426
-562
lines changed

articles/api-management/api-management-howto-add-products.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ In this tutorial, you learn how to:
5353
| State | Select **Published** if you want to publish the product to the developer portal. Before the APIs in a product can be discovered by developers, the product must be published. By default, new products are unpublished. |
5454
| Requires subscription | Select if a user is required to subscribe to use the product (the product is *protected*) and a subscription key must be used to access the product's APIs. If a subscription isn't required (the product is *open*), a subscription key isn't required to access the product's APIs. See [Access to product APIs](#access-to-product-apis) later in this article. |
5555
| Requires approval | Select if you want an administrator to review and accept or reject subscription attempts to this product. If not selected, subscription attempts are auto-approved. |
56-
| Subscription count limit | Optionally limit the count of multiple simultaneous subscriptions. |
56+
| Subscription count limit | Optionally limit the count of multiple simultaneous subscriptions. Minimum value: 1 |
5757
| Legal terms | You can include the terms of use for the product which subscribers must accept in order to use the product. |
5858
| APIs | Select one or more APIs. You can also add APIs after creating the product. For more information, see [Add APIs to a product](#add-apis-to-a-product) later in this article. <br/><br/>If the product is open (doesn't require a subscription), you can only add an API that isn't associated with another open product. |
5959

articles/api-management/automate-portal-deployments.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.topic: how-to
1111

1212
# Automate developer portal deployments
1313

14-
[!INCLUDE [api-management-availability-premium-dev-standard-basic-premiumv2-standardv2-basicv2](../../includes/api-management-availability-premium-dev-standard-basic-premiumv2-standardv2-basicv2.md)]
14+
[!INCLUDE [api-management-availability-premium-dev-standard-basic](../../includes/api-management-availability-premium-dev-standard-basic.md)]
1515

1616
The API Management developer portal supports programmatic access to content. It allows you to import data to or export from an API Management service through the [content management REST API](/rest/api/apimanagement/). The REST API access works for both managed and self-hosted portals.
1717

@@ -22,6 +22,9 @@ You can use the API to automate migration of content between two API Management
2222
> [!WARNING]
2323
> The script removes contents of the developer portal in your destination API Management service. If you're concerned about it, make sure you perform a backup.
2424
25+
> [!NOTE]
26+
> Using the script to migrate developer portal content between an API Management instance in a classic tier (for example, Standard) and an instance in a v2 tier (for example, Standard v2) isn't currently supported. Migration of portal content between instances in the v2 tiers is also not supported.
27+
2528
> [!NOTE]
2629
> If you're using a self-hosted portal with an explicitly defined custom storage account to host media files (i.e., you define the `blobStorageUrl` setting in the `config.design.json` configuration file), you need to use the original `scripts/migrate.js` [script](https://github.com/Azure/api-management-developer-portal/blob/master/scripts.v2/migrate.js). The original script doesn't work for managed or self-hosted portals with the media storage account managed by API Management. In that case, use the script from the `/scripts.v3` folder instead.
2730
@@ -42,4 +45,4 @@ After the script is successfully executed, the target API Management service sho
4245
Learn more about the developer portal:
4346

4447
- [Azure API Management developer portal overview](api-management-howto-developer-portal.md)
45-
- [Self-host the developer portal](developer-portal-self-host.md)
48+
- [Self-host the developer portal](developer-portal-self-host.md)

articles/api-management/inject-vnet-v2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ If you want to enable *public* inbound access to an API Management instance in t
4343

4444
* The virtual network must be in the same region and Azure subscription as the API Management instance.
4545

46-
### Subnet requirements
46+
### Dedicated subnet
4747

48-
* The subnet for the API Management instance can't be shared with another Azure resource.
48+
* The subnet used for virtual network injection can only be used by a single API Management instance. It can't be shared with another Azure resource.
4949

5050
### Subnet size
5151

articles/api-management/integrate-vnet-outbound.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ If you want to inject a Premium v2 API Management instance into a virtual networ
3737

3838
* The virtual network must be in the same region and Azure subscription as the API Management instance.
3939

40-
### Subnet requirements
40+
### Dedicated subnet
4141

42-
* The subnet can't be shared with another Azure resource.
42+
* The subnet used for virtual network integration can only be used by a single API Management instance. It can't be shared with another Azure resource.
4343

4444
### Subnet size
4545

articles/api-management/private-endpoint.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,8 @@ To optionally limit incoming traffic to the API Management instance only to priv
256256
> [!NOTE]
257257
> Public network access can only be disabled in API Management instances configured with a private endpoint, not with other networking configurations.
258258
259+
#### [Classic](#tab/classic)
260+
259261
To disable the public network access property using the Azure CLI, run the following [az apim update](/cli/azure/apim#az-apim-update) command, substituting the names of your API Management instance and resource group:
260262

261263
```azurecli
@@ -264,6 +266,22 @@ az apim update --name my-apim-service --resource-group my-resource-group --publi
264266

265267
You can also use the [API Management Service - Update](/rest/api/apimanagement/api-management-service/update) REST API to disable public network access, by setting the `publicNetworkAccess` property to `Disabled`.
266268

269+
#### [Standard v2](#tab/v2)
270+
271+
To disable the public network access property in a Standard v2 instance using the Azure CLI, run the following [az rest](/cli/azure/reference-index#az-rest) command.
272+
273+
274+
```azurecli
275+
SUBSCRIPTION_ID=<your-subscription-id>
276+
RESOURCE_GROUP=<your-resource-group>
277+
SERVICE_NAME=<your-api-management-service-name>
278+
279+
az rest --method patch \
280+
--uri "https://management.azure.com/subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP/providers/Microsoft.ApiManagement/service/$SERVICE_NAME?api-version=2024-05-01" \
281+
--body "{ \"properties\": { \"publicNetworkAccess\": \"Disabled\" } }"
282+
```
283+
---
284+
267285
## Validate private endpoint connection
268286

269287
After the private endpoint is created, confirm its DNS settings in the portal:

articles/api-management/virtual-network-workspaces-resources.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ For information about networking options in API Management, see [Use a virtual n
2727

2828
* The virtual network must be in the same region and Azure subscription as the API Management instance.
2929

30-
## Subnet requirements
30+
### Dedicated subnet
3131

32-
* The subnet can't be shared with another Azure resource, including another workspace gateway.
32+
* The subnet used for virtual network integration can only be used by a single workspace gateway. It can't be shared with another Azure resource.
3333

3434
## Subnet size
3535

articles/azure-functions/functions-reference-powershell.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,14 @@ PSFunctionApp
539539
540540
When you start your function app, the PowerShell language worker adds this `Modules` folder to the `$env:PSModulePath` so that you can rely on module autoloading just as you would in a regular PowerShell script.
541541
542+
> [!NOTE]
543+
> If your function app is under source control, you should confirm that all the content in the Modules folder that you add is not excluded by .gitignore. For example, if one of your modules has a bin folder that is getting excluded, you would want to modify the .gitignore by replacing ```bin``` with
544+
> ```
545+
> **/bin/**
546+
> !Modules/**
547+
> ```
548+
>
549+
542550
### Troubleshooting Managed Dependencies
543551
544552
#### Enabling Managed Dependencies

articles/azure-vmware/faq.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
description: "Get answers to common questions about Azure VMware Solution."
55
ms.topic: faq
66
ms.service: azure-vmware
7-
ms.date: 1/16/2025
7+
ms.date: 1/24/2025
88
title: Common questions about Azure VMware Solution
99
summary: This article answers commonly asked questions about Azure VMware Solution.
1010

@@ -271,6 +271,9 @@ sections:
271271
- question: What is the RAID configuration of the disk groups?
272272
answer: The disk groups aren't RAID configured. Instead, they're just a bunch of disks (JBOD) and are [directly controlled by vSAN](https://core.vmware.com/vsan-learn-and-evaluate).
273273

274+
- question: Why does a vSphere Storage vMotion from Azure NetApp Files (ANF) to another datastore take an extended period of time?
275+
answer: This is due to the use of the Data Mover agent in the ESXi kernel. The Data Mover agent requires that all the blocks in the VMDK (Virtual Machine Disk) file be read and transferred to the ESXi host regardless of content. This results in the entire size of the VMDK to be transferred from the external array through the ESXi host to the destination datastore. The entire disk must be read in order to create a complete replica at the destination. The destination format and consumed space depends upon the destination datastore capabilities, protocol and format. Since all blocks must be read from the source datastore, the time to complete this operation may be longer than expected.
276+
274277

275278
- name: Hosts, clusters, and private clouds
276279
questions:

articles/frontdoor/front-door-diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The metrics listed in the following table are recorded and stored free of charge
3838
| Request Size | The number of bytes sent in requests from clients to Azure Front Door. | Endpoint, Client Country, client Region, HTTP Status, HTTP Status Group | Avg, Max |
3939
| Response Size | The number of bytes sent as responses from Front Door to clients. | Endpoint, client Country, client Region, HTTP Status, HTTP Status Group | Avg, Max |
4040
| Total Latency | Azure Front Door receives the client request and sends the last response byte to the client. This is the total time taken. For WebSocket, this metric refers to the time it takes to establish the WebSocket connection. | Endpoint, Client Country, Client Region, HTTP Status, HTTP Status Group | Avg, Max |
41-
| Web Application Firewall Request Count | The number of requests processed by the Azure Front Door web application firewall. | Action, Policy Name, Rule Name | Avg, Sum |
41+
| Web Application Firewall Request Count | The number of requests processed by Azure Front Door web application firewall with either no action taken, or a terminating action taken. To avoid duplicate counting `Log` actions are excluded. | Action, Policy Name, Rule Name | Avg, Sum |
4242

4343
> [!NOTE]
4444
> If a request to the origin times out, the value of the *Http Status* dimension is **0**.

articles/network-watcher/.openpublishing.redirection.network-watcher.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/network-watcher/packet-capture-vm-portal.md",
5+
"redirect_url": "/azure/network-watcher/packet-capture-manage",
6+
"redirect_document_id": true
7+
},
8+
{
9+
"source_path_from_root": "/articles/network-watcher/packet-capture-vm-powershell.md",
10+
"redirect_url": "/azure/network-watcher/packet-capture-manage",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/network-watcher/packet-capture-vm-cli.md",
15+
"redirect_url": "/azure/network-watcher/packet-capture-manage",
16+
"redirect_document_id": false
17+
},
318
{
419
"source_path_from_root": "/articles/network-watcher/supported-region-traffic-analytics.md",
520
"redirect_url": "/azure/network-watcher/traffic-analytics",

0 commit comments

Comments
 (0)