Skip to content

Commit 49730c9

Browse files
committed
Merge branch 'main' into release-arc-data
2 parents a205e52 + 909886b commit 49730c9

File tree

215 files changed

+14187
-1646
lines changed

Some content is hidden

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

215 files changed

+14187
-1646
lines changed

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -920,6 +920,21 @@
920920
"redirect_url": "/azure/defender-for-cloud/multicloud",
921921
"redirect_document_id": false
922922
},
923+
{
924+
"source_path_from_root": "/articles/defender-for-cloud/concept-aws-connector.md",
925+
"redirect_url": "/azure/defender-for-cloud/quickstart-onboard-aws",
926+
"redirect_document_id": false
927+
},
928+
{
929+
"source_path_from_root": "/articles/defender-for-cloud/concept-gcp-connector.md",
930+
"redirect_url": "/azure/defender-for-cloud/quickstart-onboard-gcp",
931+
"redirect_document_id": false
932+
},
933+
{
934+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-vulnerability-assessment-elastic.md",
935+
"redirect_url": "/azure/defender-for-cloud/agentless-vulnerability-assessment-aws",
936+
"redirect_document_id": true
937+
},
923938
{
924939
"source_path_from_root": "/articles/defender-for-cloud/how-to-migrate-to-built-in.md",
925940
"redirect_url": "/azure/defender-for-cloud/how-to-transition-to-built-in",

articles/ai-services/cognitive-services-virtual-networks.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: azure-ai-services
99
ms.custom: devx-track-azurepowershell, devx-track-azurecli
1010
ms.topic: how-to
11-
ms.date: 10/27/2023
11+
ms.date: 02/13/2024
1212
ms.author: aahi
1313
---
1414

@@ -596,6 +596,9 @@ curl -i -X PATCH https://management.azure.com$rid?api-version=2023-10-01-preview
596596

597597
To revoke the exception, set `networkAcls.bypass` to `None`.
598598

599+
> [!NOTE]
600+
> The trusted service feature is only available using the command line described above, and cannot be done using the Azure portal.
601+
599602
### Pricing
600603

601604
For pricing details, see [Azure Private Link pricing](https://azure.microsoft.com/pricing/details/private-link).

articles/ai-services/content-safety/includes/quickstarts/csharp-quickstart-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.date: 07/04/2023
1111
ms.author: pafarley
1212
---
1313

14-
[Reference documentation](/dotnet/api/overview/azure/ai.contentsafety-readme?view=azure-dotnet) | [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/contentsafety/Azure.AI.ContentSafety) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.ContentSafety) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/dotnet/1.0.0)
14+
[Reference documentation](/dotnet/api/overview/azure/ai.contentsafety-readme) | [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/contentsafety/Azure.AI.ContentSafety) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.ContentSafety) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/dotnet/1.0.0)
1515

1616
## Prerequisites
1717

articles/ai-services/content-safety/includes/quickstarts/csharp-quickstart-text.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.date: 07/04/2023
1111
ms.author: pafarley
1212
---
1313

14-
[Reference documentation](/dotnet/api/overview/azure/ai.contentsafety-readme?view=azure-dotnet) | [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/contentsafety/Azure.AI.ContentSafety) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.ContentSafety) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/dotnet/1.0.0)
14+
[Reference documentation](/dotnet/api/overview/azure/ai.contentsafety-readme) | [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/contentsafety/Azure.AI.ContentSafety) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.ContentSafety) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/dotnet/1.0.0)
1515

1616
## Prerequisites
1717

