Skip to content

Commit a6b4900

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
Learn Build Service GitHub App
authored and
Learn Build Service GitHub App
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents acafea8 + 95fbf8c commit a6b4900

File tree

439 files changed

+2606
-1717
lines changed

Some content is hidden

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

439 files changed

+2606
-1717
lines changed

‎.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4554,6 +4554,21 @@
45544554
"source_path_from_root": "/articles/virtual-network/tutorial-restrict-network-access-to-resources-powershell.md",
45554555
"redirect_url": "/azure/virtual-network/tutorial-restrict-network-access-to-resources",
45564556
"redirect_document_id": false
4557+
},
4558+
{
4559+
"source_path_from_root": "/articles/virtual-network/how-to-create-encryption-portal.md",
4560+
"redirect_url": "/azure/virtual-network/how-to-create-encryption",
4561+
"redirect_document_id": false
4562+
},
4563+
{
4564+
"source_path_from_root": "/articles/virtual-network/how-to-create-encryption-powershell.md",
4565+
"redirect_url": "/azure/virtual-network/how-to-create-encryption",
4566+
"redirect_document_id": false
4567+
},
4568+
{
4569+
"source_path_from_root": "/articles/virtual-network/how-to-create-encryption-cli.md",
4570+
"redirect_url": "/azure/virtual-network/how-to-create-encryption",
4571+
"redirect_document_id": false
45574572
}
45584573
]
45594574
}

‎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/quota.md

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

‎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/app-service/webjobs-sdk-how-to.md

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,35 @@ For example, the `connection` property for an Azure Blob trigger definition migh
5050

5151
#### Identity-based connections
5252

53-
To use identity-based connections in the WebJobs SDK, make sure you are using the latest versions of WebJobs packages in your project. You should also ensure you have a reference to [Microsoft.Azure.WebJobs.Host.Storage](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Host.Storage). When setting up WebJobs within your HostBuilder, make sure to include a call to `AddAzureStorageCoreServices`, as this is what allows `AzureWebJobsStorage` and other Storage triggers and bindings to use identity:
53+
To use identity-based connections in the WebJobs SDK, make sure you are using the latest versions of WebJobs packages in your project. You should also ensure you have a reference to [Microsoft.Azure.WebJobs.Host.Storage](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Host.Storage). The following is an example of what your project file might look like after making these updates:
54+
55+
```xml
56+
<Project Sdk="Microsoft.NET.Sdk">
57+
58+
<PropertyGroup>
59+
<OutputType>Exe</OutputType>
60+
<TargetFramework>net48</TargetFramework>
61+
<IsWebJobProject>true</IsWebJobProject>
62+
<WebJobName>$(AssemblyName)</WebJobName>
63+
<WebJobType>Continuous</WebJobType>
64+
</PropertyGroup>
65+
66+
<ItemGroup>
67+
<PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.41" />
68+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage.Queues" Version="5.3.1" />
69+
<PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.1" />
70+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
71+
</ItemGroup>
72+
73+
<ItemGroup>
74+
<None Update="appsettings.json">
75+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
76+
</None>
77+
</ItemGroup>
78+
</Project>
79+
```
80+
81+
When setting up WebJobs within your HostBuilder, make sure to include a call to `AddAzureStorageCoreServices`, as this is what allows `AzureWebJobsStorage` and other Storage triggers and bindings to use identity:
5482

5583
```csharp
5684
builder.ConfigureWebJobs(b =>
@@ -80,7 +108,7 @@ If you provide your configuration through any means other than environment varia
80108

81109
You may omit the `queueServiceUri` property if you do not plan to use blob triggers.
82110

83-
When your code is run locally, this will default to using your developer identity per the behavior described for DefaultAzureCredential.
111+
When your code is run locally, this will default to using your developer identity per the behavior described for [DefaultAzureCredential](/dotnet/api/azure.identity.defaultazurecredential).
84112

85113
When your code is hosted in Azure App Service, the configuration shown above will default to the [system-assigned managed identity](./overview-managed-identity.md#add-a-system-assigned-identity) for the resource. To instead use a [user-assigned identity](./overview-managed-identity.md#add-a-user-assigned-identity) which has been assigned to the app, you need to add additional properties for your connection that specify which identity should be used. The `credential` property (`AzureWebJobsStorage__credential` as an environment variable) should be set to the string "managedidentity". The `clientId` property (`AzureWebJobsStorage__clientId` as an environment variable) should be set to the client ID of the user-assigned managed identity to be used. As structured configuration, the complete object would be:
86114

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,15 @@ There are also caching providers in .NET core. To quickly start using Redis with
2323

2424
## Skip to the code on GitHub
2525

26-
Clone the repo [https://github.com/Azure-Samples/azure-cache-redis-samples/tree/main/quickstart/aspnet-core](https://github.com/Azure-Samples/azure-cache-redis-samples/tree/main/quickstart/aspnet-core) on GitHub.
26+
Clone the [https://github.com/Azure-Samples/azure-cache-redis-samples](https://github.com/Azure-Samples/azure-cache-redis-samples) GitHub repo and navigate to the `quickstart/aspnet-core` directory to view the completed source code for the steps ahead.
27+
28+
The `quickstart/aspnet-core` directory is also configured as an [Azure Developer CLI (`azd`)](/azure/developer/azure-developer-cli/overview) template. Use the open-source `azd` tool to streamline the provisioning and deployment from a local environment to Azure. Optionally, run the `azd up` command to automatically provision an Azure Cache for Redis instance, and to configure the local sample app to connect to it:
29+
30+
```azdeveloper
31+
azd up
32+
```
33+
34+
### Explore the eShop sample
2735

2836
As a next step, you can see a real-world scenario eShop application demonstrating the ASP.NET core caching providers: [ASP.NET core eShop using Redis caching providers](https://github.com/Azure-Samples/azure-cache-redis-demos).
2937

@@ -41,18 +49,18 @@ Deployment instructions are in the README.md.
4149

4250
## Create a cache
4351

44-
[!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)]
4553

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

48-
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)]
4957

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

52-
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:
5361

5462
```dos
55-
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"
5664
```
5765

5866
## Connect to the cache with RedisConnection
@@ -63,10 +71,11 @@ The `RedisConnection` class manages the connection to your cache. The connection
6371
_redisConnection = await _redisConnectionFactory;
6472
```
6573

66-
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.
6775

6876
```csharp
6977
using StackExchange.Redis;
78+
using Azure.Identity;
7079
```
7180

7281
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

0 commit comments

Comments
 (0)