Merge pull request #250175 from MicrosoftDocs/main

Merge main to live, 4AM

Author: v-ccolin

articles/active-directory/reports-monitoring/reference-azure-ad-sla-performance.md

@@ -53,7 +53,7 @@ The SLA attainment is truncated at three places after the decimal. Numbers aren'
 | May       | 99.999% | 99.999% | 99.999% |
 | June      | 99.999% | 99.999% | 99.999% |
 | July      | 99.999% | 99.999% | 99.999% |
-| August    | 99.999% | 99.999% | |
+| August    | 99.999% | 99.999% | 99.999% |
 | September | 99.999% | 99.998% | |
 | October   | 99.999% | 99.999% | |
 | November  | 99.998% | 99.999% | |

articles/ai-services/openai/includes/chatgpt-dotnet.md

@@ -30,35 +30,7 @@ keywords:
 
 ## Set up
 
-### Create a new .NET Core application
-
-In a console window (such as cmd, PowerShell, or Bash), use the `dotnet new` command to create a new console app with the name `azure-openai-quickstart`. This command creates a simple "Hello World" project with a single C# source file: *Program.cs*.
-
-```dotnetcli
-dotnet new console -n azure-openai-quickstart
-```
-
-Change your directory to the newly created app folder. You can build the application with:
-
-```dotnetcli
-dotnet build
-```
-
-The build output should contain no warnings or errors.
-
-```output
-...
-Build succeeded.
- 0 Warning(s)
- 0 Error(s)
-...
-```
-
-Install the OpenAI .NET client library with:
-
-```dotnetcli
-dotnet add package Azure.AI.OpenAI --prerelease
-```
+[!INCLUDE [Create a new .NET application](./dotnet-new-application.md)]
 
 [!INCLUDE [get-key-endpoint](get-key-endpoint.md)]
 

articles/ai-services/openai/includes/connect-your-data-studio.md

@@ -11,6 +11,8 @@ ms.date: 08/25/2023
 recommendations: false
 ---
 
