Skip to content

Commit 9d74c89

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 14e628b + a363f71 commit 9d74c89

File tree

459 files changed

+1280
-1006
lines changed

Some content is hidden

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

459 files changed

+1280
-1006
lines changed

articles/ai-services/computer-vision/concept-model-customization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ The following table describes the limits on the scale of your custom model proje
8080
| Max # training images | 1,000,000 | 200,000 |
8181
| Max # evaluation images | 100,000 | 100,000 |
8282
| Min # training images per category | 2 | 2 |
83-
| Max # tags per image | multiclass: 1 | NA |
84-
| Max # regions per image | NA | 1,000 |
83+
| Max # tags per image | 1 | N/A |
84+
| Max # regions per image | N/A | 1,000 |
8585
| Max # categories | 2,500 | 1,000 |
8686
| Min # categories | 2 | 1 |
8787
| Max image size (Training) | 20 MB | 20 MB |

articles/ai-services/content-safety/overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ This documentation contains the following article types:
3030

3131
The following are a few scenarios in which a software developer or team would require a content moderation service:
3232

33+
- User prompts submitted to a generative AI service.
34+
- Content produced by generative AI models.
3335
- Online marketplaces that moderate product catalogs and other user-generated content.
3436
- Gaming companies that moderate user-generated game artifacts and chat rooms.
3537
- Social messaging platforms that moderate images and text added by their users.

articles/ai-services/openai/how-to/gpt-with-vision.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The following command shows the most basic way to use the GPT-4 Turbo with Visio
3030

3131
#### [REST](#tab/rest)
3232

33-
Send a POST request to `https://{RESOURCE_NAME}.openai.azure.com/openai/deployments/{DEPLOYMENT_NAME}/chat/completions?api-version=2023-12-01-preview` where
33+
Send a POST request to `https://{RESOURCE_NAME}.openai.azure.com/openai/deployments/{DEPLOYMENT_NAME}/chat/completions?api-version=2024-02-15-preview` where
3434

3535
- RESOURCE_NAME is the name of your Azure OpenAI resource
3636
- DEPLOYMENT_NAME is the name of your GPT-4 Turbo with Vision model deployment
@@ -88,12 +88,12 @@ The following is a sample request body. The format is the same as the chat compl
8888
api_base = '<your_azure_openai_endpoint>' # your endpoint should look like the following https://YOUR_RESOURCE_NAME.openai.azure.com/
8989
api_key="<your_azure_openai_key>"
9090
deployment_name = '<your_deployment_name>'
91-
api_version = '2023-12-01-preview' # this might change in the future
91+
api_version = '2024-02-15-preview' # this might change in the future
9292

9393
client = AzureOpenAI(
9494
api_key=api_key,
9595
api_version=api_version,
96-
base_url=f"{api_base}openai/deployments/{deployment_name}/extensions",
96+
base_url=f"{api_base}openai/deployments/{deployment_name}",
9797
)
9898
```
9999

@@ -265,7 +265,7 @@ The **object grounding** integration brings a new layer to data analysis and use
265265
266266
#### [REST](#tab/rest)
267267

268-
Send a POST request to `https://{RESOURCE_NAME}.openai.azure.com/openai/deployments/{DEPLOYMENT_NAME}/extensions/chat/completions?api-version=2023-12-01-preview` where
268+
Send a POST request to `https://{RESOURCE_NAME}.openai.azure.com/openai/deployments/{DEPLOYMENT_NAME}/chat/completions?api-version=2024-02-15-preview` where
269269

270270
- RESOURCE_NAME is the name of your Azure OpenAI resource
271271
- DEPLOYMENT_NAME is the name of your GPT-4 Turbo with Vision model deployment
@@ -577,7 +577,7 @@ To use a User assigned identity on your Azure AI Services resource, follow these
577577
578578
#### [REST](#tab/rest)
579579
580-
1. Prepare a POST request to `https://{RESOURCE_NAME}.openai.azure.com/openai/deployments/{DEPLOYMENT_NAME}/extensions/chat/completions?api-version=2023-12-01-preview` where
580+
1. Prepare a POST request to `https://{RESOURCE_NAME}.openai.azure.com/openai/deployments/{DEPLOYMENT_NAME}/chat/completions?api-version=2024-02-15-preview` where
581581
582582
- RESOURCE_NAME is the name of your Azure OpenAI resource
583583
- DEPLOYMENT_NAME is the name of your GPT-4 Vision model deployment

articles/ai-studio/how-to/deploy-models-mistral.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ Certain models in the model catalog can be deployed as a serverless API with pay
6464
- An [Azure AI Studio hub](../how-to/create-azure-ai-resource.md).
6565

