Skip to content

Commit b2c1fe4

Browse files
authored
Merge pull request #146792 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 2ff2d22 + 7a522d2 commit b2c1fe4

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

articles/azure-cache-for-redis/cache-how-to-premium-persistence.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ Persistence writes Redis data into an Azure Storage account that you own and man
6262
| **Storage Key** | Drop-down and choose either the **Primary key** or **Secondary key** to use. | If the storage key for your persistence account is regenerated, you must reconfigure the desired key from the **Storage Key** drop-down. |
6363

6464
The first backup is initiated once the backup frequency interval elapses.
65+
66+
> [!NOTE]
67+
> When RDB files are backed up to storage, they are stored in the form of page blobs.
6568
6669
9. To enable AOF persistence, click **AOF** and configure the settings.
6770

@@ -92,7 +95,7 @@ The following list contains answers to commonly asked questions about Azure Cach
9295
* [Which persistence model should I choose?](#which-persistence-model-should-i-choose)
9396
* [What happens if I have scaled to a different size and a backup is restored that was made before the scaling operation?](#what-happens-if-i-have-scaled-to-a-different-size-and-a-backup-is-restored-that-was-made-before-the-scaling-operation)
9497
* [Can I use the same storage account for persistence across two different caches?](#can-i-use-the-same-storage-account-for-persistence-across-two-different-caches)
95-
98+
* [Will I be charged for the storage being used in Data Persistence](#will-i-be-charged-for-the-storage-being-used-in-data-persistence)
9699

97100
### RDB persistence
98101
* [Can I change the RDB backup frequency after I create the cache?](#can-i-change-the-rdb-backup-frequency-after-i-create-the-cache)
@@ -182,6 +185,10 @@ When clustering is enabled, each shard in the cache has its own set of page blob
182185

183186
After a rewrite, two sets of AOF files exist in storage. Rewrites occur in the background and append to the first set of files, while set operations that are sent to the cache during the rewrite append to the second set. A backup is temporarily stored during rewrites in case of failure, but is promptly deleted after a rewrite finishes.
184187

188+
### Will I be charged for the storage being used in Data Persistence?
189+
190+
Yes, you will be charged for the storage being used as per the pricing model of the storage account being used.
191+
185192

186193
## Next steps
187194
Learn more about Azure Cache for Redis features.
@@ -198,4 +205,4 @@ Learn more about Azure Cache for Redis features.
198205

199206
[redis-cache-aof-persistence]: ./media/cache-how-to-premium-persistence/redis-cache-aof-persistence.png
200207

201-
[redis-cache-settings]: ./media/cache-how-to-premium-persistence/redis-cache-settings.png
208+
[redis-cache-settings]: ./media/cache-how-to-premium-persistence/redis-cache-settings.png

articles/azure-resource-manager/managed-applications/request-just-in-time-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.author: evanhi
88
---
99
# Enable and request just-in-time access for Azure Managed Applications
1010

11-
Consumers of your managed application may be reluctant to grant you permanent access to the managed resource group. As a publisher of a manager application, you might prefer that consumers know exactly when you need to access the managed resources. To give consumers greater control over granting access to managed resources, Azure Managed Applications provides a feature called just-in-time (JIT) access. This feature is currently in preview.
11+
Consumers of your managed application may be reluctant to grant you permanent access to the managed resource group. As a publisher of a managed application, you might prefer that consumers know exactly when you need to access the managed resources. To give consumers greater control over granting access to managed resources, Azure Managed Applications provides a feature called just-in-time (JIT) access. This feature is currently in preview.
1212

1313
JIT access enables you to request elevated access to a managed application's resources for troubleshooting or maintenance. You always have read-only access to the resources, but for a specific time period you can have greater access.
1414

articles/postgresql/overview-single-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ In addition to native authentication, the single server service supports Azure A
6363

6464
[Audit logging]() (in preview) is available to track all database level activity.
6565

66-
The single server service is complaint with all the industry-leading certifications like FedRAMP, HIPAA, PCI DSS. Visit the [Azure Trust Center]() for information about Azure's platform security.
66+
The single server service is compliant with all the industry-leading certifications like FedRAMP, HIPAA, PCI DSS. Visit the [Azure Trust Center]() for information about Azure's platform security.
6767

6868
For more information about Azure Database for PostgreSQL security features, see the [security overview]().
6969

0 commit comments

Comments
 (0)