Skip to content

Commit 1cff6f2

Browse files
authored
Merge pull request #285406 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 118d5c7 + 2368ade commit 1cff6f2

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

articles/ai-studio/tutorials/deploy-chat-web-app.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ The steps in this tutorial are:
3838

3939
- You need a local copy of product data. The [Azure-Samples/rag-data-openai-python-promptflow repository on GitHub](https://github.com/Azure-Samples/rag-data-openai-python-promptflow/) contains sample retail product information that's relevant for this tutorial scenario. Specifically, the `product_info_11.md` file contains product information about the TrailWalker hiking shoes that's relevant for this tutorial example. [Download the example Contoso Trek retail product data in a ZIP file](https://github.com/Azure-Samples/rag-data-openai-python-promptflow/raw/main/tutorial/data.zip) to your local machine.
4040

41+
- You need to have **Microsoft.Web** resource provider registered in the selected subscription, to be able to deploy to a web app.
42+
4143
## Add your data and try the chat model again
4244

4345
In the [AI Studio playground quickstart](../quickstarts/get-started-playground.md) (that's a prerequisite for this tutorial), you can observe how your model responds without your data. Now you add your data to the model to help it answer questions about your products.
@@ -67,6 +69,9 @@ Publishing creates an Azure App Service in your subscription. It might incur cos
6769

6870
To deploy the web app:
6971

72+
> [!NOTE]
73+
> You need to have **Microsoft.Web** resource provider registered in the selected subscription, to be able to deploy to a web app.
74+
7075
1. Complete the steps in the previous section to [add your data](#add-your-data-and-try-the-chat-model-again) to the playground.
7176

7277
> [!NOTE]

articles/api-management/howto-use-analytics.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ If you need to configure one, the following are brief steps to send gateway logs
5656
1. Enter a descriptive name for the diagnostic setting.
5757
1. In **Logs**, select **Logs related to ApiManagement Gateway**.
5858
1. In **Destination details**, select **Send to Log Analytics** and select a Log Analytics workspace in the same or a different subscription. If you need to create a workspace, see [Create a Log Analytics workspace](../azure-monitor/logs/quick-create-workspace.md).
59-
1. Accept defaults for other settings, or customize as needed. Select **Save**.
59+
1. Make sure **Resource specific** is selected as the destination table.
60+
1. Select **Save**.
6061

6162
### Access the dashboard
6263

@@ -92,4 +93,4 @@ Available operations return report records by API, geography, API operations, pr
9293
* For an introduction to Azure Monitor features in API Management, see [Tutorial: Monitor published APIs](api-management-howto-use-azure-monitor.md)
9394
* For detailed HTTP logging and monitoring, see [Monitor your APIs with Azure API Management, Event Hubs, and Moesif](api-management-log-to-eventhub-sample.md).
9495
* Learn about integrating [Azure API Management with Azure Application Insights](api-management-howto-app-insights.md).
95-
* Learn about [Built-in API analytics dashboard retirement (March 2027)](breaking-changes/analytics-dashboard-retirement-march-2027.md)
96+
* Learn about [Built-in API analytics dashboard retirement (March 2027)](breaking-changes/analytics-dashboard-retirement-march-2027.md)

articles/machine-learning/how-to-create-compute-instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ A compute instance is considered inactive if the below conditions are met:
149149
* No VS Code connections; you must close your VS Code connection for your compute instance to be considered inactive. Sessions are autoterminated if VS Code detects no activity for 3 hours.
150150
* No custom applications are running on the compute
151151

152-
A compute instance won't be considered idle if any custom application is running. There are also some basic bounds around inactivity time periods; compute instance must be inactive for a minimum of 15 mins and a maximum of three days. We also don't track VS Code SSH connections to determine activity.
152+
A compute instance won't be considered idle if any custom application is running. To shutdown a compute with a custom application automatically, a schedule needs to be set up, or the custom application needs to be removed. There are also some basic bounds around inactivity time periods; compute instance must be inactive for a minimum of 15 mins and a maximum of three days. We also don't track VS Code SSH connections to determine activity.
153153

154154
Also, if a compute instance has already been idle for a certain amount of time, if idle shutdown settings are updated to an amount of time shorter than the current idle duration, the idle time clock is reset to 0. For example, if the compute instance has already been idle for 20 minutes, and the shutdown settings are updated to 15 minutes, the idle time clock is reset to 0.
155155

0 commit comments

Comments
 (0)