Skip to content

Commit df55fbd

Browse files
authored
Merge pull request #209347 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 0868505 + a93120e commit df55fbd

File tree

6 files changed

+26
-16
lines changed

6 files changed

+26
-16
lines changed

articles/active-directory/reports-monitoring/reference-azure-ad-sla-performance.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ For each month, we truncate the SLA attainment at three places after the decimal
5353

5454
| Month | 2021 | 2022 |
5555
| --- | --- | --- |
56-
| January | | 99.999% |
56+
| January | | 99.998% |
5757
| February | 99.999% | 99.999% |
58-
| March | 99.568% | 99.999% |
58+
| March | 99.568% | 99.998% |
5959
| April | 99.999% | 99.999% |
6060
| May | 99.999% | 99.999% |
6161
| June | 99.999% | 99.999% |
62-
| July | 99.999% | |
62+
| July | 99.999% | 99.999% |
6363
| August | 99.999% | |
6464
| September | 99.999% | |
6565
| October | 99.999% | |

articles/automanage/arm-deploy.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The following ARM template will onboard your specified machine onto Azure Automa
2828
"machineName": {
2929
"type": "String"
3030
},
31-
"configurationProfile": {
31+
"configurationProfileName": {
3232
"type": "String"
3333
}
3434
},
@@ -38,7 +38,7 @@ The following ARM template will onboard your specified machine onto Azure Automa
3838
"apiVersion": "2021-04-30-preview",
3939
"name": "[concat(parameters('machineName'), '/Microsoft.Automanage/default')]",
4040
"properties": {
41-
"configurationProfile": "[parameters('configurationProfile')]"
41+
"configurationProfile": "[parameters('configurationProfileName')]"
4242
}
4343
}
4444
]
@@ -51,11 +51,12 @@ This ARM template will create a configuration profile assignment for your specif
5151
The `configurationProfile` value can be one of the following values:
5252
* "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction"
5353
* "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesDevTest"
54+
* "/subscriptions/[sub ID]/resourceGroups/resourceGroupName/providers/Microsoft.Automanage/configurationProfiles/customProfileName (for custom profiles)
5455

5556
Follow these steps to deploy the ARM template:
5657
1. Save this ARM template as `azuredeploy.json`
5758
1. Run this ARM template deployment with `az deployment group create --resource-group myResourceGroup --template-file azuredeploy.json`
58-
1. Provide the values for machineName, and configurationProfileAssignment when prompted
59+
1. Provide the values for machineName, and configurationProfileName when prompted
5960
1. You're ready to deploy
6061

6162
As with any ARM template, it's possible to factor out the parameters into a separate `azuredeploy.parameters.json` file and use that as an argument when deploying.

articles/event-hubs/event-hubs-premium-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ It replicates events to three replicas, distributed across Azure availability zo
1414
In addition to these storage-related features and all capabilities and protocol support of the standard tier, the isolation model of the premium tier enables features like [dynamic partition scale-up](dynamically-add-partitions.md). You also get far more generous [quota allocations](event-hubs-quotas.md). Event Hubs Capture is included at no extra cost.
1515

1616
> [!NOTE]
17-
> Event Hubs Premium supports TLS 1.2 or greater .
17+
> Event Hubs Premium supports TLS 1.2 or greater.
1818
1919
## Why premium?
2020
The premium tier offers three compelling benefits for customers who require better isolation in a multitenant environment with low latency and high throughput data ingestion needs.
@@ -41,7 +41,7 @@ Therefore, the premium tier is often a more cost effective option for event stre
4141

4242
For the extra robustness gained by availability-zone support, the minimal deployment scale for the dedicated tier is 8 capacity units (CU), but you'll have availability zone support in the premium tier from the first PU in all availability zone regions.
4343

44-
You can purchase 1, 2, 4, 8 and 16 processing units for each namespace. As the premium tier is a capacity-based offering, the achievable throughput isn't set by a throttle as it's' in the standard tier, but depends on the work you ask Event Hubs to do, similar to the dedicated tier. The effective ingest and stream throughput per PU will depend on various factors, including:
44+
You can purchase 1, 2, 4, 8 and 16 processing units for each namespace. As the premium tier is a capacity-based offering, the achievable throughput isn't set by a throttle as it is in the standard tier, but depends on the work you ask Event Hubs to do, similar to the dedicated tier. The effective ingest and stream throughput per PU will depend on various factors, including:
4545

4646
* Number of producers and consumers
4747
* Payload size

