Skip to content

Commit 2d3663f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into mdb-roadmap-update-jan26
2 parents f26512e + d205b75 commit 2d3663f

1,036 files changed

Lines changed: 10626 additions & 47779 deletions

File tree

Some content is hidden

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

.openpublishing.publish.config.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -834,12 +834,6 @@
834834
"branch": "tutorial",
835835
"branch_mapping": {}
836836
},
837-
{
838-
"path_to_root": "samples-tsi",
839-
"url": "https://github.com/Azure-Samples/Azure-Time-Series-Insights",
840-
"branch": "master",
841-
"branch_mapping": {}
842-
},
843837
{
844838
"path_to_root": "storage-mgmt-devguide-dotnet",
845839
"url": "https://github.com/Azure-Samples/storage-mgmt-devguide-dotnet",

.openpublishing.redirection.json

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/network-watcher/network-watcher-using-open-source-tools.md",
5+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-using-open-source-tools",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/network-watcher/network-watcher-intrusion-detection-open-source-tools.md",
10+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-intrusion-detection-open-source-tools",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "articles/frontdoor/migrate-cdn-to-front-door.md",
515
"redirect_url": "/previous-versions/azure/frontdoor/migrate-cdn-to-front-door",
@@ -235,7 +245,7 @@
235245
"redirect_url": "/azure/resiliency/quick-understand-protection-estate",
236246
"redirect_document_id": false
237247
},
238-
{
248+
{
239249
"source_path": "articles/business-continuity-center/business-continuity-center-support-matrix.md",
240250
"redirect_url": "/azure/resiliency/resiliency-support-matrix",
241251
"redirect_document_id": false
@@ -263,42 +273,27 @@
263273
{
264274
"source_path": "articles/migrate/concepts-azure-spring-apps-assessment-calculation.md",
265275
"redirect_url": "/azure/migrate",
266-
"redirect_document_id": false,
267-
"monikers": [
268-
"migrate"
269-
]
276+
"redirect_document_id": false
270277
},
271278
{
272279
"source_path": "articles/migrate/how-to-create-azure-spring-apps-assessment.md",
273280
"redirect_url": "/azure/migrate",
274-
"redirect_document_id": false,
275-
"monikers": [
276-
"migrate"
277-
]
281+
"redirect_document_id": false
278282
},
279283
{
280284
"source_path": "articles/migrate/troubleshoot-spring-boot-discovery.md",
281285
"redirect_url": "/azure/migrate",
282-
"redirect_document_id": false,
283-
"monikers": [
284-
"migrate"
285-
]
286+
"redirect_document_id": false
286287
},
287288
{
288289
"source_path": "articles/migrate/tutorial-assess-spring-boot.md",
289290
"redirect_url": "/azure/migrate",
290-
"redirect_document_id": false,
291-
"monikers": [
292-
"migrate"
293-
]
291+
"redirect_document_id": false
294292
},
295293
{
296294
"source_path": "articles/migrate/tutorial-discover-spring-boot.md",
297295
"redirect_url": "/azure/migrate",
298-
"redirect_document_id": false,
299-
"monikers": [
300-
"migrate"
301-
]
296+
"redirect_document_id": false
302297
},
303298
{
304299
"source_path": "articles/azure-functions/functions-proxies.md",
@@ -1232,7 +1227,8 @@
12321227
},
12331228
{
12341229
"source_path": "articles/databox-online/azure-stack-edge-2301-release-notes.md",
1235-
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes"
1230+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes",
1231+
"redirect_document_id": false
12361232
},
12371233
{
12381234
"source_path": "articles/network-watcher/nsg-flow-logs-rest.md",
@@ -6384,8 +6380,7 @@
63846380
"redirect_url": "/azure/cyclecloud/release-notes/ccws/2025-02-06",
63856381
"redirect_document_id": false
63866382
},
6387-
6388-
{
6383+
{
63896384
"source_path": "articles/app-service/sre-agent-overview.md",
63906385
"redirect_url": "/azure/sre-agent/overview",
63916386
"redirect_document_id": false
@@ -6435,26 +6430,11 @@
64356430
"redirect_url": "/azure/iot-hub-device-update/",
64366431
"redirect_document_id": false
64376432
},
6438-
{
6439-
"source_path": "articles/reliability/asm-retirement.md",
6440-
"redirect_url": "/azure/azure-resource-manager/management/asm-retirement",
6441-
"redirect_document_id": false
6442-
},
6443-
{
6444-
"source_path": "articles/reliability/reliability-azure-container-apps.md",
6445-
"redirect_url": "/azure/reliability/reliability-container-apps",
6446-
"redirect_document_id": false
6447-
},
64486433
{
64496434
"source_path": "articles/storage/container-storage/container-storage-aks-quickstart.md",
64506435
"redirect_url": "/azure/storage/container-storage/install-container-storage-aks",
64516436
"redirect_document_id": true
64526437
},
6453-
{
6454-
"source_path": "articles/reliability/reliability-cosmos-mongodb.md",
6455-
"redirect_url": "/azure/reliability/reliability-documentdb",
6456-
"redirect_document_id": true
6457-
},
64586438
{
64596439
"source_path": "articles/communications-gateway/connectivity.md",
64606440
"redirect_url": "/previous-versions/azure/communications-gateway/connectivity",
@@ -6644,7 +6624,7 @@
66446624
"source_path": "articles/communications-gateway/whats-new.md",
66456625
"redirect_url": "/previous-versions/azure/communications-gateway/whats-new",
66466626
"redirect_document_id": false
6647-
},
6627+
},
66486628
{
66496629
"source_path": "articles/vpn-gateway/about-zone-redundant-vnet-gateways.md",
66506630
"redirect_url": "/azure/reliability/reliability-virtual-network-gateway",
@@ -6655,12 +6635,22 @@
66556635
"redirect_url": "https://learn.microsoft.com/dotnet/api/overview/azure/resourcemanager.dns-readme",
66566636
"redirect_document_id": false
66576637
},
6658-
{
6638+
{
66596639
"source_path": "articles/oracle/oracle-db/exadata-vm-clusters.md",
66606640
"redirect_url": "/azure/oracle/oracle-db/database-overview",
66616641
"redirect_document_id": false
66626642
},
66636643
{
6644+
"source_path": "articles/cyclecloud/how-to/ccws/register-entra-id-app.md",
6645+
"redirect_url": "/azure/cyclecloud/how-to/create-app-registration",
6646+
"redirect_document_id": false
6647+
},
6648+
{
6649+
"source_path": "articles/cyclecloud/how-to/ccws/open-ondemand-add-users.md",
6650+
"redirect_url": "/azure/cyclecloud/how-to/ccws/configure-open-ondemand",
6651+
"redirect_document_id": false
6652+
},
6653+
{
66646654
"source_path": "articles/reliability/reliability-health-insights.md",
66656655
"redirect_url": "/azure/azure-health-insights/reliability-health-insights",
66666656
"redirect_document_id": false
@@ -6674,6 +6664,11 @@
66746664
"source_path": "articles/nat-gateway/nat-availability-zones.md",
66756665
"redirect_url": "/azure/reliability/reliability-nat-gateway",
66766666
"redirect_document_id": false
6677-
}
6667+
},
6668+
{
6669+
"source_path": "articles/cyclecloud/how-to/collect-custom-metrics-gpu-infiniband-telegraf.md",
6670+
"redirect_url": "/azure/cyclecloud/how-to/monitor-cyclecloud-cluster-using-prometheus-grafana",
6671+
"redirect_document_id": false
6672+
}
66786673
]
66796674
}