articles/ai-services/content-safety/includes/quickstarts/python-quickstart-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.author: pafarley
1919
* An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services/)
2020
* Once you have your Azure subscription, <a href="https://aka.ms/acs-create" title="Create a Content Safety resource" target="_blank">create a Content Safety resource </a> in the Azure portal to get your key and endpoint. Enter a unique name for your resource, select the subscription you entered on the application form, select a resource group, supported region, and supported pricing tier. Then select **Create**.
2121
* The resource takes a few minutes to deploy. After it finishes, Select **go to resource**. In the left pane, under **Resource Management**, select **Subscription Key and Endpoint**. The endpoint and either of the keys are used to call APIs.
22-
* [Python 3.7 or later](https://www.python.org/)
22+
* [Python 3.8 or later](https://www.python.org/)
2323
* Your Python installation should include [pip](https://pip.pypa.io/en/stable/). You can check if you have pip installed by running `pip --version` on the command line. Get pip by installing the latest version of Python.
2424

2525
[!INCLUDE [Create environment variables](../env-vars.md)]

articles/ai-services/content-safety/whats-new.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ Learn what's new in the service. These items might be release notes, videos, blo
2222

2323
The Azure AI Content Safety service is now generally available through the following client library SDKs:
2424

25-
- **C#**: [Package](https://www.nuget.org/packages/Azure.AI.ContentSafety) | [API reference](/dotnet/api/overview/azure/ai.contentsafety-readme?view=azure-dotnet) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/dotnet/1.0.0) | Quickstarts: [Text](./quickstart-text.md), [Image](./quickstart-image.md)
26-
- **Python**: [Package](https://pypi.org/project/azure-ai-contentsafety/) | [API reference](/python/api/overview/azure/ai-contentsafety-readme?view=azure-python) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/python/1.0.0) | Quickstarts: [Text](./quickstart-text.md), [Image](./quickstart-image.md)
27-
- **Java**: [Package](https://oss.sonatype.org/#nexus-search;quick~contentsafety) | [API reference](/java/api/overview/azure/ai-contentsafety-readme?view=azure-java-stable) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/java/1.0.0) | Quickstarts: [Text](./quickstart-text.md), [Image](./quickstart-image.md)
25+
- **C#**: [Package](https://www.nuget.org/packages/Azure.AI.ContentSafety) | [API reference](/dotnet/api/overview/azure/ai.contentsafety-readme) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/dotnet/1.0.0) | Quickstarts: [Text](./quickstart-text.md), [Image](./quickstart-image.md)
26+
- **Python**: [Package](https://pypi.org/project/azure-ai-contentsafety/) | [API reference](/python/api/overview/azure/ai-contentsafety-readme) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/python/1.0.0) | Quickstarts: [Text](./quickstart-text.md), [Image](./quickstart-image.md)
27+
- **Java**: [Package](https://oss.sonatype.org/#nexus-search;quick~contentsafety) | [API reference](/java/api/overview/azure/ai-contentsafety-readme) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/java/1.0.0) | Quickstarts: [Text](./quickstart-text.md), [Image](./quickstart-image.md)
2828
- **JavaScript**: [Package](https://www.npmjs.com/package/@azure-rest/ai-content-safety?activeTab=readme) | [API reference](https://www.npmjs.com/package/@azure-rest/ai-content-safety/v/1.0.0) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/js/1.0.0) | Quickstarts: [Text](./quickstart-text.md), [Image](./quickstart-image.md)
2929

3030
> [!IMPORTANT]

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ When using the API, pass the `filter` parameter in each API request. For example
302302
## Schedule automatic index refreshes
303303

304304
> [!NOTE]
305-
> Automatic index refreshing is supported for Azure Blob storage only.
305+
> * Automatic index refreshing is supported for Azure Blob storage only.
306+
> * If a document is deleted from input blob container, the corresponding chunk index records won't be removed by the scheduled refresh.
306307
307308
To keep your Azure AI Search index up-to-date with your latest data, you can schedule a refresh for it that runs automatically rather than manually updating it every time your data is updated. Automatic index refresh is only available when you choose **blob storage** as the data source. To enable an automatic index refresh:
308309

@@ -311,7 +312,7 @@ To keep your Azure AI Search index up-to-date with your latest data, you can sch
311312

312313
:::image type="content" source="../media/use-your-data/indexer-schedule.png" alt-text="A screenshot of the indexer schedule in Azure OpenAI Studio." lightbox="../media/use-your-data/indexer-schedule.png":::
313314

314-
After the data ingestion is set to a cadence other than once, Azure AI Search indexers will be created with a schedule equivalent to `0.5 * the cadence specified`. This means that at the specified cadence, the indexers will pull the documents that were added, modified, or deleted from the storage container, reprocess and index them. This ensures that the updated data gets preprocessed and indexed in the final index at the desired cadence automatically. To update your data, you only need to upload the additional documents from the Azure portal. From the portal, select **Storage Account** > **Containers**. Select the name of the original container, then **Upload**. The index will pick up the files automatically after the scheduled refresh period. The intermediate assets created in the Azure AI Search resource will not be cleaned up after ingestion to allow for future runs. These assets are:
315+
After the data ingestion is set to a cadence other than once, Azure AI Search indexers will be created with a schedule equivalent to `0.5 * the cadence specified`. This means that at the specified cadence, the indexers will pull the documents that were added or modified from the storage container, reprocess and index them. This ensures that the updated data gets preprocessed and indexed in the final index at the desired cadence automatically. To update your data, you only need to upload the additional documents from the Azure portal. From the portal, select **Storage Account** > **Containers**. Select the name of the original container, then **Upload**. The index will pick up the files automatically after the scheduled refresh period. The intermediate assets created in the Azure AI Search resource will not be cleaned up after ingestion to allow for future runs. These assets are:
315316
- `{Index Name}-index`
316317
- `{Index Name}-indexer`
317318
- `{Index Name}-indexer-chunk`

articles/ai-services/openai/how-to/use-your-data-securely.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: azure-ai-openai
88
ms.topic: how-to
99
author: aahill
1010
ms.author: aahi
11-
ms.date: 01/19/2024
11+
ms.date: 02/13/2024
1212
recommendations: false
1313
---
1414

@@ -157,6 +157,8 @@ To allow access to your Azure AI Search resource from your client machines, like
157157
158158
:::image type="content" source="../media/use-your-data/approve-private-endpoint.png" alt-text="A screenshot showing private endpoint approval screen." lightbox="../media/use-your-data/approve-private-endpoint.png":::
159159

160+
The private endpoint resource is provisioned in a Microsoft managed tenant, while the linked resource is in your tenant. You can't access the private endpoint resource by just clicking the **private endpoint** link (in blue font) in the **Private access** tab of the **Networking page**. Instead, click elsewhere on the row, then the **Approve**` button above should be clickable.
161+
160162
Learn more about the [manual approval workflow](/azure/private-link/private-endpoint-overview#access-to-a-private-link-resource-using-approval-workflow).
161163

162164

@@ -168,6 +170,9 @@ To allow access to your Storage Account from Azure OpenAI and Azure AI Search, w
168170

169171
In the Azure portal, navigate to your storage account networking tab, choose "Selected networks", and then select **Allow Azure services on the trusted services list to access this storage account** and click Save.
170172

173+
> [!NOTE]
174+
> The trusted service feature is only available using the command line described above, and cannot be done using the Azure portal.
175+
171176
### Disable public network access
172177

173178
You can disable public network access of your Storage Account in the Azure portal.

articles/ai-services/openai/reference.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
title: Azure OpenAI Service REST API reference
33
titleSuffix: Azure OpenAI
44
description: Learn how to use Azure OpenAI's REST API. In this article, you learn about authorization options, how to structure a request and receive a response.
5-
#services: cognitive-services
65
manager: nitinme
76
ms.service: azure-ai-openai
87
ms.topic: conceptual
@@ -1362,5 +1361,5 @@ Azure OpenAI is deployed as a part of the Azure AI services. All Azure AI servic
13621361

13631362
## Next steps
13641363

1365-
Learn about [Models, and fine-tuning with the REST API](/rest/api/azureopenai/fine-tuning?view=rest-azureopenai-2023-10-01-preview).
1364+
Learn about [Models, and fine-tuning with the REST API](/rest/api/azureopenai/fine-tuning).
13661365
Learn more about the [underlying models that power Azure OpenAI](./concepts/models.md).

0 commit comments

Comments
 (0)