Skip to content

Commit bafaad1

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into synapse-workspace-quickstarts
2 parents 9392463 + 552daba commit bafaad1

File tree

1,939 files changed

+13150
-9814
lines changed

Some content is hidden

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

1,939 files changed

+13150
-9814
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,6 @@
12891289
".openpublishing.redirection.azure-databricks.json",
12901290
".openpublishing.redirection.azure-datalake-storage-gen1.json",
12911291
".openpublishing.redirection.azure-hpc.json",
1292-
".openpublishing.redirection.azure-kubernetes-service.json",
12931292
".openpublishing.redirection.azure-monitor.json",
12941293
".openpublishing.redirection.azure-percept.json",
12951294
".openpublishing.redirection.azure-productivity.json",
@@ -1337,7 +1336,6 @@
13371336
"articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
13381337
"articles/ai-services.openpublishing.redirection.ai-services.json",
13391338
"articles/ai-studio/.openpublishing.redirection.ai-studio.json",
1340-
"articles/aks/.openpublishing.redirection.aks.json",
13411339
"articles/analysis-services/.openpublishing.redirection.analysis-services.json",
13421340
"articles/application-gateway/.openpublishing.redirection.application-gateway.json",
13431341
"articles/automation/.openpublishing.redirection.automation.json",

.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

.openpublishing.redirection.container-registry.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,16 @@
165165
"source_path": "articles/container-registry/monitor-service-reference.md",
166166
"redirect_url": "/azure/container-registry/monitor-container-registry-reference",
167167
"redirect_document_id": true
168+
},
169+
{
170+
"source_path_from_root": "/articles/container-registry/container-registry-auth-aks.md",
171+
"redirect_url": "/azure/aks/cluster-container-registry-integration",
172+
"redirect_document_id": false
173+
},
174+
{
175+
"source_path_from_root": "/articles/container-service/kubernetes/container-service-kubernetes-jenkins.md",
176+
"redirect_url": "/azure/aks/jenkins-continuous-deployment",
177+
"redirect_document_id": false
168178
}
169179
]
170180
}

.openpublishing.redirection.json

Lines changed: 4607 additions & 4594 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.sentinel.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/sentinel/cef-name-mapping.md",
5+
"redirect_url": "/azure/sentinel/cef-syslog-ama-overview",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/sentinel/detect-threats-built-in.md#use-analytics-rule-templates",
510
"redirect_url": "/azure/sentinel/create-analytics-rule-from-template",

CODEOWNERS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Codeowners file
22
# Each line is a file pattern followed by one or more owners.
33

4-
# Specify owners for the aks folder
4+
# Folder paths in this list have been migrated to new repositories and content can no longer be created for these services in this repo.
55
/articles/aks @tynevi @thomps23
6+
/articles/defender-for-cloud @tynevi @thomps23
7+
/articles/attestation @tynevi @thomps23
8+
/articles/confidential-ledger @tynevi @thomps23
9+
/articles/dedicated-hsm @tynevi @thomps23
10+
/articles/key-vault @tynevi @thomps23
11+
/articles/payment-hsm @tynevi @thomps23

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,9 @@ These models can only be used with Embedding API requests.
276276
| `gpt-35-turbo` (1106) | East US2 <br> North Central US <br> Sweden Central <br> Switzerland West | Input: 16,385<br> Output: 4,096 | Sep 2021|
277277
| `gpt-35-turbo` (0125) | East US2 <br> North Central US <br> Sweden Central <br> Switzerland West | 16,385 | Sep 2021 |
278278
| `gpt-4` (0613) <sup>**1**</sup> | North Central US <br> Sweden Central | 8192 | Sep 2021 |
279+
| `gpt-4o-mini` <sup>**1**</sup> (2024-07-18) | North Central US <br> Sweden Central | Input: 128,000 <br> Output: 16,384 <br> Training example context length: 64,536 | Oct 2023 |
279280