6666
> [!IMPORTANT]
67-
> The serverless API model deployment offering for eligible models in the Mistral family is only available in hubs created in the **East US 2** and **Sweden Central** regions. For _Mistral Large_, the serverless API model deployment offering is also available in the **France Central** region.
68-
67+
> The serverless API model deployment offering for eligible models in the Mistral family is only available in hubs created in the **East US 2** and **Sweden Central** regions.
6968
- An [Azure AI Studio project](../how-to/create-projects.md).
7069
- 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 __Azure AI Developer role__ on the resource group. For more information on permissions, see [Role-based access control in Azure AI Studio](../concepts/rbac-ai-studio.md).
7170

@@ -94,7 +93,7 @@ To create a deployment:
9493

9594
:::image type="content" source="../media/deploy-monitor/mistral/mistral-large-deploy-pay-as-you-go.png" alt-text="A screenshot showing how to deploy a model as a serverless API." lightbox="../media/deploy-monitor/mistral/mistral-large-deploy-pay-as-you-go.png":::
9695

97-
1. Select the project in which you want to deploy your model. To deploy the Mistral model, your project must be in the *EastUS2* or *Sweden Central* region. For the Mistral Large model, you can also deploy in a project that's in the *France Central* region.
96+
1. Select the project in which you want to deploy your model. To deploy the Mistral model, your project must be in the *EastUS2* or *Sweden Central* region.
9897
1. In the deployment wizard, select the link to **Azure Marketplace Terms** to learn more about the terms of use.
9998
1. Select the **Pricing and terms** tab to learn about pricing for the selected model.
10099
1. Select the **Subscribe and Deploy** button. If this is your first time deploying the model in the project, you have to subscribe your project for the particular offering. This step requires that your account has the **Azure AI Developer role** permissions on the resource group, as listed in the prerequisites. Each project has its own subscription to the particular Azure Marketplace offering of the model, which allows you to control and monitor spending. Currently, you can have only one deployment for each model within a project.

