Skip to content

Commit 4e9080a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ingress-legacy
2 parents 761d115 + 9e1cef4 commit 4e9080a

File tree

25 files changed

+353
-281
lines changed

25 files changed

+353
-281
lines changed

articles/ai-services/openai/how-to/embeddings.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ Our embedding models may be unreliable or pose social risks in certain cases, an
140140
* Store your embeddings and perform vector (similarity) search using your choice of Azure service:
141141
* [Azure AI Search](../../../search/vector-search-overview.md)
142142
* [Azure Cosmos DB for MongoDB vCore](../../../cosmos-db/mongodb/vcore/vector-search.md)
143+
* [Azure SQL Database](/azure/azure-sql/database/ai-artificial-intelligence-intelligent-applications?view=azuresql&preserve-view=true#vector-search)
143144
* [Azure Cosmos DB for NoSQL](../../../cosmos-db/vector-search.md)
144145
* [Azure Cosmos DB for PostgreSQL](../../../cosmos-db/postgresql/howto-use-pgvector.md)
145146
* [Azure Database for PostgreSQL - Flexible Server](../../../postgresql/flexible-server/how-to-use-pgvector.md)

articles/ai-studio/includes/evaluations/from-data/python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ For the supported scenarios mentioned previously, we provide default metrics by
128128
| Question Answering | `qa` | `gpt_groundedness` (requires context), `gpt_relevance` (requires context), `gpt_coherence` | `gpt_groundedness`, `gpt_relevance`, `gpt_coherence`, `gpt_fluency`, `gpt_similarity`, `f1_score`, `exact_match`, `ada_similarity` |
129129
| Single and multi-turn conversation (context required) | `chat` | `gpt_groundedness`, `gpt_relevance`, `gpt_retrieval_score` |`gpt_groundedness`, `gpt_relevance`, `gpt_retrieval_score` |
130130

131-
### Set up your Azure Open AI configurations for AI-assisted metrics
131+
### Set up your Azure OpenAI configurations for AI-assisted metrics
132132

133133
Before you call the `evaluate()` function, your environment needs to set up your large language model deployment configuration that's required for generating the AI-assisted metrics.
134134

articles/aks/azure-netapp-files-dual-protocol.md

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

articles/aks/manage-ssh-node-access.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ AKS supports the following configuration options to manage SSH keys on cluster n
4242
4343
### Register the `DisableSSHPreview` feature flag
4444
45+
To use the **Disable** SSH feature, perform the following steps to register and enable it in your subscription.
46+
4547
1. Register the `DisableSSHPreview` feature flag using the [`az feature register`][az-feature-register] command.
4648
4749
```azurecli-interactive

articles/app-service/includes/tutorial-connect-msi-azure-database/code-postgres-mi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ For more information, see the following resources:
9595

9696
# Uncomment the following lines according to the authentication type.
9797
# For system-assigned identity.
98-
# credential = DefaultAzureCredential()
98+
# cred = DefaultAzureCredential()
9999

100100
# For user-assigned identity.
101101
# managed_identity_client_id = os.getenv('AZURE_POSTGRESQL_CLIENTID')
@@ -155,4 +155,4 @@ For more information, see the following resources:
155155

156156
-----
157157

158-
For more code samples, see [Create a passwordless connection to a database service via Service Connector](/azure/service-connector/tutorial-passwordless?tabs=user%2Cappservice&pivots=postgresql#connect-to-a-database-with-microsoft-entra-authentication).
158+
For more code samples, see [Create a passwordless connection to a database service via Service Connector](/azure/service-connector/tutorial-passwordless?tabs=user%2Cappservice&pivots=postgresql#connect-to-a-database-with-microsoft-entra-authentication).

articles/azure-cache-for-redis/cache-best-practices-kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ If your Azure Cache for Redis client application runs on a Linux-based container
3131

3232
## Potential connection collision with _Istio/Envoy_
3333

34-
Currently, Azure Cache for Redis uses ports 15000-15019 for clustered caches to expose cluster nodes to client applications. As documented [here](https://istio.io/latest/docs/ops/deployment/requirements/#ports-used-by-istio), the same ports are also used by _Istio.io_ sidecar proxy called _Envoy_ and could interfere with creating connections, especially on port 15006.
34+
Currently, Azure Cache for Redis uses ports 15xxx for clustered caches to expose cluster nodes to client applications. As documented [here](https://istio.io/latest/docs/ops/deployment/requirements/#ports-used-by-istio), the same ports are also used by _Istio.io_ sidecar proxy called _Envoy_ and could interfere with creating connections, especially on port 15001 and 15006.
3535

3636
When using _Istio_ with an Azure Cache for Redis cluster, consider excluding the potential collision ports with an [istio annotation](https://istio.io/latest/docs/reference/config/annotations/).
3737

articles/azure-cache-for-redis/cache-how-to-monitor.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ In contrast, for clustered caches, we recommend using the metrics with the suffi
167167
- **Export** – when there's an issue related to Export RDB
168168
- **AADAuthenticationFailure** (preview) - when there's an authentication failure using Microsoft Entra access token
169169
- **AADTokenExpired** (preview) - when a Microsoft Entra access token used for authentication isn't renewed and it expires.
170+
> [!NOTE]
171+
> Metrics for errors aren't available when using the Enterprise Tiers.
172+
170173
- Evicted Keys
171174
- The number of items evicted from the cache during the specified reporting interval because of the `maxmemory` limit.
172175
- This number maps to `evicted_keys` from the Redis INFO command.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 01/08/2024
1212

1313
# Tutorial: Use Azure Cache for Redis as a semantic cache
1414

15-
In this tutorial, you use Azure Cache for Redis as a semantic cache with an AI-based large language model (LLM). You use Azure Open AI Service to generate LLM responses to queries and cache those responses using Azure Cache for Redis, delivering faster responses and lowering costs.
15+
In this tutorial, you use Azure Cache for Redis as a semantic cache with an AI-based large language model (LLM). You use Azure OpenAI Service to generate LLM responses to queries and cache those responses using Azure Cache for Redis, delivering faster responses and lowering costs.
1616

1717
Because Azure Cache for Redis offers built-in vector search capability, you can also perform _semantic caching_. You can return cached responses for identical queries and also for queries that are similar in meaning, even if the text isn't the same.
1818

@@ -78,7 +78,7 @@ See [Deploy a model](/azure/ai-services/openai/how-to/create-resource?pivots=web
7878

7979
To successfully make a call against Azure OpenAI, you need an **endpoint** and a **key**. You also need an **endpoint** and a **key** to connect to Azure Cache for Redis.
8080

81-
1. Go to your Azure Open AI resource in the Azure portal.
81+
1. Go to your Azure OpenAI resource in the Azure portal.
8282

8383
1. Locate **Endpoint and Keys** in the **Resource Management** section of your Azure OpenAI resource. Copy your endpoint and access key because you need both for authenticating your API calls. An example endpoint is: `https://docs-test-001.openai.azure.com`. You can use either `KEY1` or `KEY2`.
8484

articles/azure-functions/create-first-function-cli-node.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Create a JavaScript function from the command line - Azure Functions
33
description: Learn how to create a JavaScript function from the command line, then publish the local Node.js project to serverless hosting in Azure Functions.
4-
ms.date: 12/15/2023
4+
ms.date: 02/26/2024
55
ms.topic: quickstart
66
ms.devlang: javascript
77
ms.custom: devx-track-azurecli, devx-track-azurepowershell, mode-api, devx-track-js
@@ -50,19 +50,20 @@ In Azure Functions, a function project is a container for one or more individual
5050

5151
::: zone pivot="nodejs-model-v3"
5252
1. In a suitable folder, run the [`func init`](functions-core-tools-reference.md#func-init) command, as follows, to create a JavaScript Node.js v3 project in the current folder:
53-
53+
5454
```console
5555
func init --javascript --model V3
5656
```
57+
5758
This folder now contains various files for the project, including configurations files named [local.settings.json](functions-develop-local.md#local-settings-file) and [host.json](functions-host-json.md). Because *local.settings.json* can contain secrets downloaded from Azure, the file is excluded from source control by default in the *.gitignore* file.
5859

5960
1. Add a function to your project by using the following command, where the `--name` argument is the unique name of your function (HttpExample) and the `--template` argument specifies the function's trigger (HTTP).
60-
61+
6162
```console
6263
func new --name HttpExample --template "HTTP trigger" --authlevel "anonymous"
6364
```
64-
65-
[`func new`](functions-core-tools-reference.md#func-new) creates a subfolder matching the function name that contains a code file appropriate to the project's chosen language and a configuration file named *function.json*.
65+
66+
The [`func new`](functions-core-tools-reference.md#func-new) command creates a subfolder matching the function name that contains a code file appropriate to the project's chosen language and a configuration file named *function.json*.
6667

6768
You may find the [Azure Functions Core Tools reference](functions-core-tools-reference.md) helpful.
6869

articles/azure-monitor/agents/agents-overview.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,9 @@ The Azure Monitoring Agent for Linux now officially supports various hardening s
258258
Currently supported hardening standards:
259259
- SELinux
260260
- CIS Lvl 1 and 2<sup>1</sup>
261-
262-
On the roadmap
263261
- STIG
264262
- FIPs
263+
- FedRamp
265264

266265
| Operating system | Azure Monitor agent <sup>1</sup> | Log Analytics agent (legacy) <sup>1</sup> | Diagnostics extension <sup>2</sup>|
267266
|:---|:---:|:---:|:---:|

0 commit comments

Comments
 (0)