Skip to content

Commit 2e80ad8

Browse files
Merge branch 'MicrosoftDocs:main' into issues/120491-check-title
2 parents b299f19 + 5e42ae6 commit 2e80ad8

File tree

209 files changed

+2056
-3374
lines changed

Some content is hidden

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

209 files changed

+2056
-3374
lines changed

.openpublishing.redirection.sentinel.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,21 @@
10551055
"redirect_url": "/azure/sentinel/normalization-schema-process-event",
10561056
"redirect_document_id": true
10571057
},
1058+
{
1059+
"source_path_from_root": "/articles/sentinel/connect-cef-ama.md",
1060+
"redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
1061+
"redirect_document_id": false
1062+
},
1063+
{
1064+
"source_path_from_root": "/articles/sentinel/connect-cef-syslog.md",
1065+
"redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
1066+
"redirect_document_id": false
1067+
},
1068+
{
1069+
"source_path_from_root": "/articles/sentinel/connect-cef-syslog-options.md",
1070+
"redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
1071+
"redirect_document_id": false
1072+
},
10581073
{
10591074
"source_path_from_root": "/articles/sentinel/notebooks-with-synapse.md",
10601075
"redirect_url": "/azure/sentinel/notebooks-hunt",

articles/ai-services/openai/concepts/models.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
44
description: Learn about the different model capabilities that are available with Azure OpenAI.
55
ms.service: azure-ai-openai
66
ms.topic: conceptual
7-
ms.date: 02/21/2024
7+
ms.date: 03/06/2024
88
ms.custom: references_regions, build-2023, build-2023-dataai, refefences_regions
99
manager: nitinme
1010
author: mrbullwinkle #ChrisHMSFT
@@ -110,11 +110,11 @@ GPT-4 version 0125-preview is an updated version of the GPT-4 Turbo preview prev
110110
| `gpt-4-32k`(0314) | 32,768 | Sep 2021 |
111111
| `gpt-4` (0613) | 8,192 | Sep 2021 |
112112
| `gpt-4-32k` (0613) | 32,768 | Sep 2021 |
113-
| `gpt-4` (1106-preview)**<sup>1</sup>**<br>**GPT-4 Turbo Preview** | Input: 128,000 <br> Output: 4,096 | Apr 2023 |
114-
| `gpt-4` (0125-preview)**<sup>1</sup>**<br>**GPT-4 Turbo Preview** | Input: 128,000 <br> Output: 4,096 | Dec 2023 |
113+
| `gpt-4` (1106-Preview)**<sup>1</sup>**<br>**GPT-4 Turbo Preview** | Input: 128,000 <br> Output: 4,096 | Apr 2023 |
114+
| `gpt-4` (0125-Preview)**<sup>1</sup>**<br>**GPT-4 Turbo Preview** | Input: 128,000 <br> Output: 4,096 | Dec 2023 |
115115
| `gpt-4` (vision-preview)**<sup>2</sup>**<br>**GPT-4 Turbo with Vision Preview** | Input: 128,000 <br> Output: 4,096 | Apr 2023 |
116116

117-
**<sup>1</sup>** GPT-4 Turbo Preview = `gpt-4` (0125-preview). To deploy this model, under **Deployments** select model **gpt-4**. For **Model version** select **0125-preview**.
117+
**<sup>1</sup>** GPT-4 Turbo Preview = `gpt-4` (0125-Preview) or `gpt-4` (1106-Preview). To deploy this model, under **Deployments** select model **gpt-4**. Under version select (0125-Preview) or (1106-Preview).
118118

119119
**<sup>2</sup>** GPT-4 Turbo with Vision Preview = `gpt-4` (vision-preview). To deploy this model, under **Deployments** select model **gpt-4**. For **Model version** select **vision-preview**.
120120

@@ -132,8 +132,8 @@ GPT-4 version 0125-preview is an updated version of the GPT-4 Turbo preview prev
132132
|---|:---|:---|
133133
| gpt-4 (0314) | | East US <br> France Central <br> South Central US <br> UK South |
134134
| gpt-4 (0613) | Australia East <br> Canada East <br> France Central <br> Sweden Central <br> Switzerland North | East US <br> East US 2 <br> Japan East <br> UK South |
135-
| gpt-4 (1106-preview) | Australia East <br> Canada East <br> East US 2 <br> France Central <br> Norway East <br> South India <br> Sweden Central <br> UK South <br> West US | |
136-
| gpt-4 (0125-preview) | East US <br> North Central US <br> South Central US <br> |
135+
| gpt-4 (1106-Preview) | Australia East <br> Canada East <br> East US 2 <br> France Central <br> Norway East <br> South India <br> Sweden Central <br> UK South <br> West US | |
136+
| gpt-4 (0125-Preview) | East US <br> North Central US <br> South Central US <br> |
137137
| gpt-4 (vision-preview) | Sweden Central <br> West US <br> Japan East <br> Switzerland North <br> Australia East| |
138138

139139
#### Azure Government regions
@@ -142,7 +142,7 @@ The following GPT-4 models are available with [Azure Government](/azure/azure-go
142142

143143
|Model ID | Model Availability |
144144
|--|--|
145-
| `gpt-4` (1106-preview) | US Gov Virginia<br>US Gov Arizona |
145+
| `gpt-4` (1106-Preview) | US Gov Virginia<br>US Gov Arizona |
146146

147147

148148
### GPT-3.5 models

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Mapping these fields correctly helps ensure the model has better response and ci
129129

130130
### Search filter (API)
131131

132-
If you want to implement additional value-based criteria for query execution, you can set up a search filter using the `filter` parameter in the [REST API](../references/azure-search.md).
132+
If you want to implement additional value-based criteria for query execution, you can set up a [search filter](/azure/search/search-filters) using the `filter` parameter in the [REST API](../references/azure-search.md).
133133

134134

135135
# [Azure Cosmos DB for MongoDB vCore](#tab/mongo-db)

articles/ai-services/openai/includes/fine-tuning-python.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: Learn how to create your own customized model with Azure OpenAI Ser
66
manager: nitinme
77
ms.service: azure-ai-openai
88
ms.topic: include
9-
ms.date: 10/10/2023
9+
ms.date: 03/06/2024
1010
author: mrbullwinkle
1111
ms.author: mbullwin
1212
---
@@ -34,6 +34,7 @@ The following models support fine-tuning:
3434
- `davinci-002`
3535
- `gpt-35-turbo` (0613)
3636
- `gpt-35-turbo` (1106)
37+
- `gpt-35-turbo` (0125)
3738

3839
Or you can fine tune a previously fine-tuned model, formatted as base-model.ft-{jobid}.
3940

articles/ai-services/openai/includes/fine-tuning-rest.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: Learn how to create your own customized model with Azure OpenAI Ser
66
manager: nitinme
77
ms.service: azure-ai-openai
88
ms.topic: include
9-
ms.date: 10/10/2023
9+
ms.date: 03/06/2024
1010
author: mrbullwinkle
1111
ms.author: mbullwin
1212
---
@@ -28,10 +28,11 @@ ms.author: mbullwin
2828

2929
The following models support fine-tuning:
3030

31-
- `gpt-35-turbo-0613`
32-
- `gpt-35-turbo-1106`
3331
- `babbage-002`
3432
- `davinci-002`
33+
- `gpt-35-turbo` (0613)
34+
- `gpt-35-turbo` (1106)
35+
- `gpt-35-turbo` (0125)
3536

3637
Consult the [models page](../concepts/models.md#fine-tuning-models) to check which regions currently support fine-tuning.
3738

articles/ai-services/openai/includes/fine-tuning-studio.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: Learn how to create your own custom model with Azure OpenAI Service
66
manager: nitinme
77
ms.service: azure-ai-openai
88
ms.topic: include
9-
ms.date: 10/09/2023
9+
ms.date: 03/06/2024
1010
author: mrbullwinkle
1111
ms.author: mbullwin
1212
---
@@ -27,10 +27,11 @@ ms.author: mbullwin
2727

2828
The following models support fine-tuning:
2929

30-
- `gpt-35-turbo-0613`
31-
- `gpt-35-turbo-1106`
3230
- `babbage-002`
3331
- `davinci-002`
32+
- `gpt-35-turbo` (0613)
33+
- `gpt-35-turbo` (1106)
34+
- `gpt-35-turbo` (0125)
3435

3536
Consult the [models page](../concepts/models.md#fine-tuning-models) to check which regions currently support fine-tuning.
3637

articles/ai-services/openai/includes/use-your-data-javascript.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ node.exe ChatWithOwnData.js
102102
## Output
103103
104104
```output
105-
Message: What are the differences between Azure Machine Learning and Azure AI services?
105+
Message: Tell me something interesting
106106
Based on the retrieved document, an interesting fact is...
107107

108108
```

articles/ai-studio/concepts/content-filtering.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Azure AI Studio includes a content filtering system that works alongside core mo
2222
> [!IMPORTANT]
2323
> The content filtering system isn't applied to prompts and completions processed by the Whisper model in Azure OpenAI Service. Learn more about the [Whisper model in Azure OpenAI](../../ai-services/openai/concepts/models.md#whisper-preview).
2424
25-
This system is powered by Azure AI Content Safety, and now works by running both the prompt and completion through an ensemble of classification models aimed at detecting and preventing the output of harmful content. The content filtering system detects and takes action on specific categories of potentially harmful content in both input prompts and output completions. Variations in API configurations and application design might affect completions and thus filtering behavior.
25+
This system is powered by [Azure AI Content Safety](../../ai-services/content-safety/overview.md), and works by running both the prompt and completion through an ensemble of classification models aimed at detecting and preventing the output of harmful content. The content filtering system detects and takes action on specific categories of potentially harmful content in both input prompts and output completions. Variations in API configurations and application design might affect completions and thus filtering behavior.
2626

2727
The content filtering models have been trained and tested on the following languages: English, German, Japanese, Spanish, French, Italian, Portuguese, and Chinese. However, the service can work in many other languages, but the quality can vary. In all cases, you should do your own testing to ensure that it works for your application.
2828

@@ -86,5 +86,5 @@ Now, you can go to the playground to test whether the content filter works as ex
8686
## Next steps
8787

8888
- Learn more about the [underlying models that power Azure OpenAI](../../ai-services/openai/concepts/models.md).
89-
- Azure AI Studio content filtering is powered by [Azure AI Content Safety](/azure/ai-services/content-safety/overview).
89+
- Azure AI Studio content filtering is powered by [Azure AI Content Safety](../../ai-services/content-safety/overview.md).
9090
- Learn more about understanding and mitigating risks associated with your application: [Overview of Responsible AI practices for Azure OpenAI models](/legal/cognitive-services/openai/overview?context=/azure/ai-services/context/context).

articles/ai-studio/how-to/deploy-models-llama.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,21 @@ description: Learn how to deploy Llama 2 family of large language models with Az
55
manager: scottpolly
66
ms.service: azure-ai-studio
77
ms.topic: how-to
8-
ms.date: 02/09/2024
8+
ms.date: 3/6/2024
99
ms.reviewer: fasantia
1010
ms.author: mopeakande
1111
author: msakande
1212
ms.custom: [references_regions]
13-
14-
#This functionality is also available in Azure Machine Learning: /azure/machine-learning/how-to-deploy-models-llama.md
1513
---
1614

1715
# How to deploy Llama 2 family of large language models with Azure AI Studio
1816

17+
[!INCLUDE [Azure AI Studio preview](../includes/preview-ai-studio.md)]
18+
1919
In this article, you learn about the Llama 2 family of large language models (LLMs). You also learn how to use Azure AI Studio to deploy models from this set either as a service with pay-as you go billing or with hosted infrastructure in real-time endpoints.
2020

2121
The Llama 2 family of LLMs is a collection of pretrained and fine-tuned generative text models ranging in scale from 7 billion to 70 billion parameters. The model family also includes fine-tuned versions optimized for dialogue use cases with reinforcement learning from human feedback (RLHF), called Llama-2-chat.
2222

23-
[!INCLUDE [Azure AI Studio preview](../includes/preview-ai-studio.md)]
24-
2523
## Deploy Llama 2 models with pay-as-you-go
2624

2725
Certain models in the model catalog can be deployed as a service with pay-as-you-go, providing a way to consume them as an API without hosting them on your subscription, while keeping the enterprise security and compliance organizations need. This deployment option doesn't require quota from your subscription.
@@ -47,7 +45,7 @@ If you need to deploy a different model, [deploy it to real-time endpoints](#dep
4745
- An [Azure AI hub resource](../how-to/create-azure-ai-resource.md).
4846

4947
> [!IMPORTANT]
50-
> Pay-as-you-go model deployment offering is only available in AI hubs created in **East US 2** and **West US 3** regions.
48+
> For Llama 2 family models, the pay-as-you-go model deployment offering is only available with AI hubs created in **East US 2** and **West US 3** regions.
5149
5250
- An [Azure AI project](../how-to/create-projects.md) in Azure AI Studio.
5351
- Azure role-based access controls (Azure RBAC) are used to grant access to operations in Azure AI Studio. To perform the steps in this article, your user account must be assigned the __owner__ or __contributor__ role for the Azure subscription. Alternatively, your account can be assigned a custom role that has the following permissions:
@@ -77,9 +75,9 @@ To create a deployment:
7775
1. Sign in to [Azure AI Studio](https://ai.azure.com).
7876
1. Choose the model you want to deploy from the Azure AI Studio [model catalog](https://ai.azure.com/explore/models).
7977

80-
Alternatively, you can initiate deployment by starting from your project in AI Studio. From the **Build** tab of your project, select the **Deployments** option, then select **+ Create**.
78+
Alternatively, you can initiate deployment by starting from your project in AI Studio. From the **Build** tab of your project, select **Deployments** > **+ Create**.
8179

82-
1. On the model's **Details** page, select **Deploy** and then **Pay-as-you-go**.
80+
1. On the model's **Details** page, select **Deploy** and then select **Pay-as-you-go**.
8381

8482
:::image type="content" source="../media/deploy-monitor/llama/deploy-pay-as-you-go.png" alt-text="A screenshot showing how to deploy a model with the pay-as-you-go option." lightbox="../media/deploy-monitor/llama/deploy-pay-as-you-go.png":::
8583

0 commit comments

Comments
 (0)