Skip to content

Commit f3d55a0

Browse files
Merge pull request #302132 from MicrosoftDocs/main
Merged by Learn.Build PR Management system
2 parents d1d90c5 + a82d2ce commit f3d55a0

File tree

68 files changed

+349
-62
lines changed

Some content is hidden

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

68 files changed

+349
-62
lines changed

articles/active-directory-b2c/partner-cloudflare.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: martinco
77
ms.reviewer: kengaderdus
88
ms.service: azure-active-directory
99
ms.topic: how-to
10-
ms.date: 01/26/2024
10+
ms.date: 06/30/2025
1111
ms.author: gasinh
1212
ms.subservice: b2c
1313

@@ -21,20 +21,19 @@ In this article, you can learn how to configure the [Cloudflare Web Application
2121

2222
## Prerequisites
2323

24-
To get started, you'll need:
24+
To get started, you need:
2525

26-
- An Azure subscription
27-
- If you don't have one, you can get an [Azure free account](https://azure.microsoft.com/free/)
28-
- [An Azure AD B2C tenant](tutorial-create-tenant.md) linked to your Azure subscription
29-
- A [Cloudflare](https://dash.cloudflare.com/sign-up) account
26+
- An Azure subscription. If you don't have one, you can get an [Azure free account](https://azure.microsoft.com/free/).
27+
- [An Azure AD B2C tenant](tutorial-create-tenant.md) linked to your Azure subscription.
28+
- A [Cloudflare](https://dash.cloudflare.com/sign-up) account.
3029

3130
## Scenario description
3231

3332
Cloudflare WAF integration includes the following components:
3433

35-
- **Azure AD B2C tenant** – The authorization server that verifies user credentials using the custom policies defined in the tenant. It's known as the identity provider
34+
- **Azure AD B2C tenant** – The authorization server that verifies user credentials using the custom policies defined in the tenant, known as the identity provider.
3635
- [**Azure Front Door**](../frontdoor/front-door-overview.md) – Enables custom domains for Azure B2C tenant. Traffic from Cloudflare WAF is routed to Azure Front Door before arriving at Azure AD B2C tenant.
37-
- **Cloudflare** – The web application firewall that manages traffic sent to the authorization server
36+
- **Cloudflare** – The web application firewall that manages traffic sent to the authorization server.
3837

3938
## Integrate with Azure AD B2C
4039

@@ -58,6 +57,9 @@ The settings appear in the following image.
5857

5958
![Screenshot of proxied status.](./media/partner-cloudflare/select-proxied.png)
6059

60+
> [!NOTE]
61+
> Azure Front Door-managed certificates aren't automatically renewed if your custom domain’s CNAME record points to a DNS record other than the Azure Front Door endpoint’s domain (for example, when using a third-party DNS service like Cloudflare). To renew the certificate in such cases, follow the instructions in the [Renew Azure Front Door-managed certificates](../frontdoor/domain.md#renew-azure-front-door-managed-certificates) article.
62+
6163
### Configure the Web Application Firewall
6264

6365
Go to your Cloudflare settings, and use the Cloudflare content to [configure the WAF](https://www.cloudflare.com/application-services/products/waf/) and learn about other security tools.

articles/backup/backup-azure-troubleshoot-blob-backup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Troubleshoot Blob backup and restore issues
33
description: In this article, learn about symptoms, causes, and resolutions of Azure Backup failures related to the Azure Blob backups and restore.
44
ms.topic: troubleshooting
5-
ms.date: 06/13/2025
5+
ms.date: 07/02/2025
66
ms.service: azure-backup
77
ms.reviewer: geg
88
author: jyothisuri
@@ -30,7 +30,7 @@ This article provides troubleshooting information to address issues you encounte
3030

3131
**Error message**: The storage account type isn't supported for backup.
3232

33-
**Recommendation**: Ensure that the storage account you've selected for backup is supported. [Learn more](blob-backup-support-matrix.md?tabs=vaulted-backup#limitations).
33+
**Recommendation**: Ensure that the storage account you've selected for backup is supported. [Learn more](blob-backup-support-matrix.md?tabs=vaulted-backup#supported-and-unsupported-scenarios-for-azure-blob-backup).
3434

3535
### UserErrorMaxOrsPolicyExistOnStorageAccount
3636
**Error code**: `UserErrorMaxOrsPolicyExistOnStorageAccount`

articles/backup/blob-backup-support-matrix.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Support matrix for Azure Blobs backup
33
description: Provides a summary of support settings and limitations when backing up Azure Blobs.
44
ms.topic: reference
5-
ms.date: 05/12/2025
5+
ms.date: 07/02/2025
66
ms.custom: references_regions, engagement-fy24
77
ms.service: azure-backup
88
author: jyothisuri
@@ -28,7 +28,7 @@ Vaulted backup for blobs is available in all public cloud regions.
2828

2929
---
3030

31-
## Limitations
31+
## Supported and unsupported scenarios for Azure Blob backup
3232

3333
**Choose a backup type**
3434

@@ -45,6 +45,7 @@ Operational backup of blobs uses blob point-in-time restore, blob versioning, so
4545
**Other limitations**:
4646

4747
- If you've deleted a container during the retention period, that container won't be restored with the point-in-time restore operation. If you attempt to restore a range of blobs that includes blobs in a deleted container, the point-in-time restore operation will fail. For more information about protecting containers from deletion, see [Soft delete for containers](../storage/blobs/soft-delete-container-overview.md).
48+
- Containers with **legal hold** enabled aren't supported.
4849
- If a blob has moved between the hot and cool tiers in the period between the present moment and the restore point, the blob is restored to its previous tier. Restoring block blobs in the archive tier isn't supported. For example, if a blob in the hot tier was moved to the archive tier two days ago, and a restore operation restores to a point three days ago, the blob isn't restored to the hot tier. To restore an archived blob, first move it out of the archive tier. For more information, see [Rehydrate blob data from the archive tier](../storage/blobs/archive-rehydrate-overview.md).
4950
- A block that has been uploaded via [Put Block](/rest/api/storageservices/put-block) or [Put Block from URL](/rest/api/storageservices/put-block-from-url), but not committed via [`Put Block List`](/rest/api/storageservices/put-block-list), isn't part of a blob and so isn't restored as part of a restore operation.
5051
- A blob with an active lease can't be restored. If a blob with an active lease is included in the range of blobs to restore, the restore operation will fail automatically. Break any active leases before starting the restore operation.
@@ -55,6 +56,7 @@ Operational backup of blobs uses blob point-in-time restore, blob versioning, so
5556
# [Vaulted backup](#tab/vaulted-backup)
5657

5758
- You can back up only block blobs in a *standard general-purpose v2 storage account* using the vaulted backup solution for blobs.
59+
- Blob vaulted backup is also supported when the storage account has private endpoints.
5860
- HNS-enabled storage accounts are currently not supported. This includes *ADLS Gen2 accounts*, *accounts using NFS 3.0*, and *SFTP protocols* for blobs.
5961
- You can take up to five backups per storage account in a day.
6062
- You can back up storage accounts with *up to 100 containers*, there is no limit on the number of blobs within those containers. You can also select a subset of containers to back up (up to 100 containers).
@@ -72,6 +74,7 @@ Operational backup of blobs uses blob point-in-time restore, blob versioning, so
7274

7375
- Enabling backups isn't supported for the blob container that are configured with native replication using data factory.
7476
- The protection of a container that is part of any object replication isn't supported, either as a source or destination. Attempting to back up such a container will result in backup failure.
77+
- Containers with **legal hold** enabled aren't supported.
7578

7679

7780
---

articles/backup/quick-blob-vaulted-backup-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Quickstart - Configure vaulted backup for Azure Blobs using Azure CLI
33
description: In this Quickstart, learn how to configure vaulted backup for Azure Blobs using Azure CLI.
44
ms.devlang: azurecli
55
ms.topic: quickstart
6-
ms.date: 06/17/2025
6+
ms.date: 07/02/2025
77
ms.custom: mvc, devx-track-azurepowershell, mode-api
88
author: jyothisuri
99
ms.author: jsuri

articles/iot-operations/deploy-iot-ops/howto-upgrade.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,7 @@ To ensure zero data loss and high availability during deployment upgrades, the M
112112
If a failure occurs during the upgrade process, the health manager pod automatically restarts the upgrade process while ensuring no loss of data or connectivity.
113113

114114
Rolling updates can only occur if the MQTT broker is deployed with two or more backend replicas. MQTT broker upgrades aren't supported for single-replica deployments. When you deploy Azure IoT Operations, you specify the number of backend replicas to create in the [az iot ops create](/cli/azure/iot/ops#az-iot-ops-create) command with the `--broker-backend-rf` parameter.
115+
116+
## Supported versions
117+
118+
[!INCLUDE [supported-versions](../includes/supported-versions.md)]
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
title: include file
3+
description: include file with details of currently supported versions
4+
author: dominicbetts
5+
ms.topic: include
6+
ms.date: 06/16/2025
7+
ms.author: dobett
8+
---
9+
10+
Microsoft always supports three generally available (GA) versions of Azure IoT Operations at any one time: the latest version, and the two previous minor versions.
11+
12+
Currently, there are only two minor versions available. [Azure support](https://azure.microsoft.com/support/plans) is currently available for the following versions:
13+
14+
- [1.1.x](https://github.com/Azure/azure-iot-operations/releases/tag/v1.1.19) (latest GA version)
15+
- [1.0.x](https://github.com/Azure/azure-iot-operations/releases/tag/v1.0.9) (previous minor GA version)
16+
17+
> [!IMPORTANT]
18+
> Previous minor versions don't receive security patches. Always upgrade to the latest version to ensure you have the latest security updates and features.
19+
20+
To verify your current version, see the overview page for your Azure IoT Operations instance in the Azure portal or use the Azure IoT Operations CLI [az iot ops instance show](/cli/azure/iot/ops#az-iot-ops-show) command.

articles/iot-operations/overview-iot-operations.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ To visualize and analyze sensor data and messages from your devices and assets,
121121

122122
To secure communication between devices and the cloud through isolated network environments based on the ISA-95/Purdue Network architecture, use the Azure IoT Layered Network Management (preview) component.
123123

124+
## Supported versions
125+
126+
[!INCLUDE [supported-versions](includes/supported-versions.md)]
127+
124128
## Supported environments
125129

126130
[!INCLUDE [supported-environments-table](includes/supported-environments-table.md)]

articles/iot-operations/troubleshoot/iot-operations-faq.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ sections:
4848
- question: |
4949
Does Azure IoT Operations support connecting via proxy servers?
5050
answer: Azure IoT Operations supports connecting via passthrough proxies that don't require proxy authentication. Proxies that require authentication or can inspect encrypted traffic are currently not supported.
51+
- question: |
52+
What versions of Azure IoT Operations are supported?
53+
answer: Microsoft supports the three most recent minor versions of Azure IoT Operations. To learn more, see [Supported versions](../overview-iot-operations.md#supported-versions).
5154
- question: |
5255
Does Azure IoT Operations support Azure Private Link and private endpoints?
5356
answer: Azure IoT Operations currently does not support Azure Private Link and private endpoints.

articles/storage-mover/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ items:
77
href: service-overview.md
88
- name: Cloud migration basics
99
href: migration-basics.md
10+
- name: Get started with cloud-to-cloud migration
11+
href: cloud-to-cloud-migration.md
1012
expanded: true
1113
- name: Concepts
1214
items:

0 commit comments

Comments
 (0)