Skip to content

Commit 8a21c1a

Browse files
halkazwinihalkazwini
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-agent
2 parents c5d876b + 254254d commit 8a21c1a

File tree

76 files changed

+475
-238
lines changed

Some content is hidden

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

76 files changed

+475
-238
lines changed

‎articles/ai-services/openai/includes/model-matrix/provisioned-models.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: include
88
ms.custom: references_regions
9-
ms.date: 08/01/2024
9+
ms.date: 08/16/2024
1010
---
1111

1212
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **turbo-2024-04-09** | **gpt-4o**, **2024-05-13** | **gpt-4-32k**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** |
@@ -32,4 +32,4 @@ ms.date: 08/01/2024
3232
| switzerlandwest | - | - | - | - | - | - | - | ✅ |
3333
| uksouth | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
3434
| westus | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
35-
| westus3 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
35+
| westus3 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |

‎articles/ai-services/openai/includes/model-matrix/standard-gpt-4.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Standard GPT-4 model availability
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: include
8-
ms.date: 08/14/2024
8+
ms.date: 08/16/2024
99
---
1010

1111
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **vision-preview** | **gpt-4**, **turbo-2024-04-09** | **gpt-4o**, **2024-05-13** | **gpt-4o-mini**, **2024-07-18** | **gpt-4-32k**, **0613** |
@@ -24,4 +24,4 @@ ms.date: 08/14/2024
2424
| switzerlandnorth | ✅ | - | - | ✅ | - | - | - | ✅ |
2525
| uksouth | - | ✅ | ✅ | - | - | - | - | - |
2626
| westus | - | ✅ | - | ✅ | ✅ | ✅ | - | - |
27-
| westus3 | - | ✅ | - | - | ✅ | ✅ | - | - |
27+
| westus3 | - | ✅ | - | - | ✅ | ✅ | - | - |

‎articles/ai-services/openai/includes/model-matrix/standard-models.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Quota and limits for Azure OpenAI by region.
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: include
8-
ms.date: 08/14/2024
8+
ms.date: 08/16/2024
99
---
1010

1111

@@ -27,4 +27,5 @@ ms.date: 08/14/2024
2727
| switzerlandnorth | ✅ | - | - | ✅ | - | - | - | ✅ | - | ✅ | - | - | ✅ | - | - | ✅ | - | - | - | - | - | - | - | - | - |
2828
| uksouth | - | ✅ | ✅ | - | - | - | - | - | ✅ | ✅ | ✅ | - | ✅ | - | - | ✅ | - | ✅ | - | - | - | - | - | - | - |
2929
| westeurope | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - | ✅ |
30-
| westus | - | ✅ | - | ✅ | ✅ | ✅ | - | - | - | - | ✅ | - | - | - | - | ✅ | - | - | - | - | - | - | - | - | - |
30+
| westus | - | ✅ | - | ✅ | ✅ | ✅ | - | - | - | - | ✅ | - | - | - | - | ✅ | - | - | - | - | - | - | - | - | - |
31+
| westus3 | - | ✅ | - | - | ✅ | ✅ | - | - | - | - | - | - | - | - | - | ✅ | - | ✅ | - | - | - | - | - | - | - |

‎articles/azure-cache-for-redis/cache-web-app-aspnet-core-howto.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@ Deployment instructions are in the README.md.
4949

5050
## Create a cache
5151

52-
[!INCLUDE [redis-cache-create](~/reusable-content/ce-skilling/azure/includes/azure-cache-for-redis/includes/redis-cache-create.md)]
52+
[!INCLUDE [redis-cache-create](~/reusable-content/ce-skilling/azure/includes/azure-cache-for-redis/includes/redis-cache-create-entra-id.md)]
5353

54-
[!INCLUDE [redis-cache-access-keys](includes/redis-cache-access-keys.md)]
54+
[!INCLUDE [redis-cache-passwordless](includes/redis-cache-passwordless.md)]
5555

56-
Make a note of the **HOST NAME** and the **Primary** access key. You use these values later to construct the *CacheConnection* secret.
56+
[!INCLUDE [redis-access-policy](includes/redis-access-policy.md)]
5757

58-
## Add a local secret for the connection string
58+
## Add a local secret for the host name
5959

60-
In your command window, execute the following command to store a new secret named *CacheConnection*, after replacing the placeholders, including angle brackets, for your cache name and primary access key:
60+
In your command window, execute the following command to store a new secret named *RedisHostName*, after replacing the placeholders, including angle brackets, for your cache name and primary access key:
6161

6262
```dos
63-
dotnet user-secrets set CacheConnection "<cache name>.redis.cache.windows.net,abortConnect=false,ssl=true,allowAdmin=true,password=<primary-access-key>"
63+
dotnet user-secrets set RedisHostName "<cache-name>.redis.cache.windows.net"
6464
```
6565

6666
## Connect to the cache with RedisConnection
@@ -71,10 +71,11 @@ The `RedisConnection` class manages the connection to your cache. The connection
7171
_redisConnection = await _redisConnectionFactory;
7272
```
7373

74-
In `RedisConnection.cs`, you see the `StackExchange.Redis` namespace is added to the code. This is needed for the `RedisConnection` class.
74+
The `RedisConnection.cs` class includes the `StackExchange.Redis` and `Azure.Identity` namespaces at the top of the file to include essential types to connect to Azure Cache for Redis.
7575

7676
```csharp
7777
using StackExchange.Redis;
78+
using Azure.Identity;
7879
```
7980

8081
The `RedisConnection` code ensures that there's always a healthy connection to the cache by managing the `ConnectionMultiplexer` instance from `StackExchange.Redis`. The `RedisConnection` class recreates the connection when a connection is lost and unable to reconnect automatically.

‎articles/azure-cache-for-redis/includes/cache-delete-resource-group.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
---
2-
title: "include file"
3-
description: "include file"
42
author: flang-msft
53

64
ms.service: azure-cache-redis
75
ms.topic: "include"
8-
ms.date: 08/10/2023
6+
ms.date: 08/16/2024
97
ms.author: franlanglois
10-
ms.custom: "include file"
8+
ms.topic: include
119
---
1210

1311
## Clean up resources

‎articles/azure-cache-for-redis/includes/cache-entra-access.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
---
2+
author: flang-msft
3+
24
ms.service: azure-cache-redis
35
ms.topic: include
4-
ms.date: 07/08/2024
6+
ms.date: 08/16/2024
57
ms.author: franlanglois
6-
author: flang-msft
8+
ms.topic: include
79
---
810

911
### Enable Microsoft Entra ID authentication on your cache

‎articles/azure-cache-for-redis/includes/media/cache-entra-access/assign-access-policy.png

67.7 KB
Loading

‎articles/azure-cache-for-redis/includes/media/cache-entra-access/select-user.png

34.8 KB
Loading

‎articles/azure-cache-for-redis/includes/media/redis-access-policy/assign-access-policy.png

67.7 KB
Loading

‎articles/azure-cache-for-redis/includes/media/redis-access-policy/select-user.png

34.8 KB
Loading

0 commit comments

Comments
 (0)