Skip to content

Commit 4197245

Browse files
authored
Merge pull request #272915 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 8375796 + 8808d57 commit 4197245

File tree

10 files changed

+11
-152
lines changed

10 files changed

+11
-152
lines changed

articles/aks/quickstart-event-grid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ In this quickstart, you create an AKS cluster and subscribe to AKS events.
2121
* [Azure CLI][azure-cli-install] or [Azure PowerShell][azure-powershell-install] installed.
2222

2323
> [!NOTE]
24-
> In case there are issues specifically with EventGrid notifications, as can be seen here [Service Outages](https://azure.status.microsoft/status), please note that AKS operations wont be impacted and they are independent of Event Grid outages.
24+
> In case there are issues specifically with EventGrid notifications, as can be seen here [Service Outages](https://azure.status.microsoft/status), please note that AKS operations won't be impacted and they are independent of Event Grid outages.
2525
2626
## Create an AKS cluster
2727

articles/azure-monitor/app/java-standalone-upgrade-from-2x.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The telemetry processors perform the following actions (in order):
102102

103103
Then it deletes the attribute named `tempPath`, and the attribute appears as a custom dimension.
104104

105-
```
105+
```json
106106
{
107107
"preview": {
108108
"processors": [

articles/communication-services/concepts/sdk-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Publishing locations for individual SDK packages:
4949
| Identity | [npm](https://www.npmjs.com/package/@azure/communication-identity) | [NuGet](https://www.NuGet.org/packages/Azure.Communication.Identity)| [PyPi](https://pypi.org/project/azure-communication-identity/)| [Maven](https://search.maven.org/search?q=a:azure-communication-identity) | -| -| -|
5050
| Phone Numbers | [npm](https://www.npmjs.com/package/@azure/communication-phone-numbers) | [NuGet](https://www.NuGet.org/packages/Azure.Communication.PhoneNumbers)| [PyPi](https://pypi.org/project/azure-communication-phonenumbers/)| [Maven](https://search.maven.org/search?q=a:azure-communication-phonenumbers) | -| -| -|
5151
| Chat | [npm](https://www.npmjs.com/package/@azure/communication-chat)| [NuGet](https://www.NuGet.org/packages/Azure.Communication.Chat) | [PyPi](https://pypi.org/project/azure-communication-chat/) | [Maven](https://search.maven.org/search?q=a:azure-communication-chat) | [GitHub](https://github.com/Azure/azure-sdk-for-ios/releases)| [Maven](https://search.maven.org/search?q=a:azure-communication-chat) | -|
52-
| SMS [npm](https://www.npmjs.com/package/@azure/communication-sms) | [NuGet](https://www.NuGet.org/packages/Azure.Communication.Sms)| [PyPi](https://pypi.org/project/azure-communication-sms/) | [Maven](https://search.maven.org/artifact/com.azure/azure-communication-sms) | -| -| -|
52+
| SMS | [npm](https://www.npmjs.com/package/@azure/communication-sms) | [NuGet](https://www.NuGet.org/packages/Azure.Communication.Sms)| [PyPi](https://pypi.org/project/azure-communication-sms/) | [Maven](https://search.maven.org/artifact/com.azure/azure-communication-sms) | -| -| -|
5353
| Email | [npm](https://www.npmjs.com/package/@azure/communication-email) | [NuGet](https://www.NuGet.org/packages/Azure.Communication.Email)| [PyPi](https://pypi.org/project/azure-communication-email/) | [Maven](https://search.maven.org/artifact/com.azure/azure-communication-email) | -| -| -|
5454
| Calling | [npm](https://www.npmjs.com/package/@azure/communication-calling) | [NuGet](https://github.com/Azure/Communication/blob/master/releasenotes/acs-calling-windowsclient-sdk-release-notes.md) | -| - | [CocoaPods](https://github.com/Azure/Communication/releases) | [Maven](https://github.com/Azure/Communication/blob/master/releasenotes/acs-calling-android-sdk-release-notes.md)| -|
5555
| Call Automation |[npm](https://www.npmjs.com/package/@azure/communication-call-automation)|[NuGet](https://www.NuGet.org/packages/Azure.Communication.CallAutomation/)|[PyPi](https://pypi.org/project/azure-communication-callautomation/)|[Maven](https://search.maven.org/artifact/com.azure/azure-communication-callautomation)

articles/load-balancer/components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The group of virtual machines or instances in a virtual machine scale set that i
3939

4040
Load balancer instantly reconfigures itself via automatic reconfiguration when you scale instances up or down. Adding or removing VMs from the backend pool reconfigures the load balancer without other operations. The scope of the backend pool is any virtual machine in a single virtual network.
4141

42-
Backend pools support addition of instances via [network interface or IP addresses](backend-pool-management.md).
42+
Backend pools support addition of instances via [network interface or IP addresses](backend-pool-management.md). VMs do not need a public IP address in order to be attached to backend pool of a public load balancer. Also, you can attach VMs to the backend pool of a load balancer even if they are in a stopped state.
4343

4444
When considering how to design your backend pool, design for the least number of individual backend pool resources to optimize the length of management operations. There's no difference in data plane performance or scale.
4545

articles/notification-hubs/firebase-migration-sdk.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ ms.lastreviewed: 03/01/2024
1616
Google will deprecate the Firebase Cloud Messaging (FCM) legacy API by July 2024. You can begin migrating from the legacy HTTP protocol to FCM v1 on March 1, 2024. You must complete the migration by June 2024. This section describes the steps to migrate from FCM legacy to FCM v1 using the Azure SDKs.
1717

1818
## Prerequisites
19-
20-
To update your FCM credentials, [follow step 1 in the REST API guide](firebase-migration-rest.md#step-1-add-fcm-v1-credentials-to-hub).
19+
- Ensure that **Firebase Cloud Messaging API (V1)** is enabled in Firebase project setting under **Cloud Messaging**.
20+
- Ensure that FCM credentials are updated. [Follow step 1 in the REST API guide](firebase-migration-rest.md#step-1-add-fcm-v1-credentials-to-hub).
2121

2222
## Android SDK
2323

articles/reliability/migrate-service-fabric.md

Lines changed: 1 addition & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -79,149 +79,7 @@ Downtime for migrating Service Fabric non-managed clusters vary widely based on
7979

8080
## Migration for Service Fabric managed clusters
8181

82-
### Create new primary and secondary node types that span availability zones
83-
84-
There's only one method for migrating a non-availability zone enabled Service Fabric managed cluster to an availability zone enabled state.
85-
86-
**To migrate your Service Fabric managed cluster:**
87-
88-
1. Determine whether a new IP is required and what resources need to be migrated to become zone resilient. To get the current availability zone resiliency state for the resources of the managed cluster, use the following API call:
89-
90-
```http
91-
POST https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/managedClusters/{clusterName}/getazresiliencystatus?api-version=2022-02-01-preview
92-
```
93-
Or, you can use the Az Module as follows:
94-
```
95-
Select-AzSubscription -SubscriptionId {subscriptionId}
96-
Invoke-AzResourceAction -ResourceId /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/managedClusters/{clusterName} -Action getazresiliencystatus -ApiVersion 2022-02-01-preview
97-
```
98-
This should provide with response similar to:
99-
```json
100-
{
101-
"baseResourceStatus" :[
102-
{
103-
"resourceName": "sfmccluster1"
104-
"resourceType": "Microsoft.Storage/storageAccounts"
105-
"isZoneResilient": false
106-
},
107-
{
108-
"resourceName": "PublicIP-sfmccluster1"
109-
"resourceType": "Microsoft.Network/publicIPAddresses"
110-
"isZoneResilient": false
111-
},
112-
{
113-
"resourceName": "primary"
114-
"resourceType": "Microsoft.Compute/virutalmachinescalesets"
115-
"isZoneResilient": false
116-
},
117-
],
118-
"isClusterZoneResilient": false
119-
}
120-
```
121-
122-
If the Public IP resource isn't zone resilient, migration of the cluster causes a brief loss of external connectivity. The loss of connectivity is due to the migration setting up new Public IP and updating the cluster FQDN to the new IP. If the Public IP resource is zone resilient, migration will not modify the Public IP resource or FQDN and there will be no external connectivity impact.
123-
124-
1. Initiate conversion of the underlying storage account created for managed cluster from LRS to ZRS using [customer-initiated conversion](../storage/common/redundancy-migration.md#customer-initiated-conversion). The resource group of storage account that needs to be migrated would be of the form "SFC_ClusterId"(ex SFC_9240df2f-71ab-4733-a641-53a8464d992d) under the same subscription as the managed cluster resource.
125-
126-
1. Add a new primary node type, which spans across availability zones.
127-
128-
This step triggers the resource provider to perform the migration of the primary node type and Public IP along with a cluster FQDN DNS update, if needed, to become zone resilient. Use the above API to understand implication of this step.
129-
130-
* Use apiVersion 2022-02-01-preview or higher.
131-
* Add a new primary node type to the cluster with zones parameter set to ["1", "2", "3"] as show below:
132-
133-
```json
134-
{
135-
"apiVersion": "2022-02-01-preview",
136-
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
137-
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
138-
"location": "[resourcegroup().location]",
139-
"dependsOn": [
140-
"[concat('Microsoft.ServiceFabric/managedclusters/', parameters('clusterName'))]"
141-
],
142-
"properties": {
143-
...
144-
"isPrimary": true,
145-
"zones": ["1", "2", "3"]
146-
...
147-
}
148-
}
149-
```
150-
151-
1. Add secondary node type, which spans across availability zones.
152-
This step adds a secondary node type, which spans across availability zones similar to the primary node type. Once created, customers need to migrate existing services from the old node types to the new ones by [using placement properties](../service-fabric/service-fabric-cluster-resource-manager-cluster-description.md).
153-
154-
* Use apiVersion 2022-02-01-preview or higher.
155-
* Add a new secondary node type to the cluster with zones parameter set to ["1", "2", "3"] as show below:
156-
157-
```json
158-
{
159-
"apiVersion": "2022-02-01-preview",
160-
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
161-
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
162-
"location": "[resourcegroup().location]",
163-
"dependsOn": [
164-
"[concat('Microsoft.ServiceFabric/managedclusters/', parameters('clusterName'))]"
165-
],
166-
"properties": {
167-
...
168-
"isPrimary": false,
169-
"zones": ["1", "2", "3"]
170-
...
171-
}
172-
}
173-
```
174-
175-
1. Start removing older non az spanning node types from the cluster
176-
177-
Once all your services are not present on your non zone spanned node types, you must remove the old node types. Start by [removing the old node types from the cluster](../service-fabric/how-to-managed-cluster-modify-node-type.md) using Portal or cmdlet. As a last step, remove any old node types from your template.
178-
179-
1. Mark the cluster resilient to zone failures
180-
181-
This step helps in future deployments, since it ensures that all future deployments of node types span across availability zones and so the cluster remains tolerant to zone failures. Set `zonalResiliency: true` in the cluster ARM template and do a deployment to mark the cluster as zone resilient and ensure all new node type deployments span across availability zones.
182-
183-
```json
184-
{
185-
"apiVersion": "2022-02-01-preview",
186-
"type": "Microsoft.ServiceFabric/managedclusters",
187-
"zonalResiliency": "true"
188-
}
189-
```
190-
You can also see the updated status in portal under **Overview > Properties** similar to `Zonal resiliency True`, once complete.
191-
192-
1. Validate all the resources are zone resilient
193-
194-
To validate the availability zone resiliency state for the resources of the managed cluster use the following GET API call:
195-
196-
```http
197-
POST https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ServiceFabric/managedClusters/{clusterName}/getazresiliencystatus?api-version=2022-02-01-preview
198-
```
199-
This should provide with response similar to:
200-
```json
201-
{
202-
"baseResourceStatus" :[
203-
{
204-
"resourceName": "sfmccluster1"
205-
"resourceType": "Microsoft.Storage/storageAccounts"
206-
"isZoneResilient": true
207-
},
208-
{
209-
"resourceName": "PublicIP-sfmccluster1"
210-
"resourceType": "Microsoft.Network/publicIPAddresses"
211-
"isZoneResilient": true
212-
},
213-
{
214-
"resourceName": "primary"
215-
"resourceType": "Microsoft.Compute/virutalmachinescalesets"
216-
"isZoneResilient": true
217-
},
218-
],
219-
"isClusterZoneResilient": true
220-
}
221-
```
222-
223-
If you run into any problems, reach out to support for assistance.
224-
82+
Follow steps in [Migrate Service Fabric managed cluster to zone resilient](..\service-fabric\how-to-managed-cluster-availability-zones.md#migrate-an-existing-nonzone-resilient-cluster-to-zone-resilient-preview).
22583

22684

22785
## Migration options for Service Fabric non-managed clusters

articles/service-fabric/service-fabric-reliable-services-reliable-collections-guidelines.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ The guidelines are organized as simple recommendations prefixed with the terms *
3737
* Do not perform any blocking code inside a transaction.
3838
* When [string](/dotnet/api/system.string) is used as the key for a reliable dictionary, the sorting order uses [default string comparer CurrentCulture](/dotnet/api/system.string.compare#system-string-compare(system-string-system-string)). Note that the CurrentCulture sorting order is different from [Ordinal string comparer](/dotnet/api/system.stringcomparer.ordinal).
3939
* Do not dispose or cancel a committing transaction. This is not supported and could crash the host process.
40+
* Do ensure the operation order of different dictionaries stays the same for all concurrent transactions when reading or writing multiple dictionaries to avoid deadlock.
4041

4142
Here are some things to keep in mind:
4243

articles/storage/common/storage-use-azcopy-s3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Gather your AWS access key and secret access key, and then set these environment
4040

4141
| Operating system | Command |
4242
|--------|-----------|
43-
| **Windows** | `set AWS_ACCESS_KEY_ID=<access-key>`<br>`set AWS_SECRET_ACCESS_KEY=<secret-access-key>` |
43+
| **Windows** | PowerShell:`$env:AWS_ACCESS_KEY_ID=<access-key>`<br>`$env:AWS_SECRET_ACCESS_KEY=<secret-access-key>` <br> In a command prompt use: `set AWS_ACCESS_KEY_ID=<access-key>`<br>`set AWS_SECRET_ACCESS_KEY=<secret-access-key>` |
4444
| **Linux** | `export AWS_ACCESS_KEY_ID=<access-key>`<br>`export AWS_SECRET_ACCESS_KEY=<secret-access-key>`|
4545
| **macOS** | `export AWS_ACCESS_KEY_ID=<access-key>`<br>`export AWS_SECRET_ACCESS_KEY=<secret-access-key>`|
4646

articles/virtual-network/ip-services/public-ip-addresses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Public IP addresses are created with a SKU of **Standard** or **Basic**. The SK
8282
> Basic SKU IPv4 addresses can be upgraded after creation to Standard SKU. To learn about SKU upgrade, refer to [Public IP upgrade](public-ip-upgrade-portal.md).
8383
8484
>[!IMPORTANT]
85-
> Matching SKUs are required for load balancer and public IP resources. You can't have a mixture of basic SKU resources and standard SKU resources. You can't attach standalone virtual machines, virtual machines in an availability set resource, or a virtual machine scale set resources to both SKUs simultaneously. New designs should consider using Standard SKU resources. For more information about a standard load balancer, see [Standard Load Balancer](../../load-balancer/load-balancer-overview.md?toc=%2fazure%2fvirtual-network%2ftoc.json).
85+
> Virtual machines attached to a backend pool do not need a public IP address to be attached to a public load balancer. But if they do, matching SKUs are required for load balancer and public IP resources. You can't have a mixture of basic SKU resources and standard SKU resources. You can't attach standalone virtual machines, virtual machines in an availability set resource, or a virtual machine scale set resources to both SKUs simultaneously. New designs should consider using Standard SKU resources. For more information about a standard load balancer, see [Standard Load Balancer](../../load-balancer/load-balancer-overview.md?toc=%2fazure%2fvirtual-network%2ftoc.json).
8686
8787
## IP address assignment
8888

includes/container-registry-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: include file
1313
| Resource | Basic | Standard | Premium |
1414
|---|---|---|---|
1515
| Included storage<sup>1</sup> (GiB) | 10 | 100 | 500 |
16-
| Storage limit (TiB) | 20| 20 | 20 |
16+
| Storage limit (TiB) | 40| 40 | 40 |
1717
| Maximum image layer size (GiB) | 200 | 200 | 200 |
1818
| Maximum manifest size (MiB) | 4 | 4 | 4 |
1919
| ReadOps per minute<sup>2, 3</sup> | 1,000 | 3,000 | 10,000 |

0 commit comments

Comments
 (0)