articles/active-directory-b2c/add-captcha.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: kengaderdus
1111
ms.subservice: b2c
1212
zone_pivot_groups: b2c-policy-type
1313

14-
#Customer intent: As a developer, I want to enable CAPTCHA in consumer-facing application that is secured by Azure Active Directory B2C, so that I can protect my sign-in and sign-up flows from automated attacks.
14+
#Customer intent: As a developer, I want to enable CAPTCHA in a consumer-facing application that is secured by Azure Active Directory B2C, so that I can protect my sign-in and sign-up flows from automated attacks.
1515

1616
---
1717

@@ -21,7 +21,7 @@ zone_pivot_groups: b2c-policy-type
2121

2222
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
2323

24-
Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to prevent automated attacks on your consumer-facing applications. Azure AD B2C’s CAPTCHA supports both audio and visual CAPTCHA challenges. You can enable this security feature in both sign-up and sign-in flows for your local accounts. CAPTCHA isn't applicable for social identity providers' sign-in.
24+
Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to prevent automated attacks on your consumer-facing applications. Azure AD B2C CAPTCHA supports both audio and visual challenges. You can enable this security feature in both sign-up and sign-in flows for your local accounts. CAPTCHA isn't applicable for social identity providers' sign-in.
2525

2626
> [!NOTE]
2727
> This feature is in public preview
@@ -52,7 +52,7 @@ Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to preven
5252

