Skip to content

Commit 88ed588

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us366769-vnet-toc
2 parents e67fe18 + dcf892d commit 88ed588

File tree

298 files changed

+13286
-7022
lines changed

Some content is hidden

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

298 files changed

+13286
-7022
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2639,6 +2639,11 @@
26392639
"redirect_url": "/azure/dns/scripts/dns-cli-create-dns-zone-record",
26402640
"redirect_document_id": false
26412641
},
2642+
{
2643+
"source_path_from_root": "/articles/dns/dns-alerts-metrics.md",
2644+
"redirect_url": "/azure/dns/monitor-dns",
2645+
"redirect_document_id": false
2646+
},
26422647
{
26432648
"source_path_from_root": "/articles/docker/index.yml",
26442649
"redirect_url": "/dotnet/architecture/microservices/container-docker-introduction/docker-defined",

articles/api-management/how-to-deploy-self-hosted-gateway-kubernetes-opentelemetry.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ms.date: 12/17/2021
1515

1616
This article describes the steps for deploying the self-hosted gateway component of Azure API Management to a Kubernetes cluster and automatically send all metrics to an [OpenTelemetry Collector](https://opentelemetry.io/docs/collector/).
1717

18-
[!INCLUDE [preview](./includes/preview/preview-callout-self-hosted-gateway-opentelemetry.md)]
19-
2018
You learn how to:
2119

2220
> [!div class="checklist"]
@@ -35,8 +33,6 @@ You learn how to:
3533

3634
[OpenTelemetry](https://opentelemetry.io/) is a set of open-source tools and frameworks for logging, metrics, and tracing in a vendor-neutral way.
3735

38-
[!INCLUDE [preview](./includes/preview/preview-callout-self-hosted-gateway-opentelemetry.md)]
39-
4036
The self-hosted gateway can be configured to automatically collect and send metrics to an [OpenTelemetry Collector](https://opentelemetry.io/docs/concepts/components/#collector). This allows you to bring your own metrics collection and reporting solution for the self-hosted gateway.
4137

4238
> [!NOTE]

articles/api-management/includes/preview/preview-callout-self-hosted-gateway-opentelemetry.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

articles/azure-cache-for-redis/cache-managed-identity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Managed identity can be enabled either when you create a cache instance or after
3535
## Scope of availability
3636

3737
|Tier | Basic, Standard | Premium |Enterprise, Enterprise Flash |
38-
|---------|---------|---------|---------|
39-
|Available | No | Yes | No |
38+
|---------|:---------:|:---------:|:---------:|
39+
|Available | Yes | Yes | No |
4040

4141
## Prerequisites and limitations
4242

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: About Vector Embeddings and Vector Search in Azure Cache for Redis
33
description: Learn about Azure Cache for Redis to store vector embeddings and provide similarity search.
44

55

6-
6+
ms.collection: ce-skilling-ai-copilot
77
ms.topic: overview
88
ms.custom:
99
- ignite-2024

articles/azure-cache-for-redis/cache-remove-tls-10-11.md

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@ ms.custom: devx-track-azurepowershell, devx-track-azurecli
1212

1313
# Remove TLS 1.0 and 1.1 from use with Azure Cache for Redis
1414

15-
To meet the industry-wide push toward the exclusive use of Transport Layer Security (TLS) version 1.2 or later, Azure Cache for Redis is moving toward requiring the use of the TLS 1.2 in March 2025. TLS versions 1.0 and 1.1 are known to be susceptible to attacks such as BEAST and POODLE, and to have other Common Vulnerabilities and Exposures (CVE) weaknesses.
15+
To meet the industry-wide push toward the exclusive use of Transport Layer Security (TLS) version 1.2 or later, Azure Cache for Redis is moving toward requiring the use of the TLS 1.2 in April 2025. TLS versions 1.0 and 1.1 are known to be susceptible to attacks such as BEAST and POODLE, and to have other Common Vulnerabilities and Exposures (CVE) weaknesses.
1616

1717
TLS versions 1.0 and 1.1 also don't support the modern encryption methods and cipher suites recommended by Payment Card Industry (PCI) compliance standards. This [TLS security blog](https://www.acunetix.com/blog/articles/tls-vulnerabilities-attacks-final-part/) explains some of these vulnerabilities in more detail.
1818

1919
> [!IMPORTANT]
20-
> Starting March 1, 2025, the TLS 1.2 requirement will be enforced.
21-
>
22-
>
20+
> Starting April 1, 2025, the TLS 1.2 requirement will be enforced.
2321
2422
> [!IMPORTANT]
2523
> The TLS 1.0/1.1 retirement content in this article does not apply to Azure Cache for Redis Enterprise/Enterprise Flash because the Enterprise tiers only support TLS 1.2 or newer.
@@ -34,12 +32,8 @@ As a part of this effort, you can expect the following changes to Azure Cache fo
3432
|--|--|
3533
| September 2023 | TLS 1.0/1.1 retirement announcement |
3634
| March 1, 2024 | Beginning March 1, 2024, you can't create new caches with the Minimum TLS version set to 1.0 or 1.1 and you can't set the _MinimumTLSVersion_ to 1.0 or 1.1 for your existing cache. The minimum TLS version aren't updated automatically for existing caches at this point. |
37-
| October 31, 2024 | Ensure that all your applications are connecting to Azure Cache for Redis using TLS 1.2 and Minimum TLS version on your cache settings is set to 1.2. |
38-
| Starting March 1, 2025 | Minimum TLS version for all cache instances is updated to 1.2. This means Azure Cache for Redis instances reject connections using TLS 1.0 or 1.1 at this point. |
39-
40-
> [!IMPORTANT]
41-
> The content in this article does not apply to Azure Cache for Redis Enterprise/Enterprise Flash because the Enterprise tiers only support TLS 1.2.
42-
>
35+
| March 31, 2025 | Ensure that all your applications are connecting to Azure Cache for Redis using TLS 1.2 and Minimum TLS version on your cache settings is set to 1.2. |
36+
| Starting April 1, 2025 | Minimum TLS version for all cache instances is updated to 1.2. This means Azure Cache for Redis instances *reject* connections using TLS 1.0 or 1.1 at this point. |
4337

4438
As part of this change, Azure Cache for Redis removes support for older cipher suites that aren't secure. Supported cipher suites are restricted to the following suites when the cache is configured with a minimum of TLS 1.2:
4539

@@ -50,9 +44,9 @@ The following sections provide guidance about how to detect dependencies on thes
5044

5145
## Check TLS versions supported by your Azure Cache for Redis
5246

53-
You can use this PowerShell script to verify the TLS versions supported by your Azure Cache for Redis endpoint. If your Redis instance is virtual network (VNet) injected, you have to run this script from a Virtual Machine in your VNet that has access to the Azure Cache for Redis endpoint.
47+
You can verify that **Minimum TLS version** value is set to TLS 1.2 in the [Advanced settings](cache-configure.md#advanced-settings) of your cache in the Azure portal. If it is any value other than TLS 1.2, then ensure you follow the instructions to [Configure your Azure Cache for Redis to use TLS 1.2](#configure-your-azure-cache-for-redis-to-use-tls-12). If the value is TLS 1.2, and your client application is able to connect without any errors, then no action is needed.
5448

55-
If the result shows `Tls Enabled` and/or `Tls 11 Enabled`, then ensure you follow the instructions to [Configure your Azure Cache for Redis to use TLS 1.2](#configure-your-azure-cache-for-redis-to-use-tls-12). If the result shows only `Tls12 Enabled` and your client application is able to connect without any errors, then no action is needed.
49+
You can also use this PowerShell script to verify the minimum TLS version supported by your Azure Cache for Redis endpoint. If your Redis instance is virtual network (VNet) injected, you have to run this script from a Virtual Machine in your VNet that has access to the Azure Cache for Redis endpoint. If the result shows `Tls Enabled` and/or `Tls 11 Enabled`, then ensure you follow the instructions to [Configure your Azure Cache for Redis to use TLS 1.2](#configure-your-azure-cache-for-redis-to-use-tls-12). If the result shows only `Tls12 Enabled` and your client application is able to connect without any errors, then no action is needed.
5650

5751
```powershell
5852
param(
@@ -123,7 +117,7 @@ You can also do the same using PowerShell. You need the Az.RedisCache module alr
123117
For setting the TLS version through CLI, the `--minimum-tls-version` is available only at Redis creation time and changing `minimum-tls-version` on an existing Redis instance isn't supported.
124118

125119
> [!NOTE]
126-
> The Azure Cache for Redis service should be available during the migration TLS 1.2 or later.
120+
> The Azure Cache for Redis service should be available during the migration to TLS 1.2 or later.
127121
128122
## Check whether your client application is already compliant
129123

articles/azure-cache-for-redis/cache-tutorial-semantic-cache.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: 'Tutorial: Use Azure Cache for Redis as a semantic cache'
33
description: In this tutorial, you learn how to use Azure Cache for Redis as a semantic cache.
44

55

6-
6+
ms.collection: ce-skilling-ai-copilot
77
ms.topic: tutorial
88
ms.date: 01/08/2024
99

articles/azure-cache-for-redis/cache-tutorial-vector-similarity.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ title: 'Tutorial: Conduct vector similarity search on Azure OpenAI embeddings us
33
description: In this tutorial, you learn how to use Azure Cache for Redis to store and search for vector embeddings.
44

55

6-
6+
ms.collection: ce-skilling-ai-copilot
77
ms.topic: tutorial
88
ms.custom:
99
- ignite-2024
1010
ms.date: 09/15/2023
1111

12-
#CustomerIntent: As a < type of user >, I want < what? > so that < why? >.
12+
#CustomerIntent: As a developer, I want to develop some code using a sample so that I see an example of a vector similarity with an AI-based large language model.
1313
---
1414

1515
# Tutorial: Conduct vector similarity search on Azure OpenAI embeddings using Azure Cache for Redis
@@ -40,8 +40,7 @@ In this tutorial, you learn how to:
4040
## Prerequisites
4141

4242
* An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services?azure-portal=true)
43-
* Access granted to Azure OpenAI in the desired Azure subscription
44-
Currently, you must apply for access to Azure OpenAI. You can apply for access to Azure OpenAI by completing the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>.
43+
* Access granted to Azure OpenAI in the desired Azure subscription. Currently, you must apply for access to Azure OpenAI. You can apply for access to Azure OpenAI by completing the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>.
4544
* <a href="https://www.python.org/" target="_blank">Python 3.8 or later version</a>
4645
* [Jupyter Notebooks](https://jupyter.org/) (optional)
4746
* An Azure OpenAI resource with the **text-embedding-ada-002 (Version 2)** model deployed. This model is currently only available in [certain regions](/azure/ai-services/openai/concepts/models#model-summary-table-and-region-availability). See the [resource deployment guide](/azure/ai-services/openai/how-to/create-resource) for instructions on how to deploy the model.
@@ -134,7 +133,7 @@ Next, you'll read the csv file into a pandas DataFrame.
134133
```
135134

136135
1. Execute code cell 3. You should see the following output:
137-
136+
138137
:::image type="content" source="media/cache-tutorial-vector-similarity/code-cell-3.png" alt-text="Screenshot of results from executing code cell 3, displaying eight columns and a sampling of 10 rows of data." lightbox="media/cache-tutorial-vector-similarity/code-cell-3.png":::
139138

140139
1. Next, process the data by adding an `id` index, removing spaces from the column titles, and filters the movies to take only movies made after 1970 and from English speaking countries or regions. This filtering step reduces the number of movies in the dataset, which lowers the cost and time required to generate embeddings. You're free to change or remove the filter parameters based on your preferences.

articles/azure-compute-fleet/attribute-based-vm-selection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ The following list of VM attributes are supported and provide examples of config
236236

237237
- Optional
238238
- The `acceleratorManufacturers` is specified as a list
239-
- Valid values are *AMD*, *Nvidia*, and *Xilinx*
239+
- Valid values are *AMD*, *NVIDIA*, and *Xilinx*
240240
- `acceleratorSupport` should be set to *Included* or *Required* to use this VM attribute
241241
- If `acceleratorSupport` is set to *Excluded*, this VM attribute can't be used
242242
- The default for `acceleratorManufacturers`, if not specified, is *ANY* of the valid values

articles/azure-maps/map-show-traffic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ There are two different traffic controls that can be added to the map. The first
5959
The following code shows how to add the traffic controls to the map.
6060

6161
```JavaScript
62-
//Att the traffic control toogle button to the top right corner of the map.
62+
//Att the traffic control toggle button to the top right corner of the map.
6363
map.controls.add(new atlas.control.TrafficControl(), { position: 'top-right' });
6464

6565
//Att the traffic legend control to the bottom left corner of the map.

0 commit comments

Comments
 (0)