articles/ai-studio/how-to/model-catalog-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Llama-3-70B-Instruct <br> Llama-3-8B-Instruct | [Microsoft Managed Countries](/p
136136
Llama-2-7b <br> Llama-2-13b <br> Llama-2-70b | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US, East US 2, North Central US, South Central US, West US, West US 3 | West US 3
137137
Llama-2-7b-chat <br> Llama-2-13b-chat <br> Llama-2-70b-chat | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US, East US 2, North Central US, South Central US, West US, West US 3, | Not available
138138
Mistral Small | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US, East US 2, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
139-
Mistral-Large | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) <br> Brazil <br> Hong Kong <br> Israel| East US, East US 2, France Central, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
139+
Mistral-Large | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) <br> Brazil <br> Hong Kong <br> Israel| East US, East US 2, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
140140
Cohere-command-r-plus <br> Cohere-command-r <br> Cohere-embed-v3-english <br> Cohere-embed-v3-multilingual | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) <br> Japan | East US, East US 2, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
141141
TimeGEN-1 | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) <br> Mexico <br> Israel| East US, East US 2, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available
142142
jais-30b-chat | [Microsoft Managed Countries](/partner-center/marketplace/tax-details-marketplace#microsoft-managed-countriesregions) | East US, East US 2, North Central US, South Central US, Sweden Central, West US, West US 3 | Not available

articles/app-service/environment/how-to-custom-domain-suffix.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,18 @@ If you choose to use Azure role-based access control to manage access to your ke
6161

6262
### Certificate
6363

64-
The certificate for custom domain suffix must be stored in an Azure Key Vault. The certificate must be uploaded in .PFX format and be smaller than 20 kb. Certificates in .PEM format aren't supported at this time. App Service Environment uses the managed identity you selected to get the certificate. The key vault can be accessed publicly or through a [private endpoint](../../private-link/private-endpoint-overview.md) accessible from the subnet that the App Service Environment is deployed to. To learn how to configure a private endpoint, see [Integrate Key Vault with Azure Private Link](../../key-vault/general/private-link-service.md). In the case of public access, you can secure your key vault to only accept traffic from the outbound IP addresses of the App Service Environment.
65-
66-
:::image type="content" source="./media/custom-domain-suffix/key-vault-networking.png" alt-text="Screenshot of a sample networking page for key vault to allow custom domain suffix feature.":::
64+
The certificate for custom domain suffix must be stored in an Azure Key Vault. The certificate must be uploaded in .PFX format and be smaller than 20 kb. Certificates in .PEM format aren't supported at this time. App Service Environment uses the managed identity you selected to get the certificate.
6765

6866
Your certificate must be a wildcard certificate for the selected custom domain name. For example, *internal.contoso.com* would need a certificate covering **.internal.contoso.com*. If the certificate used by the custom domain suffix contains a Subject Alternate Name (SAN) entry for scm, for example **.scm.internal.contoso.com*, the scm site is also available using the custom domain suffix.
6967

7068
If you rotate your certificate in Azure Key Vault, the App Service Environment picks up the change within 24 hours.
7169

70+
### Network access to Key Vault
71+
72+
The key vault can be accessed publicly or through a [private endpoint](../../private-link/private-endpoint-overview.md) accessible from the subnet that the App Service Environment is deployed to. To learn how to configure a private endpoint, see [Integrate Key Vault with Azure Private Link](../../key-vault/general/private-link-service.md). If you use public access, you can secure your key vault to only accept traffic from the outbound IP address of the App Service Environment. The App Service Environment uses the platform outbound IP address as the source address when accessing the key vault. You can find the IP address in the IP Addresses page in Azure portal.
73+
74+
:::image type="content" source="./media/custom-domain-suffix/platform-outbound-ip.png" alt-text="Screenshot of IP Addresses page in Azure portal.":::
75+
7276
::: zone pivot="experience-azp"
7377

7478
## Use the Azure portal to configure custom domain suffix
49.1 KB
Loading

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-azure-portal-pivot.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,28 +125,32 @@ Congratulations, you've successfully completed this quickstart.
125125
The App Service app pulls from the container registry every time it starts. If you rebuild your image, you just need to push it to your container registry, and the app pulls in the updated image when it restarts. To tell your app to pull in the updated image immediately, restart it.
126126
127127
> [!div class="nextstepaction"]
128-
> [Secure with custom domain and certificate](../../tutorial-secure-domain-certificate.md)
128+
> [Configure custom container](../../configure-custom-container.md)
129129
130130
> [!div class="nextstepaction"]
131-
> [Migrate to Windows container in Azure](../../tutorial-custom-container.md)
131+
> [How to use managed identities for App Service and Azure Functions](../../overview-managed-identity.md)
132132
133133
> [!div class="nextstepaction"]
134-
> [Integrate your app with an Azure virtual network](../../overview-vnet-integration.md)
134+
> [Application monitoring for Azure App Service overview](/azure/azure-monitor/app/azure-web-apps)
135135
136136
> [!div class="nextstepaction"]
137-
> [Use Private Endpoints for App Service apps](../../networking/private-endpoint.md)
137+
> [Azure Monitor overview](/azure/azure-monitor/overview)
138138
139139
> [!div class="nextstepaction"]
140-
> [Azure Monitor overview](/azure/azure-monitor/overview)
140+
> [Secure with custom domain and certificate](../../tutorial-secure-domain-certificate.md)
141141
142142
> [!div class="nextstepaction"]
143-
> [Application monitoring for Azure App Service overview](/azure/azure-monitor/app/azure-web-apps)
143+
> [Integrate your app with an Azure virtual network](../../overview-vnet-integration.md)
144144
145145
> [!div class="nextstepaction"]
146-
> [How to use managed identities for App Service and Azure Functions](../../overview-managed-identity.md)
146+
> [Use Private Endpoints for App Service apps](../../networking/private-endpoint.md)
147147
148148
> [!div class="nextstepaction"]
149-
> [Configure custom container](../../configure-custom-container.md)
149+
> [Migrate to Windows container in Azure](../../tutorial-custom-container.md)
150+
151+
> [!div class="nextstepaction"]
152+
> [Deploy a container with Azure Pipelines](../../deploy-container-azure-pipelines.md)
150153
151154
> [!div class="nextstepaction"]
152-
> [Sidecar container tutorial](../../tutorial-custom-container-sidecar.md)
155+
> [Deploy a container with GitHub Actions](../../deploy-container-github-action.md)
156+

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-cli-pivot.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,31 +83,34 @@ Congratulations, you've successfully completed this quickstart.
8383
The App Service app pulls from the container registry every time it starts. If you rebuild your image, you just need to push it to your container registry, and the app pulls in the updated image when it restarts. To tell your app to pull in the updated image immediately, restart it.
8484

8585
> [!div class="nextstepaction"]
86-
> [Secure with custom domain and certificate](../../tutorial-secure-domain-certificate.md)
86+
> [Configure custom container](../../configure-custom-container.md)
8787
8888
> [!div class="nextstepaction"]
89-
> [Migrate to Windows container in Azure](../../tutorial-custom-container.md)
89+
> [How to use managed identities for App Service and Azure Functions](../../overview-managed-identity.md)
9090
9191
> [!div class="nextstepaction"]
92-
> [Integrate your app with an Azure virtual network](../../overview-vnet-integration.md)
92+
> [Application monitoring for Azure App Service overview](/azure/azure-monitor/app/azure-web-apps)
9393
9494
> [!div class="nextstepaction"]
95-
> [Use Private Endpoints for App Service apps](../../networking/private-endpoint.md)
95+
> [Azure Monitor overview](/azure/azure-monitor/overview)
9696
9797
> [!div class="nextstepaction"]
98-
> [Azure Monitor overview](/azure/azure-monitor/overview)
98+
> [Secure with custom domain and certificate](../../tutorial-secure-domain-certificate.md)
9999
100100
> [!div class="nextstepaction"]
101-
> [Application monitoring for Azure App Service overview](/azure/azure-monitor/app/azure-web-apps)
101+
> [Integrate your app with an Azure virtual network](../../overview-vnet-integration.md)
102102
103103
> [!div class="nextstepaction"]
104-
> [How to use managed identities for App Service and Azure Functions](../../overview-managed-identity.md)
104+
> [Use Private Endpoints for App Service apps](../../networking/private-endpoint.md)
105105
106106
> [!div class="nextstepaction"]
107-
> [Configure custom container](../../configure-custom-container.md)
107+
> [Migrate to Windows container in Azure](../../tutorial-custom-container.md)
108+
109+
> [!div class="nextstepaction"]
110+
> [Deploy a container with Azure Pipelines](../../deploy-container-azure-pipelines.md)
108111
109112
> [!div class="nextstepaction"]
110-
> [Sidecar container tutorial](../../tutorial-custom-container-sidecar.md)
113+
> [Deploy a container with GitHub Actions](../../deploy-container-github-action.md)
111114
112115

113116
<!-- LINKS - internal -->

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-powershell-pivot.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,28 +83,32 @@ Congratulations, you've successfully completed this quickstart.
8383
The App Service app pulls from the container registry every time it starts. If you rebuild your image, you just need to push it to your container registry, and the app pulls in the updated image when it restarts. To tell your app to pull in the updated image immediately, restart it.
8484

8585
> [!div class="nextstepaction"]
86-
> [Secure with custom domain and certificate](../../tutorial-secure-domain-certificate.md)
86+
> [Configure custom container](../../configure-custom-container.md)
8787
8888
> [!div class="nextstepaction"]
89-
> [Migrate to Windows container in Azure](../../tutorial-custom-container.md)
89+
> [How to use managed identities for App Service and Azure Functions](../../overview-managed-identity.md)
9090
9191
> [!div class="nextstepaction"]
92-
> [Integrate your app with an Azure virtual network](../../overview-vnet-integration.md)
92+
> [Application monitoring for Azure App Service overview](/azure/azure-monitor/app/azure-web-apps)
9393
9494
> [!div class="nextstepaction"]
95-
> [Use Private Endpoints for App Service apps](../../networking/private-endpoint.md)
95+
> [Azure Monitor overview](/azure/azure-monitor/overview)
9696
9797
> [!div class="nextstepaction"]
98-
> [Azure Monitor overview](/azure/azure-monitor/overview)
98+
> [Secure with custom domain and certificate](../../tutorial-secure-domain-certificate.md)
9999
100100
> [!div class="nextstepaction"]
101-
> [Application monitoring for Azure App Service overview](/azure/azure-monitor/app/azure-web-apps)
101+
> [Integrate your app with an Azure virtual network](../../overview-vnet-integration.md)
102102
103103
> [!div class="nextstepaction"]
104-
> [How to use managed identities for App Service and Azure Functions](../../overview-managed-identity.md)
104+
> [Use Private Endpoints for App Service apps](../../networking/private-endpoint.md)
105105
106106
> [!div class="nextstepaction"]
107-
> [Configure custom container](../../configure-custom-container.md)
107+
> [Migrate to Windows container in Azure](../../tutorial-custom-container.md)
108+
109+
> [!div class="nextstepaction"]
110+
> [Deploy a container with Azure Pipelines](../../deploy-container-azure-pipelines.md)
108111
109112
> [!div class="nextstepaction"]
110-
> [Sidecar container tutorial](../../tutorial-custom-container-sidecar.md)
113+
> [Deploy a container with GitHub Actions](../../deploy-container-github-action.md)
114+

0 commit comments

Comments
 (0)