Skip to content

Commit 77cb183

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us370875-cli-posh-nat
2 parents 3e59876 + 68dce97 commit 77cb183

File tree

102 files changed

+1807
-1000
lines changed

Some content is hidden

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

102 files changed

+1807
-1000
lines changed

articles/active-directory-b2c/multi-factor-authentication.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,19 @@ In Azure AD B2C, you can delete a user's TOTP authenticator app enrollment. The
133133

134134
Learn how to [delete a user's Software OATH token authentication method](/graph/api/softwareoathauthenticationmethod-delete) using the Microsoft Graph API.
135135

136+
### SMS pricing tiers by country/region
137+
138+
The following table provides details about the different pricing tiers for SMS based authentication services across various countries or regions. For pricing details, see [Azure AD B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/).
139+
140+
SMS is an add-on feature and requires a linked subscription. If your subscription expires or is cancelled, end users will no longer be able to authenticate using SMS, which could block them from signing in depending on your MFA policy.
141+
142+
|Tier |Countries/Regions |
143+
|-----------------------------------|-------------------|
144+
|Phone Authentication Low Cost |Australia, Brazil, Brunei, Canada, Chile, China, Colombia, Cyprus, North Macedonia, Poland, Portugal, South Korea, Thailand, Türkiye, United States |
145+
|Phone Authentication Mid Low Cost |Greenland, Albania, American Samoa, Austria, Bahamas, Bahrain, Bosnia & Herzegovina, Botswana, Costa Rica, Czech Republic, Denmark, Estonia, Faroe Islands, Finland, France, Greece, Hong Kong SAR, Hungary, Iceland, Ireland, Italy, Japan, Latvia, Lithuania, Luxembourg, Macao SAR, Malta, Mexico, Micronesia, Moldova, Namibia, New Zealand, Nicaragua, Norway, Romania, São Tomé and Príncipe, Seychelles Republic, Singapore, Slovakia, Solomon Islands, Spain, Sweden, Switzerland, Taiwan, United Kingdom, United States Virgin Islands, Uruguay |
146+
|Phone Authentication Mid High Cost |Andorra, Angola, Anguilla, Antarctica, Antigua and Barbuda, Argentina, Armenia, Aruba, Barbados, Belgium, Benin, Bolivia, Bonaire, Curaçao, Saba, Sint Eustatius and Sint Maarten, British Virgin Islands, Bulgaria, Burkina Faso, Cameroon, Cayman Islands, Central African Republic, Cook Islands, Côte d’Ivoire, Croatia, Diego Garcia, Djibouti, Dominican Republic, Dominican Republic, Dominican Republic, Ecuador, El Salvador, Eritrea, Falkland Islands, Fiji, French Guiana, French Polynesia, Gambia, Georgia, Germany, Gibraltar, Grenada, Guadeloupe, Guam, Guinea, Guyana, Honduras, India, Kenya, Kiribati, Laos, Liberia, Malaysia, Marshall Islands, Martinique, Mauritius, Monaco, Montenegro, Montserrat, Netherlands, New Caledonia, Niue, Oman, Palau, Panama, Paraguay, Peru, Puerto Rico, Puerto Rico, Réunion, Rwanda, Saint Helena, Ascension and Tristan de Cunha, Saint Kitts & Nevis, Saint Lucia, Saint Pierre & Miquelon, Saint Vincent and the Grenadines, Saipan, Samoa, San Marino, Saudi Arabia, Sint Maarten, Slovenia, South Africa, South Sudan, Suriname, Swaziland (New Name is Kingdom of Eswatini), Timor-Leste, Tokelau, Tonga, Turks & Caicos, Tuvalu, United Arab Emirates, Vanuatu, Venezuela, Vietnam, Wallis and Futuna |
147+
|Phone Authentication High Cost |Liechtenstein, Bermuda, Cabo Verde, Cambodia, Democratic Republic of Congo, Dominica, Egypt, Equatorial Guinea, Ghana, Guatemala, Guinea-Bissau, Israel, Jamaica, Jamaica, Kosovo, Lesotho, Maldives, Mali, Mauritania, Morocco, Mozambique, Papua New Guinea, Philippines, Qatar, Sierra Leone, Trinidad & Tobago, Ukraine, Zimbabwe, Afghanistan, Algeria, Azerbaijan, Bangladesh, Belarus, Belize, Bhutan, Burundi, Chad, Comoros, Congo, Ethiopia, Gabonese Republic, Haiti, Indonesia, Iraq, Jordan, Kuwait, Kyrgyzstan, Lebanon, Libya, Madagascar, Malawi, Mongolia, Myanmar, Nauru, Nepal, Niger, Nigeria, Pakistan, Palestinian National Authority, Russia, Senegal, Serbia, Somalia, Sri Lanka, Sudan, Tajikistan, Tanzania, Togolese Republic, Tunisia, Turkmenistan, Uganda, Uzbekistan, Yemen, Zambia |
148+
136149
::: zone pivot="b2c-custom-policy"
137150

138151
## Next steps

articles/azure-vmware/azure-vmware-solution-known-issues.md

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

articles/backup/back-up-azure-database-postgresql-flex-backup-cli.md

Lines changed: 43 additions & 225 deletions
Large diffs are not rendered by default.

articles/backup/back-up-azure-database-postgresql-flex-backup-powershell.md

Lines changed: 44 additions & 181 deletions
Large diffs are not rendered by default.

articles/backup/backup-azure-about-mars.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: About the MARS Agent
33
description: Learn how the MARS Agent supports the backup scenarios
44
ms.topic: overview
5-
ms.date: 08/13/2024
5+
ms.date: 02/28/2025
66
ms.service: azure-backup
77
ms.custom: engagement-fy24
88
author: jyothisuri
@@ -69,7 +69,7 @@ To proceed with the backup operation, review the following additional details:
6969

7070
- The **Initial Backup** (first backup) runs according to your backup settings. The MARS agent uses VSS to take a point-in-time snapshot of the volumes selected for backup. The agent only uses the Windows System Writer operation to capture the snapshot. It doesn't use any application VSS writers, and doesn't capture app-consistent snapshots. After VSS agent takes the snapshot, the MARS agent creates a virtual hard disk (VHD) in the cache folder you specified during the backup configuration. The agent also stores checksums for each data block.
7171

72-
- **Incremental backups** (subsequent backups) run according to the schedule you specify. During incremental backups, changed files are identified and a new VHD is created. The VHD is compressed and encrypted, and then it's sent to the vault. After the incremental backup finishes, the new VHD is merged with the VHD created after the initial replication. This merged VHD provides the latest state to be used for comparison for ongoing backup.
72+
- **Incremental backups** (subsequent backups) run according to the schedule you specify. During incremental backups, changed files are identified and a new VHD is created. The VHD is compressed and encrypted, and then it's sent to the vault. After the incremental backup finishes, the new VHD is merged with the VHD created after the initial replication. This merged VHD provides the latest state to be used for comparison for ongoing backup. Microsoft Azure Recovery Services (MARS) agent performs a full backup of the system state each time a backup job is run. There're no incremental backups for the system state with the MARS agent.
7373

7474
- The MARS agent can run the backup job in **optimized mode** using the USN (Update Sequence Number) change journal, or in **unoptimized mode** by checking for changes in directories or files via scanning the entire volume. Unoptimized mode is slower because the agent has to scan each file on the volume and compare it against the metadata to determine the changed files. The **Initial backup** will always run in unoptimized mode. If the previous backup failed, then the next scheduled backup job will run in unoptimized mode. To learn more about these modes and how to verify them, refer to [this article](backup-azure-troubleshoot-slow-backup-performance-issue.md#cause-backup-job-running-in-unoptimized-mode).
7575

articles/backup/backup-azure-database-postgresql-flex-manage.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
2-
title: Manage Azure Backup for Azure PostgreSQL - Flexible servers
2+
title: Manage backups of Azure Database for PostgreSQL - Flexible Server using Azure portal
33
description: Learn about managing backup for the Azure PostgreSQL - Flexible servers from the Azure portal.
44
ms.topic: how-to
5-
ms.date: 03/21/2024
5+
ms.date: 02/28/2025
66
author: jyothisuri
77
ms.author: jsuri
88
ms.service: azure-backup
99
ms.custom: engagement-fy24, ignite-2024
1010
---
1111

12-
# Manage Azure Backup for Azure PostgreSQL - Flexible servers (preview)
12+
# Manage backups of Azure Database for PostgreSQL - Flexible Server using Azure portal
1313

14-
This article explains how to manage backup for the Azure PostgreSQL - Flexible servers from the Azure portal.
14+
This article describes how to manage backup of Azure Database for PostgreSQL - Flexible Server using Azure portal.
1515

1616
## Change policy
1717

@@ -178,6 +178,7 @@ To delete a PostgreSQL server backup instance, follow these steps:
178178

179179
1. Select **Delete** to confirm and proceed with deleting backup instance.
180180

181-
## Next steps
182181

183-
[Backup vaults overview](backup-vault-overview.md)
182+
## Next step
183+
184+
[Troubleshoot common errors for backup and restore operations for Azure Database for PostgreSQL - Flexible Server](backup-azure-database-postgresql-flex-troubleshoot.md).

articles/backup/backup-azure-database-postgresql-flex-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
title: About Azure Database for PostgreSQL Flexible server backup
33
description: An overview on Azure Database for PostgreSQL Flexible server backup
44
ms.topic: overview
5-
ms.date: 09/09/2024
5+
ms.date: 02/28/2025
66
ms.service: azure-backup
77
ms.custom:
88
- ignite-2024
99
author: jyothisuri
1010
ms.author: jsuri
1111
---
1212

13-
# About Azure Database for PostgreSQL - Flexible server backup (preview)
13+
# About Azure Database for PostgreSQL - Flexible Server backup
1414

1515
Azure Backup and Azure Database Services have come together to build an enterprise-class backup solution for Azure Database for PostgreSQL servers that retains backups for up to 10 years. The feature offers the following capabilities:
1616

@@ -27,7 +27,7 @@ To perform the backup operation:
2727
1. Grant permissions to the backup vault MSI on the target ARM resource (PostgreSQL-Flexible server), establishing access, and control.
2828
1. Configure backup policies, specify scheduling, retention, and other parameters.
2929

30-
Once the configuration is complete:
30+
Once the configuration is successful:
3131

3232
1. The Backup service invokes the backup based on the policy schedules on the ARM API of PostgresFlex server, writing data to a secure blob-container with a SAS for enhanced security.
3333
1. Backup runs independently preventing disruptions during long-running tasks.
@@ -59,4 +59,4 @@ You incur charges for:
5959

6060
## Next steps
6161

62-
[Azure Database for PostgreSQL -Flex backup](backup-azure-database-postgresql-flex.md).
62+
[Back up Azure Database for PostgreSQL - Flexible Server using Azure portal](tutorial-create-first-backup-azure-database-postgresql-flex.md).

0 commit comments

Comments
 (0)