Skip to content

Commit b1a90da

Browse files
authored
Merge pull request #292459 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents fcef149 + c5ff257 commit b1a90da

31 files changed

+480
-519
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/previous-versions/azure/cdn/akamai-retirement-faq",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/migrate/replicate-using-expressroute.md",
10+
"redirect_url": "/azure/migrate/discover-and-assess-using-private-endpoints",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path": "articles/operator-5g-core/concept-centralized-lifecycle-management.md",
1015
"redirect_url": "/previous-versions/azure/operator-5g-core/concept-centralized-lifecycle-management",

articles/azure-web-pubsub/quickstart-serverless.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ Use the following commands to create these items.
793793
794794
[!INCLUDE [Connection string security comment](includes/web-pubsub-connection-string-security-comment.md)]
795795
796-
First, find your Web PubSub resource from **Azure Portal** and copy out the connection string under **Keys**. Then, navigate to Function App settings in **Azure Portal** -> **Settings** -> **Configuration**. And add a new item under **Application settings**, with name equals `WebPubSubConnectionString` and value is your Web PubSub resource connection string.
796+
First, find your Web PubSub resource from **Azure Portal** and copy out the connection string under **Keys**. Then, navigate to Function App settings in **Azure Portal** -> **Settings** -> **Environment variables**. And add a new item under **App settings**, with name equals `WebPubSubConnectionString` and value is your Web PubSub resource connection string.
797797
798798
## Configure the Web PubSub service `Event Handler`
799799

articles/azure-web-pubsub/quickstarts-push-messages-from-server.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ python -m venv env
180180
source ./env/bin/activ
181181

182182
pip install azure-messaging-webpubsubservice
183-
pip install websock
183+
pip install websockets
184184
```
185185

186186
#### Use the WebSocket API to connect to your Web PubSub resource. Create a `subscribe.py` file with the following code
@@ -213,8 +213,8 @@ if __name__ == '__main__':
213213

214214
try:
215215
asyncio.get_event_loop().run_until_complete(connect(token['url']))
216-
except KeyboardInterrupt:
217-
pass
216+
except KeyboardInterrupt:
217+
pass
218218

219219
```
220220

articles/backup/blob-backup-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Overview of Azure Blobs backup
33
description: Learn about Azure Blobs backup.
44
ms.topic: overview
5-
ms.date: 11/26/2024
5+
ms.date: 12/30/2024
66
ms.service: azure-backup
77
author: AbhishekMallick-MS
88
ms.author: v-abhmallick
@@ -19,7 +19,7 @@ This article gives you an understanding about configuring the following types of
1919

2020
- **Periodic backups**: You can configure vaulted backup, a managed offsite data protection solution, to get protection against any accidental or malicious deletion of blobs or storage account. The backup data using vaulted backups is copied and stored in the Backup vault as per the schedule and frequency you define via the backup policy and retained as per the retention configured in the policy.
2121

22-
You can choose to configure vaulted backups, operational backups, or both on your storage accounts using a single backup policy. The integration with [Backup center](backup-center-overview.md) enables you to govern, monitor, operate, and analyze backups at scale.
22+
You can choose to configure vaulted backups, operational backups, or both on your storage accounts using a single backup policy. The integration with [Azure Business Continuity Center](../business-continuity-center/business-continuity-center-overview.md) enables you to govern, monitor, operate, and analyze backups at scale.
2323

2424
## How the Azure Blobs backup works?
2525

@@ -80,7 +80,7 @@ You can enable operational backup and vaulted backup (or both) of blobs on a sto
8080

8181
Once you have enabled backup on a storage account, a Backup Instance is created corresponding to the storage account in the Backup vault. You can perform any Backup-related operations for a storage account like initiating restores, monitoring, stopping protection, and so on, through its corresponding Backup Instance.
8282

83-
Both operational and vaulted backups integrate directly with Backup Center to help you manage the protection of all your storage accounts centrally, along with all other Backup supported workloads. Backup Center is your single blade of glass for all your Backup requirements like monitoring jobs and state of backups and restores, ensuring compliance and governance, analyzing backup usage, and performing operations pertaining to back up and restore of data.
83+
Both operational and vaulted backups integrate directly with Azure Business Continuity Center to help you manage the protection of all your storage accounts centrally, along with all other Backup supported workloads. Azure Business Continuity Center is your single blade of glass for all your Backup requirements like monitoring jobs and state of backups and restores, ensuring compliance and governance, analyzing backup usage, and performing operations pertaining to back up and restore of data.
8484