+## Add your data using Azure OpenAI Studio
+
 Navigate to [Azure OpenAI Studio](https://oai.azure.com/) and sign-in with credentials that have access to your Azure OpenAI resource. During or after the sign-in workflow, select the appropriate directory, Azure subscription, and Azure OpenAI resource.
 
 1. Select the **Chat playground** tile.

articles/ai-services/openai/includes/dotnet-new-application.md

@@ -0,0 +1,40 @@
+---
+services: cognitive-services
+manager: nitinme
+author: travisw
+ms.author: travisw
+ms.service: cognitive-services
+ms.subservice: openai
+ms.topic: include
+ms.date: 08/29/2023
+---
+
+### Create a new .NET Core application
+
+In a console window (such as cmd, PowerShell, or Bash), use the `dotnet new` command to create a new console app with the name `azure-openai-quickstart`. This command creates a simple "Hello World" project with a single C# source file: *Program.cs*.
+
+```dotnetcli
+dotnet new console -n azure-openai-quickstart
+```
+
+Change your directory to the newly created app folder. You can build the application with:
+
+```dotnetcli
+dotnet build
+```
+
+The build output should contain no warnings or errors.
+
+```output
+...
+Build succeeded.
+ 0 Warning(s)
+ 0 Error(s)
+...
+```
+
+Install the OpenAI .NET client library with:
+
+```console
+dotnet add package Azure.AI.OpenAI --prerelease
+```

articles/ai-services/openai/includes/dotnet.md

@@ -28,35 +28,7 @@ keywords:
 
 ## Set up
 
-### Create a new .NET Core application
-
-In a console window (such as cmd, PowerShell, or Bash), use the `dotnet new` command to create a new console app with the name `azure-openai-quickstart`. This command creates a simple "Hello World" project with a single C# source file: *Program.cs*.
-
-```dotnetcli
-dotnet new console -n azure-openai-quickstart
-```
-
-Change your directory to the newly created app folder. You can build the application with:
-
-```dotnetcli
-dotnet build
-```
-
-The build output should contain no warnings or errors.
-
-```output
-...
-Build succeeded.
- 0 Warning(s)
- 0 Error(s)
-...
-```
-
-Install the OpenAI .NET client library with:
-
-```console
-dotnet add package Azure.AI.OpenAI --prerelease
-```
+[!INCLUDE [Create a new .NET application](./dotnet-new-application.md)]
 
 [!INCLUDE [get-key-endpoint](get-key-endpoint.md)]
 

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

@@ -0,0 +1,99 @@
+---
+services: cognitive-services
+manager: nitinme
+author: travisw
+ms.author: travisw
+ms.service: cognitive-services
+ms.subservice: openai
+ms.topic: include
+ms.date: 08/29/2023
+---
+
+## Retrieve required variables
+
+To successfully make a call against Azure OpenAI, you need the following variables. This quickstart assumes you've uploaded your data to an Azure blob storage account and have an Azure Cognitive Search index created. See [Add your data using Azure AI studio](../use-your-data-quickstart.md?pivots=programming-language-studio)
+
+|Variable name | Value |
+|--------------------------|-------------|
+| `AOAIEndpoint`               | This value can be found in the **Keys & Endpoint** section when examining your Azure OpenAI resource from the Azure portal. Alternatively, you can find the value in **Azure AI studio** > **Chat playground** > **Code view**. An example endpoint is: `https://my-resoruce.openai.azure.com`.|
+| `AOAIKey` | This value can be found in **Resource management** > **Keys & Endpoint** section when examining your Azure OpenAI resource from the Azure portal. You can use either `KEY1` or `KEY2`. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption. |
+| `AOAIDeploymentId` | This value corresponds to the custom name you chose for your deployment when you deployed a model. This value can be found under **Resource Management** > **Deployments** in the Azure portal or alternatively under **Management** > **Deployments** in Azure AI studio.|
+| `SearchEndpoint` | This value can be found in the **Overview** section when examining your Azure Cognitive Search resource from the Azure portal. |
+| `SearchKey` | This value can be found in the **Resource management** > **Keys & Endpoint** section when examining your Azure Cognitive Search resource from the Azure portal. You can use either `KEY1` or `KEY2`. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption. |
+| `SearchIndex` | This value corresponds to the name of the index you created to store your data. You can find it in the **Overview** section when examining your Azure Cognitive Search resource from the Azure portal. |
+
+### Environment variables
+
+# [Command Line](#tab/command-line)
+
+```CMD
+setx AOAIEndpoint REPLACE_WITH_YOUR_AOAI_ENDPOINT_VALUE_HERE
+```
+```CMD
+setx AOAIKey REPLACE_WITH_YOUR_AOAI_KEY_VALUE_HERE
+```
+```CMD
+setx AOAIDeploymentId REPLACE_WITH_YOUR_AOAI_DEPLOYMENT_VALUE_HERE
+```
+```CMD
+setx SearchEndpoint REPLACE_WITH_YOUR_AZURE_SEARCH_RESOURCE_VALUE_HERE
+```
+```CMD
+setx SearchKey REPLACE_WITH_YOUR_AZURE_SEARCH_RESOURCE_KEY_VALUE_HERE
+```
+```CMD
+setx SearchIndex REPLACE_WITH_YOUR_INDEX_NAME_HERE
+```
+
+
+# [PowerShell](#tab/powershell)
+
+```powershell
+[System.Environment]::SetEnvironmentVariable('AOAIEndpoint', 'REPLACE_WITH_YOUR_AOAI_ENDPOINT_VALUE_HERE', 'User')
+```
+
+```powershell
+[System.Environment]::SetEnvironmentVariable('AOAIKey', 'REPLACE_WITH_YOUR_AOAI_KEY_VALUE_HERE', 'User')
+```
+
+```powershell
+[System.Environment]::SetEnvironmentVariable('AOAIDeploymentId', 'REPLACE_WITH_YOUR_AOAI_DEPLOYMENT_VALUE_HERE', 'User')
+```
+
+```powershell
+[System.Environment]::SetEnvironmentVariable('SearchEndpoint', 'REPLACE_WITH_YOUR_AZURE_SEARCH_RESOURCE_VALUE_HERE', 'User')
+```
+
+```powershell
+[System.Environment]::SetEnvironmentVariable('SearchKey', 'REPLACE_WITH_YOUR_AZURE_SEARCH_RESOURCE_KEY_VALUE_HERE', 'User')
+```
+
+```powershell
+[System.Environment]::SetEnvironmentVariable('SearchIndex', 'REPLACE_WITH_YOUR_INDEX_NAME_HERE', 'User')
+```
+
+# [Bash](#tab/bash)
+
+```Bash
+export AOAIEndpoint=REPLACE_WITH_YOUR_AOAI_ENDPOINT_VALUE_HERE
+```
+```Bash
+export AOAIKey=REPLACE_WITH_YOUR_AOAI_KEY_VALUE_HERE
+```
+```Bash
+export AOAIDeploymentId=REPLACE_WITH_YOUR_AOAI_DEPLOYMENT_VALUE_HERE
+```
+```Bash
+export SearchEndpoint=REPLACE_WITH_YOUR_AZURE_SEARCH_RESOURCE_VALUE_HERE
+```
+```Bash
+export SearchKey=REPLACE_WITH_YOUR_AZURE_SEARCH_RESOURCE_KEY_VALUE_HERE
+```
+```Bash
+export SearchIndex=REPLACE_WITH_YOUR_INDEX_NAME_HERE
+```
+
+---
+
+> [!div class="nextstepaction"]
+> [I ran into an issue with the setup.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=REST&Pillar=AOAI&Product=ownData&Page=quickstart&Section=Set-up)