Skip to content

Commit d0ded4a

Browse files
authored
Merge pull request #203865 from MicrosoftDocs/main
Publish to Live, Wednesday 4AM PST, 7/6
2 parents ab52c87 + 40c5fe4 commit d0ded4a

File tree

239 files changed

+1185
-644
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+1185
-644
lines changed

articles/active-directory/enterprise-users/licensing-service-plan-reference.md

Lines changed: 3 additions & 4 deletions
Large diffs are not rendered by default.

articles/active-directory/manage-apps/f5-big-ip-oracle-jde-easy-button.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: gasinh
1313
ms.collection: M365-identity-device-management
1414
---
1515

16-
# Tutorial: Configure F5’s BIG-IP Easy Button for SSO to Oracle JDE
16+
# Tutorial: Configure F5’s BIG-IP Easy Button for SSO to Oracle JDE
1717

1818
In this article, learn to secure Oracle JD Edwards (JDE) using Azure Active Directory (Azure AD), through F5’s BIG-IP Easy Button guided configuration.
1919

articles/applied-ai-services/form-recognizer/how-to-guides/includes/java-read.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ import java.util.Arrays;
130130
public class FormRecognizer {
131131

132132
// set `<your-endpoint>` and `<your-key>` variables with the values from the Azure portal
133-
private static final String endpoint = "https://formrecognizer-jp.cognitiveservices.azure.com/";
134-
private static final String key = "092e23363b8b492dbc402cbebbf1c1d9";
133+
private static final String endpoint = "<your-endpoint>";
134+
private static final String key = "<your-key>";
135135

136136
public static void main(String[] args) {
137137

articles/azure-cache-for-redis/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
- name: Monitor in Azure portal
189189
href: cache-how-to-monitor.md
190190
- name: Set alerts for exceptions
191-
href: cache-how-to-monitor.md#alerts
191+
href: cache-how-to-monitor.md#create-alerts
192192
- name: Monitor with diagnostic logs
193193
href: cache-monitor-diagnostic-settings.md
194194
- name: Scale

articles/azure-cache-for-redis/cache-best-practices-memory-management.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ ms.service: cache
77
ms.topic: conceptual
88
ms.date: 03/22/2022
99
ms.author: franlanglois
10+
1011
---
12+
1113
# Memory management
1214

1315
## Eviction policy
@@ -36,7 +38,7 @@ Configure your [maxmemory-reserved setting](cache-configure.md#memory-policies)
3638

3739
- The `maxfragmentationmemory-reserved` setting configures the amount of memory, in MB per instance in a cluster, that is reserved to accommodate for memory fragmentation. When you set this value, the Redis server experience is more consistent when the cache is full or close to full and the fragmentation ratio is high. When memory is reserved for such operations, it's unavailable for storage of cached data. The allowed range for `maxfragmentationmemory-reserved` is 10% - 60% of `maxmemory`. If you try to set these values lower than 10% or higher than 60%, they are re-evaluated and set to the 10% minimum and 60% maximum. The values are rendered in megabytes.
3840

39-
- One thing to consider when choosing a new memory reservation value (`maxmemory-reserved` or `maxfragmentationmemory-reserved`) is how this change might affect a cache with large amounts of data in it that is already running. For instance, if you have a 53-GB cache with 49 GB of data and then change the reservation value to 8 GB, the max available memory for the system will drop to 45 GB. If either your current `used_memory` or your `used_memory_rss` values are higher than the new limit of 45 GB, then the system must evict data until both `used_memory` and `used_memory_rss` are below 45 GB. Eviction can increase server load and memory fragmentation. For more information on cache metrics such as `used_memory` and `used_memory_rss`, see [Available metrics and reporting intervals](cache-how-to-monitor.md#available-metrics-and-reporting-intervals).
41+
- One thing to consider when choosing a new memory reservation value (`maxmemory-reserved` or `maxfragmentationmemory-reserved`) is how this change might affect a cache with large amounts of data in it that is already running. For instance, if you have a 53-GB cache with 49 GB of data and then change the reservation value to 8 GB, the max available memory for the system will drop to 45 GB. If either your current `used_memory` or your `used_memory_rss` values are higher than the new limit of 45 GB, then the system must evict data until both `used_memory` and `used_memory_rss` are below 45 GB. Eviction can increase server load and memory fragmentation. For more information on cache metrics such as `used_memory` and `used_memory_rss`, see [Create your own metrics](cache-how-to-monitor.md#create-your-own-metrics).
4042

4143
## Next steps
4244

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ You can view and configure the following settings using the **Resource Menu**. T
6666

6767
### Activity log
6868

69-
Select **Activity log** to view actions done to your cache. You can also use filtering to expand this view to include other resources. For more information on working with audit logs, see [Audit operations with Resource Manager](../azure-monitor/essentials/activity-log.md). For more information on monitoring Azure Cache for Redis events, see [alerts](cache-how-to-monitor.md#alerts).
69+
Select **Activity log** to view actions done to your cache. You can also use filtering to expand this view to include other resources. For more information on working with audit logs, see [Audit operations with Resource Manager](../azure-monitor/essentials/activity-log.md). For more information on monitoring Azure Cache for Redis events, see [Create alerts](cache-how-to-monitor.md#create-alerts).
7070

7171
### Access control (IAM)
7272

@@ -142,7 +142,7 @@ The **maxmemory-reserved** setting configures the amount of memory in MB per ins
142142

143143
The **maxfragmentationmemory-reserved** setting configures the amount of memory in MB per instance in a cluster that is reserved to accommodate for memory fragmentation. When you set this value, the Redis server experience is more consistent when the cache is full or close to full and the fragmentation ratio is high. When memory is reserved for such operations, it's unavailable for storage of cached data. The minimum and maximum values on the slider are 10% and 60%, shown in megabytes. You must set the value in that range.
144144

145-
When choosing a new memory reservation value (**maxmemory-reserved** or **maxfragmentationmemory-reserved**), consider how this change might affect a cache that is already running with large amounts of data in it. For instance, if you have a 53-GB cache with 49 GB of data, then change the reservation value to 8 GB, this change drops the max available memory for the system down to 45 GB. If either your current `used_memory` or your `used_memory_rss` values are higher than the new limit of 45 GB, then the system will have to evict data until both `used_memory` and `used_memory_rss` are below 45 GB. Eviction can increase server load and memory fragmentation. For more information on cache metrics such as `used_memory` and `used_memory_rss`, see [Available metrics and reporting intervals](cache-how-to-monitor.md#available-metrics-and-reporting-intervals).
145+
When choosing a new memory reservation value (**maxmemory-reserved** or **maxfragmentationmemory-reserved**), consider how this change might affect a cache that is already running with large amounts of data in it. For instance, if you have a 53-GB cache with 49 GB of data, then change the reservation value to 8 GB, this change drops the max available memory for the system down to 45 GB. If either your current `used_memory` or your `used_memory_rss` values are higher than the new limit of 45 GB, then the system will have to evict data until both `used_memory` and `used_memory_rss` are below 45 GB. Eviction can increase server load and memory fragmentation. For more information on cache metrics such as `used_memory` and `used_memory_rss`, see [Create your own metrics](cache-how-to-monitor.md#create-your-own-metrics).
146146

147147
> [!IMPORTANT]
148148
> The **maxmemory-reserved** and **maxfragmentationmemory-reserved** settings are available only for Standard and Premium caches.
@@ -161,8 +161,6 @@ Redis keyspace notifications are configured on the **Advanced settings** on the
161161
162162
For more information, see [Redis Keyspace Notifications](https://redis.io/topics/notifications). For sample code, see the [KeySpaceNotifications.cs](https://github.com/rustd/RedisSamples/blob/master/HelloWorld/KeySpaceNotifications.cs) file in the [Hello world](https://github.com/rustd/RedisSamples/tree/master/HelloWorld) sample.
163163

164-
<a name="recommendations"></a>
165-
166164
## Azure Cache for Redis Advisor
167165

168166
The **Azure Cache for Redis Advisor** on the left displays recommendations for your cache. During normal operations, no recommendations are displayed.
@@ -177,15 +175,15 @@ Further information can be found on the **Recommendations** on the left.
177175

178176
:::image type="content" source="media/cache-configure/redis-cache-recommendations.png" alt-text="Recommendations":::)
179177

180-
You can monitor these metrics on the [Monitoring charts](cache-how-to-monitor.md#monitoring-charts) and [Usage charts](cache-how-to-monitor.md#usage-charts) sections of the **Azure Cache for Redis** on the left.
178+
You can monitor these metrics on the [Monitoring](cache-how-to-monitor.md) section of the Resource menu on the left.
181179

182180
Each pricing tier has different limits for client connections, memory, and bandwidth. If your cache approaches maximum capacity for these metrics over a sustained period of time, a recommendation is created. For more information about the metrics and limits reviewed by the **Recommendations** tool, see the following table:
183181

184182
| Azure Cache for Redis metric | More information |
185183
| --- | --- |
186184
| Network bandwidth usage |[Cache performance - available bandwidth](./cache-planning-faq.yml#azure-cache-for-redis-performance) |
187185
| Connected clients |[Default Redis server configuration - max clients](#maxclients) |
188-
| Server load |[Usage charts - Redis Server Load](cache-how-to-monitor.md#usage-charts) |
186+
| Server load |[Redis Server Load](cache-how-to-monitor.md#view-cache-metrics) |
189187
| Memory usage |[Cache performance - size](./cache-planning-faq.yml#azure-cache-for-redis-performance) |
190188

191189
To upgrade your cache, select **Upgrade now** to change the pricing tier and [scale](#scale) your cache. For more information on choosing a pricing tier, see [Choosing the right tier](cache-overview.md#choosing-the-right-tier)
@@ -338,11 +336,11 @@ Select **Redis metrics** to [view metrics](cache-how-to-monitor.md#view-cache-me
338336

339337
### Alert rules
340338

341-
Select **Alert rules** to configure alerts based on Azure Cache for Redis metrics. For more information, see [Alerts](cache-how-to-monitor.md#alerts).
339+
Select **Alert rules** to configure alerts based on Azure Cache for Redis metrics. For more information, see [Create alerts](cache-how-to-monitor.md#create-alerts).
342340

343341
### Diagnostics
344342

345-
By default, cache metrics in Azure Monitor are [stored for 30 days](../azure-monitor/essentials/data-platform-metrics.md) and then deleted. To persist your cache metrics for longer than 30 days, select **Diagnostics** to [configure the storage account](cache-how-to-monitor.md#export-cache-metrics) used to store cache diagnostics.
343+
By default, cache metrics in Azure Monitor are [stored for 30 days](../azure-monitor/essentials/data-platform-metrics.md) and then deleted. To persist your cache metrics for longer than 30 days, select **Diagnostics** to [configure the storage account](cache-how-to-monitor.md#use-a-storage-account-to-export-cache-metrics) used to store cache diagnostics.
346344

347345
>[!NOTE]
348346
>In addition to archiving your cache metrics to storage, you can also [stream them to an Event hub or send them to Azure Monitor logs](../azure-monitor/essentials/stream-monitoring-data-event-hubs.md).

0 commit comments

Comments
 (0)