Skip to content

Commit 76b7d6d

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ade-private-repos-terraform
2 parents 687a018 + 329e8c1 commit 76b7d6d

File tree

2,370 files changed

+17825
-11524
lines changed

Some content is hidden

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

2,370 files changed

+17825
-11524
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.api-management.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/api-management/api-management-in-workspace.md",
5+
"redirect_url": "/azure/api-management/how-to-create-workspace",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/api-management/set-graphql-resolver-policy.md",
510
"redirect_url": "/previous-versions/azure/api-management/set-graphql-resolver-policy",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-functions/durable/durable-functions-configure-durable-functions-with-credentials.md",
5+
"redirect_url": "/azure/azure-functions/durable/durable-functions-configure-managed-identity",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.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/content-safety/studio-quickstart.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ In this quickstart, get started with the Azure AI Content Safety service using C
2323

2424
* An active Azure account. If you don't have one, you can [create one for free](https://azure.microsoft.com/free/cognitive-services/).
2525
* A [Content Safety](https://aka.ms/acs-create) Azure resource.
26-
* Assign `Cognitive Services User` role to your account to ensure the studio experience. Go to [Azure portal](https://portal.azure.com/), navigate to your Content Safety resource or Azure AI Services resource, and select **Access Control** in the left navigation bar, then click **+ Add role assignment**, choose the `Cognitive Services User` role and select the member of your account that you need to assign this role to, then review and assign. It might take few minutes for the assignment to take effect.
26+
* Assign `Cognitive Services User` role to your account. Go to the [Azure Portal](https://portal.azure.com/), navigate to your Content Safety resource or Azure AI Services resource, and select **Access Control** in the left navigation bar, then select **+ Add role assignment**, choose the `Cognitive Services User` role and select the member of your account that you need to assign this role to, then review and assign. It might take few minutes for the assignment to take effect.
2727
* Sign in to [Content Safety Studio](https://contentsafety.cognitive.azure.com) with your Azure subscription and Content Safety resource.
2828

29+
> [!IMPORTANT]
30+
> * You must assign the `Cognitive Services User` role to your Azure account to use the studio experience. Go to the [Azure Portal](https://portal.azure.com/), navigate to your Content Safety resource or Azure AI Services resource, and select **Access Control** in the left navigation bar, then select **+ Add role assignment**, choose the `Cognitive Services User` role and select the member of your account that you need to assign this role to, then review and assign. It might take few minutes for the assignment to take effect.
31+
2932

3033
## Analyze text content
3134
The [Moderate text content](https://contentsafety.cognitive.azure.com/text) page provides capability for you to quickly try out text moderation.

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,28 @@ For more information on Provisioned deployments, see our [Provisioned guidance](
202202

203203
- eastus
204204

205+
206+
### Global batch model availability
207+
208+
### Region and model support
209+
210+
The following models support global batch:
211+
212+
| Model | Version | Input format |
213+
|---|---|
214+
|`gpt-4o` | 2024-05-13 |text + image |
215+
|`gpt-4` | turbo-2024-04-09 | text |
216+
|`gpt-4` | 0613 | text |
217+
| `gpt-35-turbo` | 0125 | text |
218+
| `gpt-35-turbo` | 1106 | text |
219+
| `gpt-35-turbo` | 0613 | text |
220+
221+
Global batch is currently supported in the following regions:
222+
223+
- East US
224+
- West US
225+
- Sweden Central
226+
205227
### GPT-4 and GPT-4 Turbo model availability
206228

207229
#### Public cloud regions
@@ -276,8 +298,9 @@ These models can only be used with Embedding API requests.
276298
| `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|
277299
| `gpt-35-turbo` (0125) | East US2 <br> North Central US <br> Sweden Central <br> Switzerland West | 16,385 | Sep 2021 |
278300
| `gpt-4` (0613) <sup>**1**</sup> | North Central US <br> Sweden Central | 8192 | Sep 2021 |
301+
| `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 |
279302

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.
303+
**<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.
281304

282305
### Whisper models
283306

0 commit comments

Comments
 (0)