Skip to content

Commit 1fc36a4

Browse files
pauljewellmsftpauljewellmsft
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into retry-java
2 parents 096a791 + 76ea992 commit 1fc36a4

File tree

492 files changed

+6621
-5377
lines changed

Some content is hidden

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

492 files changed

+6621
-5377
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,12 +351,6 @@
351351
"redirect_url": "/cli/azure/aks#az_aks_create",
352352
"redirect_document_id": false
353353
},
354-
{
355-
"source_path_from_root": "/articles/aks/delete-cluster.md",
356-
"redirect_url": "/cli/azure/aks#az_aks_delete",
357-
"redirect_document_id": false
358-
},
359-
360354
{
361355
"source_path": "articles/aks/view-master-logs.md",
362356
"redirect_url": "/azure/aks/view-control-plane-logs",

‎.openpublishing.redirection.sentinel.json

Lines changed: 433 additions & 13 deletions
Large diffs are not rendered by default.

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

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

‎articles/ai-services/openai/includes/model-matrix/standard-embeddings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: include
88
ms.date: 03/13/2024
99
---
1010

11-
| `Region` | `text-embedding-ada-002`, `1` | `text-embedding-ada-002`, `2` | `text-embedding-3-small`, `1` | `text-embedding-3-large`, `1` |
11+
| **Region** | **text-embedding-ada-002**, **1** | **text-embedding-ada-002**, **2** | **text-embedding-3-small**, **1** | **text-embedding-3-large**, **1** |
1212
|:-----------------|:---------------------------------:|:---------------------------------:|:---------------------------------:|:---------------------------------:|
1313
| australiaeast | - | ✅ | - | - |
1414
| brazilsouth | - | ✅ | - | - |

‎articles/ai-services/openai/includes/model-matrix/standard-gpt-35-turbo.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: include
88
ms.date: 03/13/2024
99
---
1010

11-
| `Region` | `gpt-35-turbo`, `0301` | `gpt-35-turbo`, `0613` | `gpt-35-turbo`, `1106` | `gpt-35-turbo`, `0125` | `gpt-35-turbo-16k`, `0613` | `gpt-35-turbo-instruct`, `0914` |
11+
| **Region** | **gpt-35-turbo**, **0301** | **gpt-35-turbo**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** | **gpt-35-turbo-16k**, **0613** | **gpt-35-turbo-instruct**, **0914** |
1212
|:-----------------|:--------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|:------------------------------:|:-----------------------------------:|
1313
| australiaeast | - | ✅ | ✅ | - | ✅ | - |
1414
| canadaeast | - | ✅ | ✅ | ✅ | ✅ | - |

‎articles/ai-services/openai/includes/model-matrix/standard-gpt-4.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: include
88
ms.date: 03/13/2024
99
---
1010

11-
| `Region` | `gpt-4`, `0613` | `gpt-4`, `1106-Preview` | `gpt-4`, `0125-Preview` | `gpt-4`, `vision-preview` | `gpt-4-32k`, `0613` |
11+
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **vision-preview** | **gpt-4-32k**, **0613** |
1212
|:-----------------|:-------------------:|:---------------------------:|:---------------------------:|:-----------------------------:|:-----------------------:|
1313
| australiaeast | ✅ | ✅ | - | ✅ | ✅ |
1414
| canadaeast | ✅ | ✅ | - | - | ✅ |
@@ -22,5 +22,5 @@ ms.date: 03/13/2024
2222
| southindia | - | ✅ | - | - | - |
2323
| swedencentral | ✅ | ✅ | - | ✅ | ✅ |
2424
| switzerlandnorth | ✅ | - | - | ✅ | ✅ |
25-
| uksouth | - | ✅ | - | - | - |
26-
| westus | - | ✅ | - | ✅ | - |
25+
| uksouth | - | ✅ | ✅ | - | - |
26+
| westus | - | ✅ | - | ✅ | - |

‎articles/ai-services/openai/includes/model-matrix/standard-models.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 03/28/2024
99
---
1010

1111

12-
| `Region` | `gpt-4`, `0613` | `gpt-4`, `1106-Preview` | `gpt-4`, `0125-Preview` | `gpt-4`, `vision-preview` | `gpt-4-32k`, `0613` | `gpt-35-turbo`, `0301` | `gpt-35-turbo`, `0613` | `gpt-35-turbo`, `1106` | `gpt-35-turbo`, `0125` | `gpt-35-turbo-16k`, `0613` | `gpt-35-turbo-instruct`, `0914` | `text-embedding-ada-002`, `1` | `text-embedding-ada-002`, `2` | `text-embedding-3-small`, `1` | `text-embedding-3-large`, `1` | `babbage-002`, `1` | `dall-e-3`, `3.0` | `davinci-002`, `1` | `tts`, `001` | `tts-hd`, `001` | `whisper`, `001` |
12+
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **vision-preview** | **gpt-4-32k**, **0613** | **gpt-35-turbo**, **0301** | **gpt-35-turbo**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** | **gpt-35-turbo-16k**, **0613** | **gpt-35-turbo-instruct**, **0914** | **text-embedding-ada-002**, **1** | **text-embedding-ada-002**, **2** | **text-embedding-3-small**, **1** | **text-embedding-3-large**, **1** | **babbage-002**, **1** | **dall-e-3**, **3.0** | **davinci-002**, **1** | **tts**, **001** | **tts-hd**, **001** | **whisper**, **001** |
1313
|:-----------------|:-------------------:|:---------------------------:|:---------------------------:|:-----------------------------:|:-----------------------:|:--------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|:------------------------------:|:-----------------------------------:|:---------------------------------:|:---------------------------------:|:---------------------------------:|:---------------------------------:|:----------------------:|:---------------------:|:----------------------:|:----------------:|:-------------------:|:--------------------:|
1414
| australiaeast | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | - | - | ✅ | - | - | - | ✅ | - | - | - | - |
1515
| brazilsouth | - | - | - | - | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |
@@ -25,7 +25,7 @@ ms.date: 03/28/2024
2525
| southindia | - | ✅ | - | - | - | - | - | ✅ | - | - | - | - | ✅ | - | - | - | - | - | - | - | ✅ |
2626
| swedencentral | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | ✅ | - | ✅ | - | - | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
2727
| switzerlandnorth | ✅ | - | - | ✅ | ✅ | - | ✅ | - | - | ✅ | - | - | ✅ | - | - | - | - | - | - | - | - |
28-
| uksouth | - | ✅ | - | - | - | ✅ | ✅ | ✅ | - | ✅ | - | - | ✅ | - | - | - | - | - | - | - | - |
28+
| uksouth | - | ✅ | ✅ | - | - | ✅ | ✅ | ✅ | - | ✅ | - | - | ✅ | - | - | - | - | - | - | - | - |
2929
| westeurope | - | - | - | - | - | ✅ | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | ✅ |
3030
| westus | - | ✅ | - | ✅ | - | - | - | ✅ | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |
31-
| westus3 | - | - | - | - | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |
31+
| westus3 | - | - | - | - | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |

‎articles/ai-services/openai/media/use-your-data/azure-databases-and-ai-search.png

228 KB
Loading

‎articles/ai-studio/how-to/deploy-models-llama.md

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,41 @@ If you need to deploy a different model, [deploy it to real-time endpoints](#dep
5656

5757
### Prerequisites
5858

59+
# [Meta Llama 3](#tab/llama-three)
60+
61+
- 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.
62+
- An [Azure AI hub resource](../how-to/create-azure-ai-resource.md).
63+
64+
> [!IMPORTANT]
65+
> For Meta Llama 3 models, the pay-as-you-go model deployment offering is only available with AI hubs created in **East US 2** and **Sweden Central** regions.
66+
67+
- An [Azure AI project](../how-to/create-projects.md) in Azure AI Studio.
68+
- Azure role-based access controls (Azure RBAC) are used to grant access to operations in Azure AI Studio. To perform the steps in this article, your user account must be assigned the __owner__ or __contributor__ role for the Azure subscription. Alternatively, your account can be assigned a custom role that has the following permissions:
69+
70+
- On the Azure subscription—to subscribe the Azure AI project to the Azure Marketplace offering, once for each project, per offering:
71+
- `Microsoft.MarketplaceOrdering/agreements/offers/plans/read`
72+
- `Microsoft.MarketplaceOrdering/agreements/offers/plans/sign/action`
73+
- `Microsoft.MarketplaceOrdering/offerTypes/publishers/offers/plans/agreements/read`
74+
- `Microsoft.Marketplace/offerTypes/publishers/offers/plans/agreements/read`
75+
- `Microsoft.SaaS/register/action`
76+
77+
- On the resource group—to create and use the SaaS resource:
78+
- `Microsoft.SaaS/resources/read`
79+
- `Microsoft.SaaS/resources/write`
80+
81+
- On the Azure AI project—to deploy endpoints (the Azure AI Developer role contains these permissions already):
82+
- `Microsoft.MachineLearningServices/workspaces/marketplaceModelSubscriptions/*`
83+
- `Microsoft.MachineLearningServices/workspaces/serverlessEndpoints/*`
84+
85+
For more information on permissions, see [Role-based access control in Azure AI Studio](../concepts/rbac-ai-studio.md).
86+
87+
# [Meta Llama 2](#tab/llama-two)
88+
5989
- 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.
6090
- An [Azure AI hub resource](../how-to/create-azure-ai-resource.md).
6191

6292
> [!IMPORTANT]
63-
> For Meta Llama models, the pay-as-you-go model deployment offering is only available with AI hubs created in **East US 2** and **West US 3** regions.
93+
> For Meta Llama 2 models, the pay-as-you-go model deployment offering is only available with AI hubs created in **East US 2** and **West US 3** regions.
6494
6595
- An [Azure AI project](../how-to/create-projects.md) in Azure AI Studio.
6696
- Azure role-based access controls (Azure RBAC) are used to grant access to operations in Azure AI Studio. To perform the steps in this article, your user account must be assigned the __owner__ or __contributor__ role for the Azure subscription. Alternatively, your account can be assigned a custom role that has the following permissions:
@@ -82,6 +112,7 @@ If you need to deploy a different model, [deploy it to real-time endpoints](#dep
82112

83113
For more information on permissions, see [Role-based access control in Azure AI Studio](../concepts/rbac-ai-studio.md).
84114

115+
---
85116

86117
### Create a new deployment
87118

@@ -96,7 +127,7 @@ To create a deployment:
96127

97128
1. On the model's **Details** page, select **Deploy** and then select **Pay-as-you-go**.
98129

99-
1. Select the project in which you want to deploy your models. To use the pay-as-you-go model deployment offering, your workspace must belong to the **East US 2** region.
130+
1. Select the project in which you want to deploy your models. To use the pay-as-you-go model deployment offering, your workspace must belong to the **East US 2** or **Sweden Central** region.
100131
1. On the deployment wizard, select the link to **Azure Marketplace Terms** to learn more about the terms of use. You can also select the **Marketplace offer details** tab to learn about pricing for the selected model.
101132
1. If this is your first time deploying the model in the project, you have to subscribe your project for the particular offering (for example, Meta-Llama-3-70B) from Azure Marketplace. This step requires that your account has the Azure subscription permissions and resource group permissions listed in the prerequisites. Each project has its own subscription to the particular Azure Marketplace offering, which allows you to control and monitor spending. Select **Subscribe and Deploy**.
102133

‎articles/aks/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@
246246
href: scale-cluster.md
247247
- name: Stop and start an AKS cluster
248248
href: start-stop-cluster.md
249+
- name: Delete an AKS cluster
250+
href: delete-cluster.md
249251
- name: Configure private clusters
250252
items:
251253
- name: Create a private cluster

0 commit comments

Comments
 (0)