280-
**<sup>1</sup>** GPT-4 fine-tuning is currently in public preview. See our [GPT-4 fine-tuning safety evaluation guidance](/azure/ai-services/openai/how-to/fine-tuning?tabs=turbo%2Cpython-new&pivots=programming-language-python#safety-evaluation-gpt-4-fine-tuning---public-preview) for more information.
281+
**<sup>1</sup>** GPT-4 and GPT-4o mini fine-tuning is currently in public preview. See our [GPT-4 & GPT-4o mini fine-tuning safety evaluation guidance](/azure/ai-services/openai/how-to/fine-tuning?tabs=turbo%2Cpython-new&pivots=programming-language-python#safety-evaluation-gpt-4-fine-tuning---public-preview) for more information.
281282

282283
### Whisper models
283284

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -349,18 +349,20 @@ You can deploy to a standalone Teams app directly from Azure OpenAI Studio. Foll
349349

350350
1. Provision your app: (detailed instructions in [Provision cloud resources](/microsoftteams/platform/toolkit/provision))
351351

352-
1. Assign the **Cognitive Service OpenAI User** role to your deployed App Service resource
353-
1. Go to the Azure portal and select the newly created Azure App Service resource
354-
1. Go to **settings** -> **identity** -> **enable system assigned identity**
355-
1. Select **Azure role assignments** and then **add role assignments**. Specify the following parameters:
356-
* Scope: resource group
357-
* Subscription: the subscription of your Azure OpenAI resource
358-
* Resource group of your Azure OpenAI resource
359-
* Role: **Cognitive Service OpenAI user**
352+
1. Assign the **Cognitive Service OpenAI User** role to your deployed **User Assigned Managed Identity** resource of your custom copilot.
353+
1. Go to the Azure portal and select the newly created **User Assigned Managed Identity** resource for your custom copilot.
354+
1. Go to **Azure Role Assignments**.
355+
1. Select **add role assignment**. Specify the following parameters:
356+
* Scope: resource group
357+
* Subscription: the subscription of your Azure OpenAI resource
358+
* Resource group of your Azure OpenAI resource
359+
* Role: **Cognitive Service OpenAI user**
360360

361361
1. Deploy your app to Azure by following the instructions in [Deploy to the cloud](/microsoftteams/platform/toolkit/deploy).
362362

363363
1. Publish your app to Teams by following the instructions in [Publish Teams app](/microsoftteams/platform/toolkit/publish).
364+
> [!IMPORTANT]
365+
> Your Teams app is intended for use within the same tenant of your Azure account used during setup, as it is securely configured by default for single-tenant usage. Using this app with a Teams account not associated with the Azure tenant used during setup will result in an error.
364366
365367
The README file in your Teams app has additional details and tips. Also, see [Tutorial - Build Custom Copilot using Teams](/microsoftteams/platform/teams-ai-library-tutorial) for guided steps.
366368

articles/ai-services/openai/how-to/fine-tuning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: nitinme
77
ms.service: azure-ai-openai
88
ms.custom: build-2023, build-2023-dataai, devx-track-python
99
ms.topic: how-to
10-
ms.date: 07/25/2024
10+
ms.date: 08/02/2024
1111
author: mrbullwinkle
1212
ms.author: mbullwin
1313
zone_pivot_groups: openai-fine-tuning-new

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ The following models support fine-tuning:
3131
- `gpt-35-turbo` (0613)
3232
- `gpt-35-turbo` (1106)
3333
- `gpt-35-turbo` (0125)
34-
- `gpt-4` (0613)**<sup>*</sup>**
34+
- `gpt-4` (0613)**<sup>*</sup>**
35+
- `gpt-4o-mini` (2024-07-18)**<sup>*</sup>**
3536

3637
**<sup>*</sup>** Fine-tuning for this model is currently in public preview.
3738

0 commit comments

Comments
 (0)