articles/postgresql/flexible-server/overview.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,22 +100,24 @@ One advantage of running your workload in Azure is global reach. The flexible se
100100
| Canada East | :heavy_check_mark: | :x: | :heavy_check_mark: |
101101
| Central India | :heavy_check_mark: | :heavy_check_mark: ** | :heavy_check_mark: |
102102
| Central US | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
103+
| China East 3 | :heavy_check_mark: | :x: | :x:|
104+
| China North 3 | :heavy_check_mark: | :x: | :x:|
103105
| East Asia | :heavy_check_mark: | :heavy_check_mark: ** | :heavy_check_mark: |
104106
| East US | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
105107
| East US 2 | :heavy_check_mark: | :x: $ | :heavy_check_mark: |
106108
| France Central | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
107-
| France South | :heavy_check_mark: | :x: | :x: |
109+
| France South | :heavy_check_mark: | :x: | :heavy_check_mark: |
108110
| Germany West Central | :x: $$ | :x: $ | :x: |
109111
| Japan East | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
110112
| Japan West | :heavy_check_mark: | :x: | :heavy_check_mark: |
111113
| Jio India West | :heavy_check_mark: (v3 only)| :x: | :x: |
112-
| Korea Central | :heavy_check_mark: | :heavy_check_mark: ** | :x: |
113-
| Korea South | :heavy_check_mark: | :x: | :x: |
114+
| Korea Central | :heavy_check_mark: | :heavy_check_mark: ** | :heavy_check_mark: |
115+
| Korea South | :heavy_check_mark: | :x: | :heavy_check_mark: |
114116
| North Central US | :heavy_check_mark: | :x: | :heavy_check_mark: |
115117
| North Europe | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
116118
| Norway East | :heavy_check_mark: | :x: | :x: |
117119
| Qatar Central | :heavy_check_mark: | :x: | :x: |
118-
| South Africa North | :heavy_check_mark: | :heavy_check_mark: ** | :x: |
120+
| South Africa North | :heavy_check_mark: | :heavy_check_mark: | :x: |
119121
| South Central US | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
120122
| South India | :x: $$ | :x: | :heavy_check_mark: |
121123
| Southeast Asia | :heavy_check_mark: | :x: $ | :heavy_check_mark: |
@@ -127,10 +129,10 @@ One advantage of running your workload in Azure is global reach. The flexible se
127129
| US Gov Virginia | :heavy_check_mark: | :heavy_check_mark: | :x: |
128130
| UK South | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
129131
| UK West | :heavy_check_mark: | :x: | :heavy_check_mark: |
130-
| West Central US | :heavy_check_mark: | :x: | :x: |
132+
| West Central US | :heavy_check_mark: | :x: | :heavy_check_mark: |
131133
| West Europe | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
132134
| West US | :heavy_check_mark: | :x: | :heavy_check_mark: |
133-
| West US 2 | :x: $$ | :x: $ | :x: |
135+
| West US 2 | :x: $$ | :x: $ | :heavy_check_mark:|
134136
| West US 3 | :heavy_check_mark: | :heavy_check_mark: ** | :x: |
135137

136138
$ New Zone-redundant high availability deployments are temporarily blocked in these regions. Already provisioned HA servers are fully supported.

articles/virtual-machines/azure-compute-gallery.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.reviewer: cynthn
1717

1818
An Azure Compute Gallery helps you build structure and organization around your Azure resources, like images and [applications](vm-applications.md). An Azure Compute Gallery provides:
1919

20-
- Global replication.
20+
- Global replication.<sup>1</sup>
2121
- Versioning and grouping of resources for easier management.
2222
- Highly available resources with Zone Redundant Storage (ZRS) accounts in regions that support Availability Zones. ZRS offers better resilience against zonal failures.
2323
- Premium storage support (Premium_LRS).
@@ -26,6 +26,7 @@ An Azure Compute Gallery helps you build structure and organization around your
2626

2727
With a gallery, you can share your resources to everyone, or limit sharing to different users, service principals, or AD groups within your organization. Resources can be replicated to multiple regions, for quicker scaling of your deployments.
2828

29+
<sup>1</sup> The Azure Compute Gallery service is not a global resource. For disaster recovery scenarios, it is a best practice is to have at least two galleries, in different regions.
2930

3031
## Images
3132

includes/virtual-machines-managed-disks-description-customer-managed-keys.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ Managed Disks and the key vault or managed HSM must be in the same region and in
2424

2525
You must grant access to managed disks in your Key Vault or managed HSM to use your keys for encrypting and decrypting the DEK. This allows you full control of your data and keys. You can disable your keys or revoke access to managed disks at any time. You can also audit the encryption key usage with Azure Key Vault monitoring to ensure that only managed disks or other trusted Azure services are accessing your keys.
2626

27-
When you disable or delete your key, any VMs with disks using that key will automatically shut down. After this, the VMs will not be usable unless the key is enabled again or you assign a new key.
27+
When a key is either disabled, deleted, or expired, any VMs with disks using that key will automatically shut down. After this, the VMs will not be usable unless the key is enabled again or you assign a new key.
28+
29+
> [!NOTE]
30+
> It is generally expected that Disk I/O (read or write operations) will start to fail 1 hour after a key is either disabled, deleted, or expired.
2831
2932
The following diagram shows how managed disks use Azure Active Directory and Azure Key Vault to make requests using the customer-managed key:
3033

@@ -46,3 +49,6 @@ To revoke access to customer-managed keys, see [Azure Key Vault PowerShell](/pow
4649
#### Automatic key rotation of customer-managed keys
4750

4851
You can choose to enable automatic key rotation to the latest key version. A disk references a key via its disk encryption set. When you enable automatic rotation for a disk encryption set, the system will automatically update all managed disks, snapshots, and images referencing the disk encryption set to use the new version of the key within one hour. To learn how to enable customer-managed keys with automatic key rotation, see [Set up an Azure Key Vault and DiskEncryptionSet with automatic key rotation](../articles/virtual-machines/windows/disks-enable-customer-managed-keys-powershell.md#set-up-an-azure-key-vault-and-diskencryptionset-optionally-with-automatic-key-rotation).
52+
53+
> [!NOTE]
54+
> Virtual Machines will not be rebooted during automatic key rotation.

0 commit comments

Comments
 (0)