Skip to content

Commit 0fab8b5

Browse files
authored
Merge pull request #283222 from MicrosoftDocs/main
8/1/2024 AM Publish
2 parents bf81ea3 + a367d51 commit 0fab8b5

File tree

446 files changed

+1562
-907
lines changed

Some content is hidden

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

446 files changed

+1562
-907
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -296,18 +296,18 @@ These models can only be used with Embedding API requests.
296296

297297
For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. The following models are available in the Assistants API, SDK, Azure AI Studio and Azure OpenAI Studio. The following table is for pay-as-you-go. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](./provisioned-throughput.md). The listed models and regions can be used with both Assistants v1 and v2.
298298

299-
| Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)`| `fine tuned gpt-3.5-turbo-0125` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` | `gpt-4o (2024-05-13)` |
300-
|-----|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
301-
| Australia East ||| ||| | |
302-
| East US || | | | |||
303-
| East US 2 || |||| ||
304-
| France Central ||| ||| | |
305-
| Japan East || | | | | | |
306-
| Norway East | | | | || | |
307-
| Sweden Central |||||| ||
308-
| UK South ||| | ||| |
309-
| West US | || | || ||
310-
| West US 3 | | | | || ||
299+
| Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)`| `fine tuned gpt-3.5-turbo-0125` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` | `gpt-4o (2024-05-13)` | `gpt-4o-mini (2024-07-18)` |
300+
|-----|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
301+
| Australia East ||| ||| | | |
302+
| East US || | | | ||||
303+
| East US 2 || |||| || |
304+
| France Central ||| ||| | | |
305+
| Japan East || | | | | | | |
306+
| Norway East | | | | || | | |
307+
| Sweden Central |||||| || |
308+
| UK South ||| | ||| | |
309+
| West US | || | || || |
310+
| West US 3 | | | | || || |
311311

312312
## Model retirement
313313

articles/ai-studio/how-to/monitor-quality-safety.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.custom:
88
- ignite-2023
99
- build-2024
1010
ms.topic: how-to
11-
ms.date: 5/21/2024
11+
ms.date: 7/31/2024
1212
ms.reviewer: alehughes
1313
reviewer: ahughes-msft
1414
ms.author: mopeakande
@@ -38,7 +38,7 @@ Integrations for monitoring a prompt flow deployment allow you to:
3838

3939
Before following the steps in this article, make sure you have the following prerequisites:
4040

