Skip to content

Commit 8ec0c09

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents f992be8 + 5ee5529 commit 8ec0c09

File tree

59 files changed

+838
-277
lines changed

Some content is hidden

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

59 files changed

+838
-277
lines changed

articles/azure-functions/functions-bindings-kafka-output.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Apache Kafka output binding for Azure Functions
33
description: Use Azure Functions to write messages to an Apache Kafka stream.
44
ms.topic: reference
55
ms.custom: devx-track-extended-java, devx-track-js, devx-track-python
6-
ms.date: 05/14/2022
6+
ms.date: 06/14/2024
77
zone_pivot_groups: programming-languages-set-functions-lang-workers
88
---
99

@@ -37,51 +37,51 @@ The attributes you use depend on the specific event provider.
3737

3838
The following example shows a C# function that sends a single message to a Kafka topic, using data provided in HTTP GET request.
3939

40-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet/Confluent/KafkaOutput.cs" range="12-32" :::
40+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet/Confluent/KafkaOutput.cs" range="12-32" :::
4141

4242
To send events in a batch, use an array of `KafkaEventData` objects, as shown in the following example:
4343

44-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet/Confluent/KafkaOutputMany.cs" range="12-30" :::
44+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet/Confluent/KafkaOutputMany.cs" range="12-30" :::
4545

4646
The following function adds headers to the Kafka output data:
4747

48-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet/Confluent/KafkaOutputWithHeaders.cs" range="11-31" :::
48+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet/Confluent/KafkaOutputWithHeaders.cs" range="11-31" :::
4949