8585
---
8686

articles/cdn/edgio-retirement-faq.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The following is a recap of the migration options we sent to all users:
4040

4141
> [!IMPORTANT]
4242
> - If you plan a migration to Akamai or another CDN provider, you must set the Feature Flag `DoNotForceMigrateEdgioCDNProfiles` before January 7, 2025. Doing so will prevent Microsoft from migrating you to Azure Front Door (please see below). Note you will have until January 14, 2025 to complete your migration to another CDN, but again Microsoft cannot guarantee your services will be available on the Edgio platform before this date.
43-
> - Please be advised we will need to halt all configuration changes to Azure CDN by Edgio profiles starting on January 3, 2025. This means you will not be able update your CDN profile configuration, but your services on Azure CDN from Edgio will still operate until you are migrated or the Edgio platform is shut down on January 15, 2025. If you apply the `DoNotForceMigrateEdgioCDNProfiles` feature flag beofre January 3, your configuration will not be frozen for changes.
43+
> - Please be advised we will need to halt all configuration changes to Azure CDN by Edgio profiles starting on January 3, 2025. This means you will not be able update your CDN profile configuration, but your services on Azure CDN from Edgio will still operate until you are migrated or the Edgio platform is shut down on January 15, 2025. If you apply the `DoNotForceMigrateEdgioCDNProfiles` feature flag before January 3, your configuration will not be frozen for changes.
4444
4545
- If you have any services running on Azure CDN from Edgio on January 7, 2025 and haven't informed us of your plans (please see above), we'll attempt to migrate your services over to Azure Front Door on January 7, 2025. We'll be performing this migration to Azure Front Door on a “best effort” basis, and doing so might cause issues related to the billing, features, availability, and/or performance you're currently consuming with Azure CDN from Edgio.
4646

@@ -71,6 +71,12 @@ For any questions regarding billing changes, reach out to our support team or yo
7171

7272
No, you need to determine if Azure Front Door suits your workloads. We recommend setting up a test environment to validate that your services are compatible with Azure Front Door.
7373

74+
### What will happen during automatic migration?
75+
76+
Microsoft will convert your existing Azure CDN from Edgio profile to an Azure Front Door Standard profile. Your existing Azure CDN from Edgio domains (custom domains and/or *.azureedge.net domains) will be added as custom domains on the new Front Door endpoints and we will switch the traffic from Edgio platform to Front Door platform.
77+
78+
Note that Microsoft will not be able to maintain feature level parity in the new Front Door configuration. The migration will be done on a “best effort” basis, and doing so might cause issues related to the billing, features, availability, and/or performance you're currently consuming with Azure CDN from Edgio. We will not be able to rollback the automatic migration in case of any issues. Hence, customers with business critical traffic should migrate by themselves and not rely on automatic migration.
79+
7480
### What will happen after Microsoft migrates my workloads to Azure Front Door on January 7, 2025?
7581

7682
After the migration, you'll receive an email notification confirming whether your workloads have been successfully migrated to Azure Front Door Standard or if the migration was unsuccessful. We're migrating you to Azure Front Door Standard as it may be more cost-effective. If you need the extra features of Azure Front Door Premium, you can [upgrade your service](../frontdoor/tier-upgrade.md).

articles/cloud-shell/persisting-shell-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ directory, which might include sensitive information including access tokens or
5050

5151
## Restrict resource creation with an Azure resource policy
5252

53-
Storage accounts that created in Cloud Shell are tagged with `ms-resource-usage:azure-cloud-shell`.
53+
Storage accounts that are created in Cloud Shell are tagged with `ms-resource-usage:azure-cloud-shell`.
5454
If you want to disallow users from creating storage accounts in Cloud Shell, create an
5555
[Azure resource policy][02] that's triggered by this specific tag.
5656

articles/healthcare-apis/register-application-cli-rest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ In practice, you'll define variables, assign values to them, and set references
5050
### Define app registration name, etc.
5151
appregname=myappregtest1
5252
clientid=$(az ad app create --display-name $appregname --query appId --output tsv)
53-
objectid=$(az ad app show --id $clientid --query Id --output tsv)
53+
objectid=$(az ad app show --id $clientid --query id --output tsv)
5454
```
5555

5656
You can use `echo $<variable name>` to display the value of a specified variable.

0 commit comments

Comments
 (0)