41-
- An Azure subscription with a valid payment method. Free or trial Azure subscriptions won't work. If you don't have an Azure subscription, create a [paid Azure account](https://azure.microsoft.com/pricing/purchase-options/pay-as-you-go) to begin.
41+
- An Azure subscription with a valid payment method. Free or trial Azure subscriptions aren't supported for this scenario. If you don't have an Azure subscription, create a [paid Azure account](https://azure.microsoft.com/pricing/purchase-options/pay-as-you-go) to begin.
4242

4343
- An [Azure AI Studio hub](create-azure-ai-resource.md).
4444

@@ -152,7 +152,7 @@ In this section, you learn how to configure monitoring for your deployed prompt
152152
# [Studio](#tab/azure-studio)
153153

154154
1. From the left navigation bar, go to **Components** > **Deployments**.
155-
1. Select the prompt flow deployment you just created.
155+
1. Select the prompt flow deployment that you created.
156156
1. Select **Enable** within the **Enable generation quality monitoring** box.
157157

158158
:::image type="content" source="../media/deploy-monitor/monitor/deployment-page-highlight-monitoring.png" alt-text="Screenshot of the deployment page highlighting generation quality monitoring." lightbox = "../media/deploy-monitor/monitor/deployment-page-highlight-monitoring.png":::
@@ -204,7 +204,7 @@ credential = DefaultAzureCredential()
204204
# Update your azure resources details
205205
subscription_id = "INSERT YOUR SUBSCRIPTION ID"
206206
resource_group = "INSERT YOUR RESOURCE GROUP NAME"
207-
workspace_name = "INSERT YOUR WORKSPACE NAME" # This is the same as your AI Studio project name
207+
project_name = "INSERT YOUR PROJECT NAME" # This is the same as your AI Studio project name
208208
endpoint_name = "INSERT YOUR ENDPOINT NAME" # This is your deployment name without the suffix (e.g., deployment is "contoso-chatbot-1", endpoint is "contoso-chatbot")
209209
deployment_name = "INSERT YOUR DEPLOYMENT NAME"
210210
aoai_deployment_name ="INSERT YOUR AOAI DEPLOYMENT NAME"
@@ -225,7 +225,7 @@ ml_client = MLClient(
225225
credential=credential,
226226
subscription_id=subscription_id,
227227
resource_group_name=resource_group,
228-
workspace_name=workspace_name,
228+
workspace_name=project_name,
229229
)
230230

231231
spark_compute = ServerlessSparkCompute(instance_type="standard_e4s_v3", runtime_version="3.3")
@@ -259,7 +259,7 @@ production_data = LlmData(
259259
)
260260

261261
gsq_signal = GenerationSafetyQualitySignal(
262-
connection_id=f"/subscriptions/{subscription_id}/resourceGroups/{resource_group}/providers/Microsoft.MachineLearningServices/workspaces/{workspace_name}/connections/{aoai_connection_name}",
262+
connection_id=f"/subscriptions/{subscription_id}/resourceGroups/{resource_group}/providers/Microsoft.MachineLearningServices/workspaces/{project_name}/connections/{aoai_connection_name}",
263263
metric_thresholds=generation_quality_thresholds,
264264
production_data=[production_data],
265265
sampling_rate=1.0,
@@ -297,7 +297,7 @@ ml_client.schedules.begin_create_or_update(model_monitor)
297297

298298
## Consume monitoring results
299299

300-
After you've created your monitor, it will run daily to compute the token usage and generation quality metrics.
300+
After you create your monitor, it will run daily to compute the token usage and generation quality metrics.
301301

302302
1. Go to the **Monitoring (preview)** tab from within the deployment to view the monitoring results. Here, you see an overview of monitoring results during the selected time window. You can use the date picker to change the time window of data you're monitoring. The following metrics are available in this overview:
303303

@@ -371,8 +371,8 @@ credential = DefaultAzureCredential()
371371
# Update your azure resources details
372372
subscription_id = "INSERT YOUR SUBSCRIPTION ID"
373373
resource_group = "INSERT YOUR RESOURCE GROUP NAME"
374-
workspace_name = "INSERT YOUR WORKSPACE NAME" # This is the same as your AI Studio project name
375-
endpoint_name = "INSERT YOUR ENDPOINT NAME" This is your deployment name without the suffix (e.g., deployment is "contoso-chatbot-1", endpoint is "contoso-chatbot")
374+
project_name = "INSERT YOUR PROJECT NAME" # This is the same as your AI Studio project name
375+
endpoint_name = "INSERT YOUR ENDPOINT NAME" # This is your deployment name without the suffix (e.g., deployment is "contoso-chatbot-1", endpoint is "contoso-chatbot")
376376
deployment_name = "INSERT YOUR DEPLOYMENT NAME"
377377

378378
# These variables can be renamed but it is not necessary
@@ -387,7 +387,7 @@ ml_client = MLClient(
387387
credential=credential,
388388
subscription_id=subscription_id,
389389
resource_group_name=resource_group,
390-
workspace_name=workspace_name,
390+
workspace_name=project_name,
391391
)
392392

393393
spark_compute = ServerlessSparkCompute(instance_type="standard_e4s_v3", runtime_version="3.3")
@@ -448,7 +448,7 @@ credential = DefaultAzureCredential()
448448
# Update your azure resources details
449449
subscription_id = "INSERT YOUR SUBSCRIPTION ID"
450450
resource_group = "INSERT YOUR RESOURCE GROUP NAME"
451-
workspace_name = "INSERT YOUR WORKSPACE NAME" # This is the same as your AI Studio project name
451+
project_name = "INSERT YOUR PROJECT NAME" # This is the same as your AI Studio project name
452452
endpoint_name = "INSERT YOUR ENDPOINT NAME" # This is your deployment name without the suffix (e.g., deployment is "contoso-chatbot-1", endpoint is "contoso-chatbot")
453453
deployment_name = "INSERT YOUR DEPLOYMENT NAME"
454454
aoai_deployment_name ="INSERT YOUR AOAI DEPLOYMENT NAME"
@@ -468,7 +468,7 @@ ml_client = MLClient(
468468
credential=credential,
469469
subscription_id=subscription_id,
470470
resource_group_name=resource_group,
471-
workspace_name=workspace_name,
471+
workspace_name=project_name,
472472
)
473473

474474
spark_compute = ServerlessSparkCompute(instance_type="standard_e4s_v3", runtime_version="3.3")
@@ -502,7 +502,7 @@ production_data = LlmData(
502502
)
503503

504504
gsq_signal = GenerationSafetyQualitySignal(
505-
connection_id=f"/subscriptions/{subscription_id}/resourceGroups/{resource_group}/providers/Microsoft.MachineLearningServices/workspaces/{workspace_name}/connections/{aoai_connection_name}",
505+
connection_id=f"/subscriptions/{subscription_id}/resourceGroups/{resource_group}/providers/Microsoft.MachineLearningServices/workspaces/{project_name}/connections/{aoai_connection_name}",
506506
metric_thresholds=generation_quality_thresholds,
507507
production_data=[production_data],
508508
sampling_rate=1.0,
@@ -533,9 +533,9 @@ model_monitor = MonitorSchedule(
533533
ml_client.schedules.begin_create_or_update(model_monitor)
534534
```
535535

536-
After you've created your monitor from the SDK, you can [consume the monitoring results](#consume-monitoring-results) in AI Studio.
536+
After you create your monitor from the SDK, you can [consume the monitoring results](#consume-monitoring-results) in AI Studio.
537537

538538
## Related content
539539

540-
- Learn more about what you can do in [Azure AI Studio](../what-is-ai-studio.md)
541-
- Get answers to frequently asked questions in the [Azure AI FAQ article](../faq.yml)
540+
- Learn more about what you can do in [Azure AI Studio](../what-is-ai-studio.md).
541+
- Get answers to frequently asked questions in the [Azure AI FAQ article](../faq.yml).

articles/app-service/overview-tls.md

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,28 @@ title: Transport Layer Security (TLS) overview
33
description: Learn about Transport Layer Security (TLS) on App Service.
44
keywords: app service, azure app service, tls, transport layer security, support, web app, troubleshooting,
55
ms.topic: article
6-
ms.date: 11/06/2023
6+
ms.date: 07/29/2024
77
ms.author: msangapu
88
author: msangapu-msft
99
ms.custom: UpdateFrequency3
10+
ms.collection: ce-skilling-ai-copilot
1011
---
1112
# Azure App Service TLS overview
1213

1314
## What does TLS do in App Service?
1415

1516
Transport Layer Security (TLS) is a widely adopted security protocol designed to secure connections and communications between servers and clients. App Service allows customers to use TLS/SSL certificates to secure incoming requests to their web apps. App Service currently supports different set of TLS features for customers to secure their web apps.
1617

18+
> [!TIP]
19+
>
20+
> You can also ask Azure Copilot these questions:
21+
>
22+
> - *What versions of TLS are supported in App Service?*
23+
> - *What are the benefits of using TLS 1.3 over previous versions?*
24+
> - *How can I change the cipher suite order for my App Service Environment?*
25+
>
26+
> To find Azure Copilot, on the [Azure portal](https://portal.azure.com) toolbar, select **Copilot**.
27+
1728
## Supported TLS Version on App Service?
1829

1930
For incoming requests to your web app, App Service supports TLS versions 1.0, 1.1, 1.2, and 1.3.
@@ -22,6 +33,11 @@ For incoming requests to your web app, App Service supports TLS versions 1.0, 1.
2233

2334
App Service also allows you to set minimum TLS version for incoming requests to your web app and to SCM site. By default, the minimum TLS version for incoming requests to your web app and to SCM would be set to 1.2 on both portal and API.
2435

36+
### TLS 1.3
37+
A [Minimum TLS Cipher Suite](#minimum-tls-cipher-suite-preview) setting is available with TLS 1.3. This includes two cipher suites at the top of the cipher suite order:
38+
- TLS_AES_256_GCM_SHA384
39+
- TLS_AES_128_GCM_SHA256
40+
2541
### TLS 1.0 and 1.1
2642

2743
TLS 1.0 and 1.1 are considered legacy protocols and are no longer considered secure. It's generally recommended for customers to use TLS 1.2 or above as the minimum TLS version. When creating a web app, the default minimum TLS version would be TLS 1.2.
@@ -32,5 +48,37 @@ To ensure backward compatibility for TLS 1.0 and TLS 1.1, App Service will conti
3248
> Incoming requests to web apps and incoming requests to Azure are treated differently. App Service will continue to support TLS 1.0 and 1.1 for incoming requests to the web apps. For incoming requests directly to Azure, for example through ARM or API, it's not recommended to use TLS 1.0 or 1.1.
3349
>
3450
51+
## Minimum TLS cipher suite (preview)
52+
53+
> [!NOTE]
54+
> Minimum TLS Cipher Suite is supported on Premium SKUs and higher on multi-tenant App Service.
55+
56+
The minimum TLS cipher suite includes a fixed list of cipher suites with an optimal priority order that you cannot change. Reordering or reprioritizing the cipher suites is not recommended as it could expose your web apps to weaker encryption. You also cannot add new or different cipher suites to this list. When you select a minimum cipher suite, the system automatically disables all less secure cipher suites for your web app, without allowing you to selectively disable only some weaker cipher suites.
57+
58+
Follow these steps to change the Minimum TLS cipher suite:
59+
1. Browse to your app in the [Azure portal](https://portal.azure.com/)
60+
1. In the left menu, select **configuration** and then select the **General settings** tab.
61+
1. Under __Minimum Inbound TLS Cipher Suite__, select **change**, and then select the **Minimum TLS Cipher Suite**.
62+
1. Select **Ok**.
63+
1. Select **Save** to save the changes.
64+
65+
### What are cipher suites and how do they work on App Service?
66+
67+
A cipher suite is a set of instructions that contains algorithms and protocols to help secure network connections between clients and servers. By default, the front-end's OS would pick the most secure cipher suite that is supported by both App Service and the client. However, if the client only supports weak cipher suites, then the front-end's OS would end up picking a weak cipher suite that is supported by them both. If your organization has restrictions on what cipher suites should not be allowed, you may update your web app’s minimum TLS cipher suite property to ensure that the weak cipher suites would be disabled for your web app.
68+
69+
### App Service Environment (ASE) V3 with cluster setting `FrontEndSSLCipherSuiteOrder`
70+
71+
For App Service Environments with `FrontEndSSLCipherSuiteOrder` cluster setting, you need to update your settings to include two TLS 1.3 cipher suites (TLS_AES_256_GCM_SHA384 and TLS_AES_128_GCM_SHA256). Once updated, restart your front-end for the change to take effect. You must still include the two required cipher suites as mentioned in the docs.
72+
73+
## End-to-end TLS Encryption (preview)
74+
75+
End-to-end (E2E) TLS encryption is available in Standard App Service plans and higher. Front-end intra-cluster traffic between App Service front-ends and the workers running application workloads can now be encrypted. Below is a simple diagram to help you understand how it works.
76+
77+
Follow these steps to enable end-to-end TLS encryption:
78+
1. Browse to your app in the [Azure portal](https://portal.azure.com/)
79+
1. In the left menu, select **configuration** and then select the **General settings** tab.
80+
1. Under __End-to-end TLS encryption__, select **on**.
81+
1. Save the changes.
82+
3583
## Next steps
3684
* [Secure a custom DNS name with a TLS/SSL binding](configure-ssl-bindings.md)

articles/azure-government/compare-azure-government-global-azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ The following features of Azure OpenAI are available in Azure Government:
189189

190190
|Feature|Azure OpenAI|
191191
|--------|--------|
192-
|Models available|US Gov Arizona:<br>&nbsp;&nbsp;&nbsp;GPT-4 (1106-Preview)<br>&nbsp;&nbsp;&nbsp;GPT-3.5-Turbo (1106)<br>&nbsp;&nbsp;&nbsp;GPT-3.5-Turbo (0125)<br>&nbsp;&nbsp;&nbsp;text-embedding-ada-002 (version 2)<br><br>US Gov Virginia:<br>&nbsp;&nbsp;&nbsp;GPT-4 (1106-Preview)<br>&nbsp;&nbsp;&nbsp;GPT-3.5-Turbo (0125)<br>&nbsp;&nbsp;&nbsp;text-embedding-ada-002 (version 2)<br><br>Learn more in [Azure OpenAI Service models](../ai-services/openai/concepts/models.md)|
192+
|Models available|US Gov Arizona:<br>&nbsp;&nbsp;&nbsp;GPT-4o (2024-05-13)&nbsp;&nbsp;&nbsp;GPT-4 (1106-Preview)<br>&nbsp;&nbsp;&nbsp;GPT-3.5-Turbo (1106)<br>&nbsp;&nbsp;&nbsp;GPT-3.5-Turbo (0125)<br>&nbsp;&nbsp;&nbsp;text-embedding-ada-002 (version 2)<br><br>US Gov Virginia:<br>&nbsp;&nbsp;&nbsp;GPT-4 (1106-Preview)<br>&nbsp;&nbsp;&nbsp;GPT-3.5-Turbo (0125)<br>&nbsp;&nbsp;&nbsp;text-embedding-ada-002 (version 2)<br><br>Learn more about the different capabilities of each model in [Azure OpenAI Service models](../ai-services/openai/concepts/models.md)|
193193
|Virtual network support & private link support| Yes. |
194194
| Connect your data | Available in US Gov Virginia and Arizona. Virtual network and private links are supported. Deployment to a web app or a copilot in Copilot Studio is not supported. |
195195
|Managed Identity|Yes, via Microsoft Entra ID|

articles/container-apps/quickstart-portal.md

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: 'Quickstart: Deploy your first container app using the Azure portal'
33
description: Deploy your first application to Azure Container Apps using the Azure portal.
44
services: container-apps
55
author: craigshoemaker
6-
ms.service: container-apps
6+
ms.service: azure-container-apps
77
ms.topic: quickstart
88
ms.date: 07/23/2024
99
ms.author: cshoe
@@ -24,12 +24,41 @@ In this quickstart, you create a secure Container Apps environment and deploy yo
2424

2525
## Setup
2626

27-
<!-- Create -->
28-
[!INCLUDE [container-apps-create-portal-steps.md](../../includes/container-apps-create-portal-steps.md)]
27+
Begin by signing in to the [Azure portal](https://portal.azure.com).
2928

30-
3. Select the **Container** tab.
29+
## Create a container app
3130

32-
4. Select *Use quickstart image*.
31+
To create your container app, start at the Azure portal home page.
32+
33+
1. Search for **Container Apps** in the top search bar.
34+
35+
1. Select **Container Apps** in the search results.
36+
37+
1. Select the **Create** button.
38+
39+
### Basics tab
40+
41+
In the *Basics* tab, do the following actions.
42+
43+
1. Enter the following values in the *Project details* section.
44+
45+
| Setting | Action |
46+
|---|---|
47+
| Subscription | Select your Azure subscription. |
48+
| Resource group | Select **Create new** and enter **my-container-apps**. |
49+
| Container app name | Enter **my-container-app**. |
50+
| Deployment source | Select **Container image**. |
51+
52+
1. Enter the following values in the "Container Apps Environment" section.
53+
54+
| Setting | Action |
55+
|---|---|
56+
| Region | Select a region near you. |
57+
| Container Apps Environment | Use the default value. |
58+
59+
1. Select the **Container** tab.
60+
61+
1. Select *Use quickstart image*.
3362

3463
<!-- Deploy the container app -->
3564
[!INCLUDE [container-apps-create-portal-deploy.md](../../includes/container-apps-create-portal-deploy.md)]

articles/container-apps/tutorial-java-quarkus-connect-managed-identity-postgresql-database.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.devlang: java
55
author: KarlErickson
66
ms.topic: tutorial
77
ms.author: karler
8-
ms.service: container-apps
8+
ms.service: azure-container-apps
99
ms.date: 06/04/2024
1010
ms.custom: devx-track-azurecli, devx-track-extended-java, devx-track-java, devx-track-javaee, devx-track-javaee-quarkus, passwordless-java, service-connector, devx-track-javaee-quarkus-aca
1111
---

articles/container-registry/container-registry-java-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: KarlErickson
55
ms.author: karler
66
ms.date: 10/31/2023
77
ms.topic: quickstart
8-
ms.service: container-registry
8+
ms.service: azure-container-registry
99
ms.custom: devx-track-java, devx-track-azurecli, mode-api, devx-track-extended-java
1010
---
1111

-2.72 KB
Loading

articles/defender-for-cloud/TOC.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,12 @@
11581158
href: episode-forty-six.md
11591159
- name: Vulnerability management in Defender CSPM
11601160
href: episode-forty-seven.md
1161+
- name: Microsoft CNAPP solution
1162+
displayName: CNAPP
1163+
href: episode-forty-eight.md
1164+
- name: Microsoft Copilot for Security integration
1165+
displayName: Copilot, security
1166+
href: episode-forty-nine.md
11611167
- name: Manage user data
11621168
href: privacy.md
11631169
- name: Microsoft Defender for IoT documentation

0 commit comments

Comments
 (0)