Skip to content

Commit 4107352

Browse files
TaojunshenTaojunshen
authored
Merge pull request #284775 from MicrosoftDocs/main
8/15/2024 AM Publish
2 parents b6fdb76 + 261f77d commit 4107352

File tree

49 files changed

+1151
-545
lines changed

Some content is hidden

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

49 files changed

+1151
-545
lines changed

‎articles/ai-services/openai/how-to/provisioned-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ When you deploy a specified number of provisioned throughput units (PTUs), a set
158158

159159
PTU deployment utilization = (PTUs consumed in the time period) / (PTUs deployed in the time period)
160160

161-
You can find the utilization measure in the Azure-Monitor section for your resource. To access the monitoring dashboards sign-in to [https://portal.azure.com](https://portal.azure.com), go to your Azure OpenAI resource and select the Metrics page from the left nav. On the metrics page, select the 'Provisioned-managed utilization' measure. If you have more than one deployment in the resource, you should also split the values by each deployment by clicking the 'Apply Splitting' button.
161+
You can find the utilization measure in the Azure-Monitor section for your resource. To access the monitoring dashboards sign-in to [https://portal.azure.com](https://portal.azure.com), go to your Azure OpenAI resource and select the Metrics page from the left nav. On the metrics page, select the 'Provisioned-managed utilization V2' metric. If you have more than one deployment in the resource, you should also split the values by each deployment by clicking the 'Apply Splitting' button.
162162

163163
:::image type="content" source="../media/provisioned/azure-monitor-utilization.jpg" alt-text="Screenshot of the provisioned managed utilization on the resource's metrics blade in the Azure portal." lightbox="../media/provisioned/azure-monitor-utilization.jpg":::
164164

‎articles/ai-services/openai/includes/api-versions/latest-inference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Get a vector representation of a given input that can be easily consumed by mach
164164

165165
| Name | Type | Description | Required | Default |
166166
|------|------|-------------|----------|---------|
167-
| input | string or array | Input text to get embeddings for, encoded as a string. To get embeddings for multiple inputs in a single request, pass an array of strings. Each input must not exceed 2048 tokens in length.<br>Unless you're embedding code, we suggest replacing newlines (\n) in your input with a single space, as we have observed inferior results when newlines are present. | Yes | |
167+
| input | string or array | Input text to get embeddings for, encoded as a string. To get embeddings for multiple inputs in a single request, pass an array of strings. Each array must not exceed 2048 inputs in length.<br>Unless you're embedding code, we suggest replacing newlines (\n) in your input with a single space, as we have observed inferior results when newlines are present. | Yes | |
168168
| user | string | A unique identifier representing your end-user, which can help monitoring and detecting abuse. | No | |
169169
| input_type | string | input type of embedding search to use | No | |
170170
| encoding_format | string | The format to return the embeddings in. Can be either `float` or `base64`. Defaults to `float`. | No | |

‎articles/api-management/validate-azure-ad-token-policy.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.author: danlep
1717
The `validate-azure-ad-token` policy enforces the existence and validity of a JSON web token (JWT) that was provided by the Microsoft Entra (formerly called Azure Active Directory) service for a specified set of principals in the directory. The JWT can be extracted from a specified HTTP header, query parameter, or value provided using a policy expression or context variable.
1818

1919
> [!NOTE]
20-
> To validate a JWT that was provided by another identity provider, API Management also provides the generic [`validate-jwt`](validate-jwt-policy.md) policy.
20+
> To validate a JWT that was provided by an identity provider other than Microsoft Entra, API Management also provides the generic [`validate-jwt`](validate-jwt-policy.md) policy.
2121
2222
[!INCLUDE [api-management-policy-generic-alert](../../includes/api-management-policy-generic-alert.md)]
2323

@@ -26,19 +26,19 @@ The `validate-azure-ad-token` policy enforces the existence and validity of a JS
2626

2727
```xml
2828
<validate-azure-ad-token
29-
tenant-id="tenant ID or URL (for example, "contoso.onmicrosoft.com") of the Azure Active Directory service"
29+
tenant-id="tenant ID or URL (for example, "https://contoso.onmicrosoft.com") of the Microsoft Entra ID tenant"
3030
header-name="name of HTTP header containing the token (alternatively, use query-parameter-name or token-value attribute to specify token)"
3131
query-parameter-name="name of query parameter used to pass the token (alternative, use header-name or token-value attribute to specify token)"
3232
token-value="expression returning the token as a string (alternatively, use header-name or query-parameter attribute to specify token)"
3333
failed-validation-httpcode="HTTP status code to return on failure"
3434
failed-validation-error-message="error message to return on failure"
3535
output-token-variable-name="name of a variable to receive a JWT object representing successfully validated token">
3636
<client-application-ids>
37-
<application-id>Client application ID from Azure Active Directory</application-id>
37+
<application-id>Client application ID from Microsoft Entra</application-id>
3838
<!-- If there are multiple client application IDs, then add additional application-id elements -->
3939
</client-application-ids>
4040
<backend-application-ids>
41-
<application-id>Backend application ID from Azure Active Directory</application-id>
41+
<application-id>Backend application ID from Microsoft Entra</application-id>
4242
<!-- If there are multiple backend application IDs, then add additional application-id elements -->
4343
</backend-application-ids>
4444
<audiences>
@@ -63,7 +63,7 @@ The `validate-azure-ad-token` policy enforces the existence and validity of a JS
6363

6464
| Attribute | Description | Required | Default |
6565
| ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- |
66-
| tenant-id | Tenant ID or URL of the Microsoft Entra service. Policy expressions are allowed.| Yes | N/A |
66+
| tenant-id | Tenant ID or URL of the Microsoft Entra ID tenant, or one of the following well-known tenants:<br/><br/> - `organizations` or `https://login.microsoftonline.com/organizations` - to allow tokens from accounts in any organizational directory (any Microsoft Entra directory)<br/>- `common` or `https://login.microsoftonline.com/common` - to allow tokens from accounts in any organizational directory (any Microsoft Entra directory) and from personal Microsoft accounts (for example, Skype, XBox)<br/><br/>Policy expressions are allowed.| Yes | N/A |
6767
| header-name | The name of the HTTP header holding the token. Policy expressions are allowed. | One of `header-name`, `query-parameter-name` or `token-value` must be specified. | `Authorization` |
6868
| query-parameter-name | The name of the query parameter holding the token. Policy expressions are allowed. | One of `header-name`, `query-parameter-name` or `token-value` must be specified. | N/A |
6969
| token-value | Expression returning a string containing the token. You must not return `Bearer` as part of the token value. Policy expressions are allowed. | One of `header-name`, `query-parameter-name` or `token-value` must be specified. | N/A |
@@ -121,12 +121,12 @@ The following policy is the minimal form of the `validate-azure-ad-token` policy
121121

122122
### Validate that audience and claim are correct
123123

124-
The following policy checks that the audience is the hostname of the API Management instance and that the `ctry` claim is `US`. The hostname is provided using a policy expression, and the Microsoft Entra tenant ID and client application ID are provided using named values. The decoded JWT is provided in the `jwt` variable after validation.
124+
The following policy checks that the audience is the hostname of the API Management instance and that the `ctry` claim is `US`. The Microsoft tenant ID is the well-known `organizations` tenant, which allows tokens from accounts in any organizational directory. The hostname is provided using a policy expression, and the client application ID is provided using a named value. The decoded JWT is provided in the `jwt` variable after validation.
125125

126126
For more details on optional claims, read [Provide optional claims to your app](../active-directory/develop/active-directory-optional-claims.md).
127127

128128
```xml
129-
<validate-azure-ad-token tenant-id="{{aad-tenant-id}}" output-token-variable-name="jwt">
129+
<validate-azure-ad-token tenant-id="organizations" output-token-variable-name="jwt">
130130
<client-application-ids>
131131
<application-id>{{aad-client-application-id}}</application-id>
132132
</client-application-ids>

‎articles/app-service/environment/overview.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,15 @@ App Service Environment v3 is available in the following regions:
141141
| France South | ✅ | | ✅ |
142142
| Germany North | ✅ | | ✅ |
143143
| Germany West Central | ✅ | ✅ | ✅ |
144+
| Israel Central | ✅ | ✅ | |
144145
| Italy North | ✅ | ✅** | |
145146
| Japan East | ✅ | ✅ | ✅ |
146147
| Japan West | ✅ | | ✅ |
147-
| Jio India West | | | ✅ |
148+
| Jio India Central | ✅** | | |
149+
| Jio India West | ✅** | | ✅ |
148150
| Korea Central | ✅ | ✅ | ✅ |
149-
| Korea South | ✅ | | ✅ |
151+
| Korea South | ✅ | | ✅ |
152+
| Mexico Central | ✅ | ✅** | |
150153
| North Central US | ✅ | | ✅ |
151154
| North Europe | ✅ | ✅ | ✅ |
152155
| Norway East | ✅ | ✅ | ✅ |
@@ -158,6 +161,7 @@ App Service Environment v3 is available in the following regions:
158161
| South Central US | ✅ | ✅ | ✅ |
159162
| South India | ✅ | | ✅ |
160163
| Southeast Asia | ✅ | ✅ | ✅ |
164+
| Spain Central | ✅ | ✅** | |
161165
| Sweden Central | ✅ | ✅ | |
162166
| Switzerland North | ✅ | ✅ | ✅ |
163167
| Switzerland West | ✅ | | ✅ |

‎articles/app-service/samples-bicep.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ To learn about the Bicep syntax and properties for App Services resources, see [
3131
| [App with a database, managed identity, and monitoring](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-managed-identity-sql-db)| Deploys an App Service App with a database, managed identity, and monitoring. |
3232
| [Two apps in separate regions with Azure Front Door](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/webapp-multi-region-front-door) | Deploys two identical web apps in separate regions with Azure Front Door to direct traffic. |
3333
|**App Service Environment**| **Description** |
34-
| [Create an App Service environment v2](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-asev2-create) | Creates an App Service environment v2 in your virtual network. |
34+
| [Create an App Service environment v3](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-asp-app-on-asev3-create) | Creates an App Service environment v3, App Service plan, App Service, and all associated networking resources. |

‎articles/app-service/samples-cli.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,3 @@ The following table includes links to bash scripts built using the Azure CLI.
4242
| [Backup and restore app](./scripts/cli-backup-schedule-restore.md) | Creates an App Service app and creates a one-time backup for it, creates a backup schedule for it, and then restores an App Service app from a backup. |
4343
|**Monitor app**||
4444
| [Monitor an app with web server logs](./scripts/cli-monitor.md) | Creates an App Service app, enables logging for it, and downloads the logs to your local machine. |
45-
| | |

‎articles/app-service/samples-powershell.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,4 @@ The following table includes links to PowerShell scripts built using the Azure P
3939
| [Restore an app from backup](./scripts/powershell-backup-restore.md?toc=%2fpowershell%2fmodule%2ftoc.json) | Restores an app from a previously completed backup. |
4040
| [Restore a backup across subscriptions](./scripts/powershell-backup-restore-diff-sub.md?toc=%2fpowershell%2fmodule%2ftoc.json) | Restores a web app from a backup in another subscription. |
4141
|**Monitor app**||
42-
| [Monitor an app with web server logs](./scripts/powershell-monitor.md?toc=%2fpowershell%2fmodule%2ftoc.json) | Creates an App Service app, enables logging for it, and downloads the logs to your local machine. |
43-
| | |
42+
| [Monitor an app with web server logs](./scripts/powershell-monitor.md?toc=%2fpowershell%2fmodule%2ftoc.json) | Creates an App Service app, enables logging for it, and downloads the logs to your local machine. |

‎articles/app-service/samples-resource-manager-templates.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,4 @@ To learn about the JSON syntax and properties for App Services resources, see [M
4343
| [App connected to a backend webapp with staging slots](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/webapp-secure-ntier)| Deploys two web apps (frontend and backend) with staging slots securely connected together with VNet injection and Private Endpoint. |
4444
| [Two apps in separate regions with Azure Front Door](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/webapp-multi-region-front-door) | Deploys two identical web apps in separate regions with Azure Front Door to direct traffic. |
4545
|**App Service Environment**| **Description** |
46-
| [Create an App Service environment v2](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-asev2-create) | Creates an App Service environment v2 in your virtual network. |
47-
| [Create an App Service environment v2 with an ILB address](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-asev2-ilb-create) | Creates an App Service environment v2 in your virtual network with a private internal load balancer address. |
48-
| [Configure the default SSL certificate for an ILB App Service environment or an ILB App Service environment v2](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-ase-ilb-configure-default-ssl) | Configures the default TLS/SSL certificate for an ILB App Service environment or an ILB App Service environment v2. |
49-
| | |
46+
| [Create an App Service environment v3](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-asp-app-on-asev3-create) | Creates an App Service environment v3, App Service plan, App Service, and all associated networking resources. |

‎articles/app-service/samples-terraform.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ The following table includes links to Terraform scripts.
2020
|**Create app**||
2121
| [Create two apps and connect securely with Private Endpoint and VNet integration](./scripts/terraform-secure-backend-frontend.md)| Creates two App Service apps and connect apps together with Private Endpoint and VNet integration. |
2222
| [Provision App Service and use slot swap to deploy](/azure/developer/terraform/provision-infrastructure-using-azure-deployment-slots)| Provision App Service infrastructure with Azure deployment slots. |
23-
| [Create an Azure Windows web app with a backup](./scripts/terraform-backup.md)| Create an Azure Windows web app with a backup schedule. |
24-
| | |
23+
| [Create an Azure Windows web app with a backup](./scripts/terraform-backup.md)| Create an Azure Windows web app with a backup schedule. |

0 commit comments

Comments
 (0)