Skip to content

Commit ac1f0b4

Browse files
author
Yulin Li
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into yulin/format
2 parents 9bff972 + 73b6bc7 commit ac1f0b4

32 files changed

+1363
-715
lines changed

articles/active-directory/authentication/how-to-mfa-server-migration-utility.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,8 @@ Content-Type: application/json
341341

342342

343343
#### Response
344-
>[!NOTE]
345-
>The response object shown here might be shortened for readability.
346-
344+
>**Note:** The response object shown here might be shortened for readability.
345+
<!-- {
347346
"blockType": "response",
348347
"truncated": true,
349348
"@odata.type": "microsoft.graph.internalDomainFederation"
@@ -414,12 +413,11 @@ If the upgrade had issues, follow these steps to roll back:
414413
"federatedIdpMfaBehavior": "enforceMfaByFederatedIdp"
415414
}
416415
```
417-
416+
417+
The following response object is shortened for readability.
418418

419419
**Response**
420420

421-
>[!NOTE]
422-
>The response object shown here might be shortened for readability.
423421
<!-- {
424422
"blockType": "response",
425423
"truncated": true,
@@ -452,6 +450,7 @@ If the upgrade had issues, follow these steps to roll back:
452450

453451
Users will no longer be redirected to your on-premises federation server for MFA, whether they’re targeted by the Staged Rollout tool or not. Note this can take up to 24 hours to take effect.
454452

453+
455454
## Next steps
456455

457456
- [Overview of how to migrate from MFA Server to Azure AD Multi-Factor Authentication](how-to-migrate-mfa-server-to-azure-mfa.md)

articles/azure-cache-for-redis/cache-overview.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Azure Cache for Redis is available in these tiers:
4242
| Basic | An OSS Redis cache running on a single VM. This tier has no service-level agreement (SLA) and is ideal for development/test and non-critical workloads. |
4343
| Standard | An OSS Redis cache running on two VMs in a replicated configuration. |
4444
| Premium | High-performance OSS Redis caches. This tier offers higher throughput, lower latency, better availability, and more features. Premium caches are deployed on more powerful VMs compared to the VMs for Basic or Standard caches. |
45-
| Enterprise | High-performance caches powered by Redis Inc.'s Redis Enterprise software. This tier supports Redis modules including RediSearch, RedisBloom, and RedisTimeSeries. Also, it offers even higher availability than the Premium tier. |
45+
| Enterprise | High-performance caches powered by Redis Inc.'s Redis Enterprise software. This tier supports Redis modules including RediSearch, RedisBloom, RedisJSON, and RedisTimeSeries. Also, it offers even higher availability than the Premium tier. |
4646
| Enterprise Flash | Cost-effective large caches powered by Redis Inc.'s Redis Enterprise software. This tier extends Redis data storage to non-volatile memory, which is cheaper than DRAM, on a VM. It reduces the overall per-GB memory cost. |
4747

4848
### Feature comparison
@@ -59,11 +59,14 @@ The [Azure Cache for Redis Pricing](https://azure.microsoft.com/pricing/details/
5959
| [Data persistence](cache-how-to-premium-persistence.md) |-|-||Preview|Preview|
6060
| [Zone redundancy](cache-how-to-zone-redundancy.md) |-|-||||
6161
| [Geo-replication](cache-how-to-geo-replication.md) |-|-||||
62-
| [Redis Modules](#choosing-the-right-tier) |-|-|-||-|
62+
| [Redis Modules](cache-redis-modules.md) |-|-|-||Preview|
6363
| [Import/Export](cache-how-to-import-export-data.md) |-|-||||
6464
| [Reboot](cache-administration.md#reboot) ||||-|-|
6565
| [Scheduled updates](cache-administration.md#schedule-updates) ||||-|-|
6666

67+
> [!NOTE]
68+
> The Enterprise Flash tier currently supports only the RedisJSON and RediSearch modules in preview.
69+
6770
### Choosing the right tier
6871

6972
Consider the following options when choosing an Azure Cache for Redis tier:
@@ -76,7 +79,7 @@ Consider the following options when choosing an Azure Cache for Redis tier:
7679
- **High availability**: Azure Cache for Redis provides multiple [high availability](cache-high-availability.md) options. It guarantees that a Standard, Premium, or Enterprise cache is available according to our [SLA](https://azure.microsoft.com/support/legal/sla/cache/v1_0/). The SLA only covers connectivity to the cache endpoints. The SLA doesn't cover protection from data loss. We recommend using the Redis data persistence feature in the Premium and Enterprise tiers to increase resiliency against data loss.
7780
- **Data persistence**: The Premium and Enterprise tiers allow you to persist the cache data to an Azure Storage account and a Managed Disk respectively. Underlying infrastructure issues might result in potential data loss. We recommend using the Redis data persistence feature in these tiers to increase resiliency against data loss. Azure Cache for Redis offers both RDB and AOF (preview) options. Data persistence can be enabled through Azure portal and CLI. For the Premium tier, see [How to configure persistence for a Premium Azure Cache for Redis](cache-how-to-premium-persistence.md).
7881
- **Network isolation**: Azure Private Link and Virtual Network (VNET) deployments provide enhanced security and traffic isolation for your Azure Cache for Redis. VNET allows you to further restrict access through network access control policies. For more information, see [Azure Cache for Redis with Azure Private Link](cache-private-link.md) and [How to configure Virtual Network support for a Premium Azure Cache for Redis](cache-how-to-premium-vnet.md).
79-
- **Redis Modules**: Enterprise tiers support [RediSearch](https://docs.redis.com/latest/modules/redisearch/), [RedisBloom](https://docs.redis.com/latest/modules/redisbloom/) and [RedisTimeSeries](https://docs.redis.com/latest/modules/redistimeseries/). These modules add new data types and functionality to Redis.
82+
- **Redis Modules**: Enterprise tiers support [RediSearch](https://docs.redis.com/latest/modules/redisearch/), [RedisBloom](https://docs.redis.com/latest/modules/redisbloom/), [RedisTimeSeries](https://docs.redis.com/latest/modules/redistimeseries/), and [RedisJSON](https://docs.redis.com/latest/modules/redisjson/) (preview). These modules add new data types and functionality to Redis.
8083

8184
You can scale your cache from the Basic tier up to Premium after it has been created. Scaling down to a lower tier isn't supported currently. For step-by-step scaling instructions, see [How to Scale Azure Cache for Redis](cache-how-to-scale.md) and [How to automate a scaling operation](cache-how-to-scale.md#how-to-automate-a-scaling-operation).
8285

articles/azure-resource-manager/management/resources-without-resource-group-limit.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Resources without 800 count limit
33
description: Lists the Azure resource types that can have more than 800 instances in a resource group.
44
ms.topic: conceptual
5-
ms.date: 08/10/2022
5+
ms.date: 08/31/2022
66
---
77

88
# Resources not limited to 800 instances per resource group
@@ -32,7 +32,7 @@ Some resources have a limit on the number instances per region. This limit is di
3232

3333
## Microsoft.BotService
3434

35-
* botServices - By default, limited to 800 instances. That limit can be increased by contacting support.
35+
* botServices - By default, limited to 800 instances. That limit can be increased by [registering the following features](preview-features.md) - Microsoft.Resources/ARMDisableResourcesPerRGLimit
3636

3737
## Microsoft.Compute
3838

@@ -44,7 +44,7 @@ Some resources have a limit on the number instances per region. This limit is di
4444
* snapshots
4545
* virtualMachines
4646
* virtualMachines/extensions
47-
* virtualMachineScaleSets - By default, limited to 800 instances. That limit can be increased by contacting support.
47+
* virtualMachineScaleSets - By default, limited to 800 instances. That limit can be increased by [registering the following features](preview-features.md) - Microsoft.Resources/ARMDisableResourcesPerRGLimit
4848

4949
## Microsoft.ContainerInstance
5050

@@ -84,7 +84,7 @@ Some resources have a limit on the number instances per region. This limit is di
8484

8585
## Microsoft.DevTestLab
8686

87-
* labs/virtualMachines - By default, limited to 800 instances. That limit can be increased by contacting support.
87+
* labs/virtualMachines - By default, limited to 800 instances. That limit can be increased by [registering the following features](preview-features.md) - Microsoft.DevTestLab/DisableLabVirtualMachineQuota
8888
* schedules
8989

9090
## Microsoft.EdgeOrder
@@ -184,17 +184,17 @@ Some resources have a limit on the number instances per region. This limit is di
184184

185185
## Microsoft.NotificationHubs
186186

187-
* namespaces - By default, limited to 800 instances. That limit can be increased by contacting support.
188-
* namespaces/notificationHubs - By default, limited to 800 instances. That limit can be increased by contacting support.
187+
* namespaces - By default, limited to 800 instances. That limit can be increased by [registering the following features](preview-features.md) - Microsoft.NotificationHubs/ARMDisableResourcesPerRGLimit
188+
* namespaces/notificationHubs - By default, limited to 800 instances. That limit can be increased by [registering the following features](preview-features.md) - Microsoft.NotificationHubs/ARMDisableResourcesPerRGLimit
189189

190190
## Microsoft.PowerBI
191191

192-
* workspaceCollections - By default, limited to 800 instances. That limit can be increased by contacting support.
192+
* workspaceCollections - By default, limited to 800 instances. That limit can be increased by [registering the following features](preview-features.md) - Microsoft.PowerBI/UnlimitedQuota
193193

194194
## Microsoft.PowerBIDedicated
195195

196-
* autoScaleVCores - By default, limited to 800 instances. That limit can be increased by contacting support.
197-
* capacities - By default, limited to 800 instances. That limit can be increased by contacting support.
196+
* autoScaleVCores - By default, limited to 800 instances. That limit can be increased by [registering the following features](preview-features.md) - Microsoft.PowerBIDedicated/UnlimitedResourceGroupQuota
197+
* capacities - By default, limited to 800 instances. That limit can be increased by [registering the following features](preview-features.md) - Microsoft.PowerBIDedicated/UnlimitedResourceGroupQuota
198198

199199
## Microsoft.Relay
200200

@@ -245,7 +245,7 @@ Some resources have a limit on the number instances per region. This limit is di
245245

246246
## Microsoft.StreamAnalytics
247247

248-
* streamingjobs - By default, limited to 800 instances. That limit can be increased by contacting support.
248+
* streamingjobs - By default, limited to 800 instances. That limit can be increased by [registering the following features](preview-features.md) - Microsoft.StreamAnalytics/ASADisableARMResourcesPerRGLimit
249249

250250
## Microsoft.Web
251251

0 commit comments

Comments
 (0)