Skip to content

Commit 0bc0988

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-bicep
2 parents 1ebc3e8 + 1d00cb7 commit 0bc0988

File tree

45 files changed

+708
-724
lines changed

Some content is hidden

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

45 files changed

+708
-724
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/network-watcher/nsg-flow-logs-rest.md",
5+
"redirect_url": "/previous-versions/azure/network-watcher/nsg-flow-logs-rest",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/automation/update-management/configure-alerts.md",
510
"redirect_url": "/azure/update-manager/manage-alerts",

articles/api-management/get-started-create-service-instance.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: dlepow
55
ms.service: azure-api-management
66
ms.topic: quickstart
77
ms.custom: mvc, mode-portal, devdivchpfy22
8-
ms.date: 12/11/2023
8+
ms.date: 03/12/2025
99
ms.author: danlep
1010
---
1111

@@ -46,12 +46,16 @@ Sign in to the [Azure portal](https://portal.azure.com).
4646
| **Resource name** | A unique name for your API Management instance. The name can't be changed later. The service name refers to both the service and the corresponding Azure resource. <br/><br/> The service name is used to generate a default domain name: *\<name\>.azure-api.net.* If you would like to configure a custom domain name later, see [Configure a custom domain](configure-custom-domain.md). |
4747
| **Organization name** | The name of your organization. This name is used in many places, including the title of the developer portal and sender of notification emails. |
4848
| **Administrator email** | The email address to which all system notifications from **API Management** will be sent. |
49-
| **Pricing tier** | Select **Developer** tier to evaluate the service. This tier isn't for production use. For more information about scaling the API Management tiers, see [upgrade and scale](upgrade-and-scale.md). |
49+
| **Pricing tier** | Select a [tier](api-management-features.md) with the features you need. The **Basic v2** tier is an economical choice for development and testing scenarios and is deployed in a few minutes. |
50+
| **Units** | The number of units of capacity for the selected pricing tier. For evaluating API Management, you can accept the default value of 1 unit. |
5051

51-
1. Select **Review + create**.
52+
1. On the **Monitor + secure** tab, optionally select one or more recommended add-in services to use with API Management. These services incur extra costs. For example, select **Log Analytics** to define a Log Analytics workspace you can target for API Management logs.
5253

53-
> [!TIP]
54-
> It can take 30 to 40 minutes to create and activate an API Management service in this tier. To quickly find a newly created service, select **Pin to dashboard**.
54+
1. On the **Managed identity** tab, we recommend selecting the checkbox to enable a system-assigned identity for your API Management instance. A managed identity generated by Microsoft Entra ID allows your API Management instance to easily and securely access other Microsoft Entra protected resources, such as Azure Key Vault. Azure manages this identity, so you don't have to provision or rotate any credentials.
55+
56+
1. Optionally, on the **Tags** tab, add tags to your API Management instance. Tags are key-value pairs that help you organize and manage your Azure resources.
57+
58+
1. On the **Review + install** tab, review the settings you selected. If you need to make changes, go back to the previous tabs. If everything looks good, select **Create**.
5559

5660
[!INCLUDE [api-management-navigate-to-instance](../../includes/api-management-navigate-to-instance.md)]
5761

153 KB
Loading
Loading

articles/azure-app-configuration/howto-best-practices.md

Lines changed: 74 additions & 25 deletions
Large diffs are not rendered by default.

articles/azure-functions/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,6 @@
485485
href: functions-create-function-app-portal.md
486486
- name: Kotlin using IntelliJ
487487
href: functions-create-maven-kotlin-intellij.md
488-
- name: Linux App Service plan
489-
href: create-function-app-linux-app-service-plan.md
490488
- name: Consumption plan
491489
href: ./scripts/functions-cli-create-app-service-plan.md
492490
- name: Premium plan

articles/azure-netapp-files/manage-cool-access.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ services: azure-netapp-files
55
author: b-ahibbard
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 03/06/2025
8+
ms.date: 03/12/2025
99
ms.author: anfdocs
1010
---
1111

1212
# Manage Azure NetApp Files storage with cool access
1313

1414
When you use Azure NetApp Files [storage with cool access](cool-access-introduction.md), you can configure inactive data to move from Azure NetApp Files storage (the *hot tier*) to an Azure storage account (the *cool tier*). In doing so, you reduce the total cost of ownership of your data stored in Azure NetApp Files.
1515

16-
The cool access feature allows you to configure a capacity pool with cool access. The storage service level with cool access feature moves cold (infrequently accessed) data from the volume and the volume's snapshots to the Azure storage account to help you reduce the cost of storage. Throughput requirements remain the same for the service level (Standard, Premium, Ultra) enabled with cool access. However, there can be a difference in data access latency because the data needs to be read from the Azure storage account.
16+
The cool access feature allows you to configure a capacity pool with cool access. The storage service level with cool access feature moves cold (infrequently accessed) data from the volume and the volume's snapshots to the Azure storage account to help you reduce the cost of storage. There can be a difference in data access latency because the data needs to be read from the Azure storage account.
1717

1818
The storage with cool access feature provides options for the "coolness period" to optimize the network transfer cost, based on your workload and read/write patterns. This feature is provided at the volume level. For more information, see [Set options for coolness period section](#modify_cool). The storage with cool access feature also provides metrics on a per-volume basis. For more information, see the [Metrics section](cool-access-introduction.md#metrics).
1919

@@ -26,6 +26,7 @@ There are several considerations to be aware of when using cool access.
2626
* No guarantee is provided for any maximum latency for client workload for any of the service tiers.
2727
* Although cool access is available for the Standard, Premium, and Ultra service levels, how you're billed for using the feature differs from the hot tier service-level charges. For details and examples, see the [Billing section](cool-access-introduction.md#billing).
2828
* Cool access supports two tiering policies: `Auto` and `SnapshotOnly`. The `SnapshotOnly` policy limits data tiering to data in snapshots, while all data blocks associated with files in the active file system remain in the hot tier. The `Auto` policy encompasses both snapshot copy data and data in the active file system.
29+
Throughput is based on the [the service level](azure-netapp-files-service-levels.md#supported-service-levels) for both the `Auto` and `SnapshotOnly` tiering policies.
2930
* You can convert an existing capacity pool into a cool-access capacity pool to create cool access volumes. After the capacity pool is enabled for cool access, you can't convert it back to a non-cool-access capacity pool.
3031
* When you enable cool access, data that satisfies the conditions set by the coolness period moves to the cool tier. For example, if the coolness period is set to 30 days, any data that has been cool for at least 30 days moves to the cool tier _when_ you enable cool access. Once the coolness period is reached, background jobs can take up to 48 hours to initiate the data transfer to the cool tier.
3132
* A cool-access capacity pool can contain both volumes with cool access enabled and volumes with cool access disabled.
@@ -40,6 +41,7 @@ There are several considerations to be aware of when using cool access.
4041
- Enabling cool access on volumes in Premium and Ultra capacity pools results in reduced throughput:
4142
- For the Premium service level, throughput is 36 MiB/s per 1 TiB (compared to 64 MiB/s per 1 TiB without cool access)
4243
- For the Ultra service level, throughput is 68 MiB/second per 1 TiB (compared to 128 MiB/second per 1 TiB without cool access)
44+
- Reduced throughput limits are applicable to the `Auto` and `SnapshotOnly` tiering policies.
4345
- This reduced throughput remains in effect even if the cool access feature is subsequently turned off for the volume. 
4446
- When cool access is enabled on a volume, you benefit from a reduced price. You don't receive additional discounts specifically for the reduced bandwidth. Instead, you pay the cool access price, which inherently includes the reduced throughput.
4547

articles/communication-services/quickstarts/advanced-messaging/whatsapp/handle-advanced-messaging-events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The Event Grid Viewer is a sample site that allows you to view incoming events f
5555

5656
:::image type="content" source="./media/handle-advanced-messaging-events/default-domain.png" lightbox="./media/handle-advanced-messaging-events/default-domain.png" alt-text="Screenshot that shows URL of Events Viewer web app.":::
5757

58-
6. The URL for the Event Grid Viewer is the Site Name you used to create the deployment with the path `/api/update` appended.
58+
6. The URL for the Event Grid Viewer is the Site Name you used to create the deployment with the path `/api/updates` appended.
5959
For example: "https://{{site-name}}.azurewebsites.net/api/updates". You'll need it in the next step and during the creation of the demo app.
6060

6161
## Subscribe to Advanced Messaging events

articles/cost-management-billing/manage/change-credit-card.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ In the Azure portal, you can change your default payment method to a new credit
2020
- For a Microsoft Online Subscription Program (pay-as-you-go) account, you must be an [account administrator](add-change-subscription-administrator.md#whoisaa).
2121
- For a Microsoft Customer Agreement account, you must have the correct [Microsoft Customer Agreement permissions](understand-mca-roles.md).
2222

23-
The supported payment methods for Azure are credit card, debit card, and wire transfer. Azure doesn't support virtual or prepaid cards. To get approved to pay by wire transfer, see [Pay for your Azure subscription by wire transfer](pay-by-invoice.md).
23+
The supported payment methods for Azure are credit card, debit card, and wire transfer. Azure doesn't support virtual or prepaid cards. To see a complete list of supported payment methods, see [Supported payment methods](supported-payment-methods.md).
2424

25-
> [!NOTE]
26-
> Most countries/regions accept credit cards and debit cards. Here's some specific information:
27-
>
28-
> - Hong Kong Special Administrative Region and Brazil support only credit cards.
29-
> - India supports credit and debit cards through Visa and Mastercard.
30-
>
31-
> The Reserve Bank of India has a [regulation for storing credit card information](https://rbi.org.in/Scripts/BS_CircularIndexDisplay.aspx?Id=12159) that might affect credit card users in India. To summarize, customers in India can't store credit card information in Azure for recurring charges. Instead, they must enter their credit card information each time they want to pay for Azure services. For more information, see [Reserve Bank of India](../understand/pay-bill.md#reserve-bank-of-india).
25+
To get approved to pay by wire transfer, see [Pay for your Azure subscription by wire transfer](pay-by-invoice.md).
26+
27+
Most countries/regions accept credit cards and debit cards. Here's some specific information:
28+
29+
- Hong Kong Special Administrative Region and Brazil support only credit cards.
30+
- India supports credit and debit cards through Visa and Mastercard.
31+
32+
The Reserve Bank of India has a [regulation for storing credit card information](https://rbi.org.in/Scripts/BS_CircularIndexDisplay.aspx?Id=12159) that might affect credit card users in India. To summarize, customers in India can't store credit card information in Azure for recurring charges. Instead, they must enter their credit card information each time they want to pay for Azure services. For more information, see [Reserve Bank of India](../understand/pay-bill.md#reserve-bank-of-india).
3233

3334
If you get an error after you add a credit card, see [Troubleshoot a declined card](../troubleshoot-billing/troubleshoot-declined-card.md).
3435

0 commit comments

Comments
 (0)