Skip to content

Commit 69cf9f8

Browse files
Merge pull request #276633 from aahill/revert-276613-revert-270413-3-20-region-update
new authentication section
2 parents 6aa26d4 + fde8e5b commit 69cf9f8

File tree

4 files changed

+32
-2
lines changed

4 files changed

+32
-2
lines changed

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ You might want to consider using an Azure AI Search index when you either want t
7878
* Reuse an index created before by ingesting data from other data sources.
7979

8080
> [!NOTE]
81-
> To use an existing index, it must have at least one searchable field.
81+
> * To use an existing index, it must have at least one searchable field.
82+
> * Set the CORS **Allow Origin Type** option to `all` and the **Allowed origins** option to `*`.
83+
8284

8385
### Search types
8486

@@ -135,6 +137,7 @@ If you want to implement additional value-based criteria for query execution, yo
135137

136138
[!INCLUDE [ai-search-ingestion](../includes/ai-search-ingestion.md)]
137139

140+
[!INCLUDE [authentication](../includes/on-your-data-authentication.md)]
138141

139142
# [Vector Database in Azure Cosmos DB for MongoDB](#tab/mongo-db)
140143

@@ -202,6 +205,8 @@ To modify the schedule, you can use the [Azure portal](https://portal.azure.com/
202205

203206
[!INCLUDE [ai-search-ingestion](../includes/ai-search-ingestion.md)]
204207

208+
[!INCLUDE [authentication](../includes/on-your-data-authentication.md)]
209+
205210
# [Upload files (preview)](#tab/file-upload)
206211

207212
Using Azure OpenAI Studio, you can upload files from your machine to try Azure OpenAI On Your Data. You also have the option to create a new Azure Blob Storage account and Azure AI Search resource. The service then stores the files to an Azure storage container and performs ingestion from the container. You can use the [quickstart](../use-your-data-quickstart.md) article to learn how to use this data source option.
@@ -210,6 +215,8 @@ Using Azure OpenAI Studio, you can upload files from your machine to try Azure O
210215

211216
[!INCLUDE [ai-search-ingestion](../includes/ai-search-ingestion.md)]
212217

218+
[!INCLUDE [authentication](../includes/on-your-data-authentication.md)]
219+
213220
# [URL/Web address (preview)](#tab/web-pages)
214221

215222
You can paste URLs and the service will store the webpage content, using it when generating responses from the model. The content in URLs/web addresses that you use need to have the following characteristics to be properly ingested:
@@ -224,6 +231,10 @@ You can paste URLs and the service will store the webpage content, using it when
224231

225232
Once you have added the URL/web address for data ingestion, the web pages from your URL are fetched and saved to Azure Blob Storage with a container name: `webpage-<index name>`. Each URL will be saved into a different container within the account. Then the files are indexed into an Azure AI Search index, which is used for retrieval when you’re chatting with the model.
226233

234+
[!INCLUDE [ai-search-ingestion](../includes/ai-search-ingestion.md)]
235+
236+
[!INCLUDE [authentication](../includes/on-your-data-authentication.md)]
237+
227238
# [Elasticsearch (preview)](#tab/elasticsearch)
228239

229240
You can connect to your [Elasticsearch vector database](https://www.elastic.co/guide/en/elasticsearch/reference/current/elasticsearch-intro.html) and chat with your data.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
manager: nitinme
3+
author: aahill
4+
ms.author: aahi
5+
ms.service: azure-ai-openai
6+
ms.topic: include
7+
ms.date: 03/27/2024
8+
---
9+
10+
## Data connection
11+
12+
You need to select how you want to authenticate the connection from Azure OpenAI, Azure AI Search, and Azure blob storage. You can choose a *System assigned managed identity* or an *API key*. By selecting *API key* as the authentication type, the system will automatically populate the API key for you to connect with your Azure AI Search resource. By selecting *System assigned managed identity*, the authentication will be based on the [role assignment](../how-to/use-your-data-securely.md#role-assignments) you have. *System assigned managed identity* is selected by default for security.
13+
14+
15+
:::image type="content" source="../media/use-your-data/data-connection-authentication.png" alt-text="A screenshot showing the managed identity option in Azure OpenAI Studio." lightbox="../media/use-your-data/data-connection-authentication.png":::
16+
17+
Once you select the **next** button, it will automatically validate your setup to use the selected authentication method. If you encounter an error, see the [role assignments article](../how-to/use-your-data-securely.md#role-assignments) to update your setup.
18+
19+
Once you have fixed the setup, select **next** again to validate and proceed. API users can also [configure authentication](../references/azure-search.md#api-key-authentication-options) with assigned managed identity and API keys.
20+
50.2 KB
Loading

articles/ai-services/openai/references/azure-search.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ The configurable options of Azure AI Search when using Azure OpenAI On Your Data
4141
| `allow_partial_result` | integer | False | If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail. If not specified, or specified as false, the request will fail if any search query fails. |
4242
| `include_contexts` | array | False | The included properties of the output context. If not specified, the default value is `citations` and `intent`. Values can be `citations`,`intent`, `all_retrieved_documents`.|
4343

44-
4544
## API key authentication options
4645

4746
The authentication options for Azure OpenAI On Your Data when using an API key.

0 commit comments

Comments
 (0)