5353
## Test the user flow
5454

55-
Use the steps in [Test the user flow](tutorial-create-user-flows.md?pivots=b2c-user-flow#test-the-user-flow-1) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type, visual, or audio, you choose.
55+
Use the steps in [Test the user flow](tutorial-create-user-flows.md?pivots=b2c-user-flow#test-the-user-flow-1) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type (visual or audio) that you choose.
5656

5757
::: zone-end
5858

@@ -395,7 +395,7 @@ Use the steps in [Test the custom policy](tutorial-create-user-flows.md?pivots=b
395395

396396
> [!NOTE]
397397
> - You can't add CAPTCHA to an MFA step in a sign-up only user flow.
398-
> - In an MFA flow, CAPTCHA is applicable where the MFA method you select is SMS or phone call, SMS only or Phone call only.
398+
> - In an MFA flow, CAPTCHA is applicable where the MFA method you select is SMS or phone call, SMS only, or phone call only.
399399
400400
## Related content
401401

articles/active-directory-b2c/phone-based-mfa.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: kengaderdus
77
manager: CelesteDG
88
ms.service: azure-active-directory
99
ms.topic: how-to
10-
ms.date: 11/05/2025
10+
ms.date: 1/21/2025
1111
ms.author: kengaderdus
1212
ms.subservice: b2c
1313
ms.custom: sfi-image-nochange
@@ -123,22 +123,29 @@ To help prevent fraudulent sign-ups, remove any country/region codes that do not
123123
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
124124
<TrustFrameworkPolicy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
125125
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
126-
xmlns="http://schemas.microsoft.com/online/cpim/schemas/2013/06" PolicySchemaVersion="0.3.0.0" TenantId="yourtenant.onmicrosoft.com" PolicyId="B2C_1A_signup_signin" PublicPolicyUri="http://yourtenant.onmicrosoft.com/B2C_1A_signup_signin">
126+
xmlns="http://schemas.microsoft.com/online/cpim/schemas/2013/06"
127+
PolicySchemaVersion="0.3.0.0"
128+
TenantId="yourtenant.onmicrosoft.com"
129+
PolicyId="B2C_1A_signup_signin"
130+
PublicPolicyUri="http://yourtenant.onmicrosoft.com/B2C_1A_signup_signin">
127131

128132
<BasePolicy>
129133
<TenantId>yourtenant.onmicrosoft.com</TenantId>
130134
<PolicyId>B2C_1A_TrustFrameworkExtensions</PolicyId>
131135
</BasePolicy>
132-
136+
137+
<!-- Add this BuildingBlocks section to the relying party policy. -->
133138
<BuildingBlocks>
134-
<!-- Add the XML code outlined in Step 2 if this section. -->
139+
<!-- Add the XML code outlined in Step 2 in this section. -->
135140
</BuildingBlocks>
136141

137142
<RelyingParty>
138143
...
139144
</RelyingParty>
140145
</TrustFrameworkPolicy>
141146
```
147+
> [!IMPORTANT]
148+
>Add the code in step 2 to the _relying party policy_ to enforce country/region code restrictions on the server side. You must not define these elements only in parent policies; put them in the relying party policy.
142149

143150
1. In the `BuildingBlocks` section of this policy file, add the following code. Make sure to include only the country/region codes relevant to your organization:
144151

@@ -178,11 +185,8 @@ To help prevent fraudulent sign-ups, remove any country/region codes that do not
178185

179186
The countryList acts as an allow list. Only the countries/regions you specify in this list (for example, Japan, Bulgaria, and the United States) are permitted to use MFA. All other countries/regions are blocked.
180187

181-
> [!IMPORTANT]
182-
> This code must be added to the relying party policy to ensure the country/region code restrictions are properly enforced on the server side.
188+
183189

184190
## Related content
185191

186192
- Learn about [Identity Protection and Conditional Access for Azure AD B2C](conditional-access-identity-protection-overview.md)
187-
188-
- Apply [Conditional Access to user flows in Azure Active Directory B2C](conditional-access-user-flow.md)

articles/active-directory-b2c/service-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: azure-active-directory
99

1010
ms.topic: reference
11-
ms.date: 01/08/2026
11+
ms.date: 01/22/2026
1212
ms.subservice: b2c
1313
zone_pivot_groups: b2c-policy-type
1414

@@ -186,7 +186,7 @@ The following table lists the administrative configuration limits in the Azure A
186186

187187
## Region specific service limits
188188

189-
As a protection for our customers, Microsoft places some restrictions on telephony verification for certain region codes. The following table lists the region codes and their corresponding limits. These limits apply to both SMS and Voice verification.
189+
As a protection for our customers, Microsoft places some restrictions on telephony verification for certain region codes. The following table lists the region codes and their corresponding limits. Only SMS verification is subject to these limits.
190190

191191
| Region Code | Region Name | Limit per tenant per 60 minutes | Limit per tenant per 24 hours |
192192
|:----------- |:---------------------------------------------- |:------------------------------- | :----------------------------------------|

articles/api-center/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
- name: API center management and operations
100100
items:
101101
- name: Reliability
102-
href: ../reliability/reliability-api-center.md?toc=/azure/api-center/toc.json&bc=/azure/api-center/breadcrumb/toc.json
102+
href: /azure/reliability/reliability-api-center?toc=/azure/api-center/toc.json&bc=/azure/api-center/breadcrumb/toc.json
103103
- name: Reference
104104
items:
105105
- name: Azure CLI

articles/api-center/synchronize-api-management-apis.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ description: Integrate an API Management instance to Azure API Center for automa
44
author: dlepow
55
ms.service: azure-api-center
66
ms.topic: how-to
7-
ms.date: 07/22/2025
7+
ms.date: 01/20/2026
88
ms.author: danlep
99
ms.custom: devx-track-azurecli
1010
# Customer intent: As an API program manager, I want to integrate my Azure API Management instance with my API center and synchronize API Management APIs to my inventory.
1111
---
1212

1313
# Synchronize APIs from an API Management instance
1414

15-
This article shows how to integrate an API Management instance so that the instances's APIs are continuously kept up to date in your [API center](overview.md) inventory.
15+
This article shows how to integrate an API Management instance so that the instance's APIs are continuously kept up to date in your [API center](overview.md) inventory.
1616

1717
> [!TIP]
1818
> This article explains how to integrate an API Management instance from your API center. Alternatively, quickly set up integration directly from an API Management instance. In the left menu of your instance, under **APIs**, select **API Center**, and select a target API center in your subscription to synchronize APIs to.
@@ -31,7 +31,7 @@ API Management APIs automatically synchronize to the API center whenever existin
3131

3232
> [!NOTE]
3333
> * There are [limits](../azure-resource-manager/management/azure-subscription-service-limits.md?toc=/azure/api-center/toc.json&bc=/azure/api-center/breadcrumb/toc.json#azure-api-center-limits) for the number of integrated API Management instances (API sources).
34-
> * An integrated API Management instance can be configured in a virtual network.
34+
> * You can configure an integrated API Management instance in a virtual network.
3535
> * API updates in API Management typically synchronize to your API center within minutes, but synchronization can take up to 24 hours.
3636
> * API definitions also synchronize to the API center if you select the option to include them during integration.
3737
@@ -41,7 +41,7 @@ API Management APIs automatically synchronize to the API center whenever existin
4141

4242
## Prerequisites
4343

44-
* An API center in your Azure subscription. If you haven't created one, see [Quickstart: Create your API center](set-up-api-center.md).
44+
* An API center in your Azure subscription. If you didn't create an API center, see [Quickstart: Create your API center](set-up-api-center.md).
4545

4646
* An Azure API Management instance, in the same or a different subscription. The instance must be in the same directory.
4747

@@ -51,7 +51,7 @@ API Management APIs automatically synchronize to the API center whenever existin
5151
[!INCLUDE [install-apic-extension](includes/install-apic-extension.md)]
5252

5353
> [!NOTE]
54-
> Azure CLI command examples in this article can run in PowerShell or a bash shell. Where needed because of different variable syntax, separate command examples are provided for the two shells.
54+
> You can run Azure CLI command examples in this article in PowerShell or a bash shell. Where different variable syntax is required, the article provides separate command examples for the two shells.
5555
5656
[!INCLUDE [enable-managed-identity](includes/enable-managed-identity.md)]
5757

@@ -61,14 +61,14 @@ API Management APIs automatically synchronize to the API center whenever existin
6161

6262
## Integrate an API Management instance
6363

64-
You can integrate an API Management instance using the portal or the Azure CLI.
64+
You can integrate an API Management instance by using the portal or the Azure CLI.
6565

6666
#### [Portal](#tab/portal)
6767

68-
1. In the [portal](https://portal.azure.com), navigate to your API center.
68+
1. In the [portal](https://portal.azure.com), go to your API center.
6969
1. Under **Platforms**, select **Integrations**.
7070
1. Select **+ New integration** > **From Azure API Management**.
71-
1. In the **Integrate your Azure API Management Service** page:
71+
1. In **Integrate your Azure API Management Service**:
7272
1. Select whether to synchronize all APIs from the API Management instance or only APIs that are in an API Management [workspace](../api-management/workspaces-overview.md).
7373
1. Select the **Subscription**, **Resource group**, and **Azure API Management service** that you want to integrate. If you want to synchronize only APIs from a workspace, make a selection in **Choose a workspace**.
7474
1. In **Integration details**, enter an identifier.
@@ -85,9 +85,14 @@ You can integrate an API Management instance using the portal or the Azure CLI.
8585

8686
Run the [az apic integration create apim](/cli/azure/apic/integration/create#az-apic-integration-create-apim) command to integrate an API Management instance to your API center.
8787

88+
> [!NOTE]
89+
>
90+
> * This command is only available in the preview version of the APIC extension.
91+
> * Install the new preview version before using this command.
92+
8893
* Provide the names of the resource group, API center, and integration.
8994

90-
* If the API Management instance and the API center are in the same resource group, you can provide the API Management instance name as the value of `azure-apim`; otherwise, provide the Azure resource ID.
95+
* If the API Management instance and the API center are in the same resource group, you can provide the API Management instance name as the value of `azure-apim`. Otherwise, provide the Azure resource ID.
9196

9297
```azurecli
9398
az apic integration create apim \

0 commit comments

Comments
 (0)