5050
For a complete set of working .NET examples, see the [Kafka extension repository](https://github.com/Azure/azure-functions-kafka-extension/blob/dev/samples/dotnet/Confluent/).
5151

5252
# [Event Hubs](#tab/event-hubs/in-process)
5353

5454
The following example shows a C# function that sends a single message to a Kafka topic, using data provided in HTTP GET request.
5555

56-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet/EventHub/KafkaOutput.cs" range="11-31" :::
56+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet/EventHub/KafkaOutput.cs" range="11-31" :::
5757

5858
To send events in a batch, use an array of `KafkaEventData` objects, as shown in the following example:
5959

60-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet/EventHub/KafkaOutputMany.cs" range="12-30" :::
60+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet/EventHub/KafkaOutputMany.cs" range="12-30" :::
6161

6262
The following function adds headers to the Kafka output data:
6363

64-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet/EventHub/KafkaOutputWithHeaders.cs" range="11-31" :::
64+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet/EventHub/KafkaOutputWithHeaders.cs" range="11-31" :::
6565

6666
For a complete set of working .NET examples, see the [Kafka extension repository](https://github.com/Azure/azure-functions-kafka-extension/blob/dev/samples/dotnet/EventHub).
6767

6868
# [Confluent](#tab/confluent/isolated-process)
6969

7070
The following example has a custom return type that is `MultipleOutputType`, which consists of an HTTP response and a Kafka output.
7171

72-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/confluent/KafkaOutput.cs" range="11-31" :::
72+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/confluent/KafkaOutput.cs" range="11-31" :::
7373

7474
In the class `MultipleOutputType`, `Kevent` is the output binding variable for the Kafka binding.
7575

76-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/confluent/KafkaOutput.cs" range="34-46" :::
76+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/confluent/KafkaOutput.cs" range="34-46" :::
7777

7878
To send a batch of events, pass a string array to the output type, as shown in the following example:
7979

80-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/confluent/KafkaOutputMany.cs" range="11-30" :::
80+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/confluent/KafkaOutputMany.cs" range="11-30" :::
8181

8282
The string array is defined as `Kevents` property on the class, on which the output binding is defined:
8383

84-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/confluent/KafkaOutputMany.cs" range="33-45" :::
84+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/confluent/KafkaOutputMany.cs" range="33-45" :::
8585

8686
The following function adds headers to the Kafka output data:
8787

@@ -94,19 +94,19 @@ For a complete set of working .NET examples, see the [Kafka extension repository
9494

9595
The following example has a custom return type that is `MultipleOutputType`, which consists of an HTTP response and a Kafka output.
9696

97-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/eventhub/KafkaOutput.cs" range="11-31" :::
97+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/eventhub/KafkaOutput.cs" range="11-31" :::
9898

9999
In the class `MultipleOutputType`, `Kevent` is the output binding variable for the Kafka binding.
100100

101-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/eventhub/KafkaOutput.cs" range="34-46" :::
101+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/eventhub/KafkaOutput.cs" range="34-46" :::
102102

103103
To send a batch of events, pass a string array to the output type, as shown in the following example:
104104

105-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/eventhub/KafkaOutputMany.cs" range="11-30" :::
105+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/eventhub/KafkaOutputMany.cs" range="11-30" :::
106106

107107
The string array is defined as `Kevents` property on the class, on which the output binding is defined:
108108

109-
:::code language="json" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/eventhub/KafkaOutputMany.cs" range="33-45" :::
109+
:::code language="csharp" source="~/azure-functions-kafka-extension/samples/dotnet-isolated/eventhub/KafkaOutputMany.cs" range="33-45" :::
110110

111111
The following function adds headers to the Kafka output data:
112112

articles/azure-functions/functions-bindings-openai-textcompletion-input.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ The code simply returns the text from the completion API as the response:
6868
::: zone pivot="programming-language-python"
6969
This example demonstrates the _templating_ pattern, where the HTTP trigger function takes a `name` parameter and embeds it into a text prompt, which is then sent to the Azure OpenAI completions API by the extension. The response to the prompt is returned in the HTTP response.
7070

71-
:::code language="java" source="~/functions-openai-extension/samples/textcompletion/python/function_app.py" range="7-11" :::
71+
:::code language="python" source="~/functions-openai-extension/samples/textcompletion/python/function_app.py" range="7-11" :::
7272

7373
This example takes a prompt as input, sends it directly to the completions API, and returns the response as the output.
7474

75-
:::code language="csharp" source="~/functions-openai-extension/samples/textcompletion/python/function_app.py" range="14-18" :::
75+
:::code language="python" source="~/functions-openai-extension/samples/textcompletion/python/function_app.py" range="14-18" :::
7676

7777
::: zone-end
7878
<!--- End code examples section -->

articles/reliability/reliability-fabric.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Fabric makes commercially reasonable efforts to provide availability zone suppor
4141
|:---------------------|:---------------------------------------------------------------------:|:---------------------------------------------------------------------:|:---------------------------------------------------------------------:|:---------------------------------------------------------------------:|:---------------------------------------------------------------------:|
4242
| Brazil South | :::image type="icon" source="media/yes-icon.svg" border="false"::: | | :::image type="icon" source="media/yes-icon.svg" border="false"::: | :::image type="icon" source="media/yes-icon.svg" border="false"::: |:::image type="icon" source="media/yes-icon.svg" border="false"::: |
4343
| Canada Central | :::image type="icon" source="media/yes-icon.svg" border="false"::: | | | :::image type="icon" source="media/yes-icon.svg" border="false"::: |:::image type="icon" source="media/yes-icon.svg" border="false"::: |
44-
| Central US | :::image type="icon" source="media/yes-icon.svg" border="false"::: | | | |:::image type="icon" source="media/yes-icon.svg" border="false"::: |
44+
| Central US | :::image type="icon" source="media/yes-icon.svg" border="false"::: | | | | |
4545
| East US | :::image type="icon" source="media/yes-icon.svg" border="false"::: | :::image type="icon" source="media/yes-icon.svg" border="false"::: | :::image type="icon" source="media/yes-icon.svg" border="false"::: | :::image type="icon" source="media/yes-icon.svg" border="false"::: |:::image type="icon" source="media/yes-icon.svg" border="false"::: |
4646
| East US 2 | :::image type="icon" source="media/yes-icon.svg" border="false"::: | :::image type="icon" source="media/yes-icon.svg" border="false"::: |:::image type="icon" source="media/yes-icon.svg" border="false":::| :::image type="icon" source="media/yes-icon.svg" border="false"::: |:::image type="icon" source="media/yes-icon.svg" border="false"::: |
4747
| South Central US | :::image type="icon" source="media/yes-icon.svg" border="false"::: | | | |:::image type="icon" source="media/yes-icon.svg" border="false"::: |

articles/search/search-get-started-portal-image-search.md

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Quickstart image search
33
titleSuffix: Azure AI Search
4-
description: Index and query images on Azure AI Search using the Azure portal. Run the Import and vectorize data wizard to vectorize images. Use Search Explorer to query images.
4+
description: Search for images on Azure AI Search index using the Azure portal. Run the Import and vectorize data wizard to vectorize images, then use Search Explorer to provide an image as your query input.
55

66
author: HeidiSteen
77
ms.author: heidist
@@ -100,13 +100,14 @@ Azure AI Vision provides text embeddings, so we'll use that resource for text ve
100100

101101
Use Azure AI Vision to generate a vector representation of the image files.
102102

103-
In this step, you can also apply AI to extract text from images. The wizard uses OCR from Azure AI services to recognize text in image files. Two more outputs appear in the index when OCR is added to the workflow:
103+
In this step, you can also apply AI to extract text from images. The wizard uses OCR from Azure AI services to recognize text in image files.
104104

105-
+ First, the "chunk" field is populated with the OCR-generated string.
105+
Two more outputs appear in the index when OCR is added to the workflow:
106106

107-
+ Second, the "text_vector" field is populated with an embedding that represents the string.
107+
+ First, the "chunk" field is populated with an OCR-generated string of any text found in the image.
108+
+ Second, the "text_vector" field is populated with an embedding that represents the "chunk" string.
108109

109-
The inclusion of plain text in an index is useful if you want to use relevance features that operate on strings, such as semantic ranking and scoring profiles.
110+
The inclusion of plain text in the "chunk" field is useful if you want to use relevance features that operate on strings, such as [semantic ranking](semantic-search-overview.md) and [scoring profiles](index-add-scoring-profiles.md).
110111

111112
1. On the **Vectorize your images** page, select the **Vectorize images** checkbox, and then select **AI Vision vectorization**.
112113

@@ -136,27 +137,23 @@ The inclusion of plain text in an index is useful if you want to use relevance f
136137

137138
1. Select **Create** to run the wizard. This step creates the following objects:
138139

139-
+ Data source connection to blob storage.
140+
+ An indexer that drives the indexing pipeline.
140141

141-
+ Index with vector fields, text fields, vectorizers, vector profiles, vector algorithms. You can't modify the default index during the wizard workflow. Indexes conform to the [2024-05-01-preview REST API](/rest/api/searchservice/indexes/create-or-update?view=rest-searchservice-2024-05-01-preview&preserve-view=true).
142+
+ A data source connection to blob storage.
142143

143-
+ Skillset with the following five skills:
144+
+ An index with vector fields, text fields, vectorizers, vector profiles, vector algorithms. You can't modify the default index during the wizard workflow. Indexes conform to the [2024-05-01-preview REST API](/rest/api/searchservice/indexes/create-or-update?view=rest-searchservice-2024-05-01-preview&preserve-view=true).
144145

145-
+ [OCR skill](cognitive-search-skill-ocr.md) recognizes text in image files.
146+
+ A skillset with the following five skills:
146147

148+
+ [OCR skill](cognitive-search-skill-ocr.md) recognizes text in image files.
147149
+ [Text Merger skill](cognitive-search-skill-textmerger.md) unifies the various outputs of OCR processing.
148-
149150
+ [Text Split skill](cognitive-search-skill-textsplit.md) adds data chunking. This skill is built into the wizard workflow.
150-
151151
+ [Azure AI Vision multimodal](cognitive-search-skill-vision-vectorize.md) is used to vectorize text generated from OCR.
152-
153152
+ [Azure AI Vision multimodal](cognitive-search-skill-vision-vectorize.md) is called again to vectorize images.
154153

155-
+ Indexer with field mappings and output field mappings.
156-
157154
## Check results
158155

159-
Search explorer accepts text, vectors, and images as query inputs. You can drag or select an image into the search area, and it will be vectorized for search. Image vectorization assumes that your index has a vectorizer definition, which **Import and vectorize data** creates from your inputs.
156+
Search Explorer accepts text, vectors, and images as query inputs. You can drag or select an image into the search area. Search Explorer vectorizes your image and sends the vector as a query input to the search engine. Image vectorization assumes that your index has a vectorizer definition, which **Import and vectorize data** creates based on your embedding model inputs.
160157

161158
1. In the Azure portal, under **Search Management** and **Indexes**, select the index your created. An embedded Search Explorer is the first tab.
162159

@@ -170,11 +167,11 @@ Search explorer accepts text, vectors, and images as query inputs. You can drag
170167

171168
:::image type="content" source="media/search-get-started-portal-images/image-search.png" alt-text="Screenshot of search results.":::
172169

173-
The top match should be the image you searched for. Because a vector search matches on similar vectors, the search engine returns any document that is sufficiently similar to the query input. You can switch to JSON view for more advanced queries that include relevance tuning.
170+
The top match should be the image you searched for. Because a [vector search](vector-search-overview.md) matches on similar vectors, the search engine returns any document that is sufficiently similar to the query input, up to *k*-number of results. You can switch to JSON view for more advanced queries that include relevance tuning.
174171

175172
1. Try other query options to compare search outcomes:
176173

177-
+ Hide vectors for more readable results.
174+
+ Hide vectors for more readable results (recommended).
178175
+ Select a vector field to query over. The default is text vectors, but you can specify the image vector to exclude text vectors from query execution.
179176

180177
## Clean up

articles/search/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ms.custom:
2323

2424
| Item&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | Type | Description |
2525
|-----------------------------|------|--------------|
26-
| [Image search in the Azure portal](search-get-started-portal-image-search.md) | Feature | Search explorer now supports image search. In a vector index that has vectorized image content, you can drop images into Search Explorer to query for matching image content.
26+
| [Image search in the Azure portal](search-get-started-portal-image-search.md) | Feature | Search explorer now supports image search. In a vector index that has vectorized image content, you can drop images into Search Explorer to query for a match.
2727

2828
## May 2024
2929

articles/storage/.openpublishing.redirection.storage.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
22
"redirections": [
3-
{
4-
"source_path_from_root": "/articles/storage/common/storage-failover-customer-managed-planned.md",
5-
"redirect_url": "/articles/storage/common/storage-failover-customer-managed-unplanned",
6-
"redirect_document_id": false
7-
},
83
{
94
"source_path_from_root": "/articles/storage/common/azure-defender-storage-configure.md",
105
"redirect_url": "/azure/defender-for-cloud/defender-for-storage-introduction",

articles/storage/blobs/TOC.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,9 @@ items:
450450
items:
451451
- name: Disaster recovery planning and failover
452452
href: ../common/storage-disaster-recovery-guidance.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
453-
- name: How customer-managed failover works
453+
- name: How customer-managed planned failover (preview) works
454+
href: ../common/storage-failover-customer-managed-planned.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
455+
- name: How customer-managed (unplanned) failover works
454456
href: ../common/storage-failover-customer-managed-unplanned.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
455457
- name: Initiate account failover
456458
href: ../common/storage-initiate-account-failover.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json

0 commit comments

Comments
 (0)