Skip to content

Commit 91192c4

Browse files
authored
Merge branch 'release-aio-m2' into release-aio-m2
2 parents 4ee7870 + ec411bb commit 91192c4

File tree

1,416 files changed

+9462
-9932
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,416 files changed

+9462
-9932
lines changed

.openpublishing.redirection.json

Lines changed: 94 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/application-gateway/powershell-samples.md",
5+
"redirect_url": "/previous-versions/azure/application-gateway/powershell-samples",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/update-manager/troubleshooter-known-issues.md",
10+
"redirect_url": "/azure/update-manager/troubleshoot",
11+
12+
"redirect_document_id": false
13+
},
14+
{
15+
"source_path": "articles/storage/blobs/storage-blob-scalable-app-create-vm.md",
16+
"redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-create-vm",
17+
"redirect_document_id": false
18+
},
19+
{
20+
"source_path": "articles/storage/blobs/storage-blob-scalable-app-download-files.md",
21+
"redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-download-files",
22+
"redirect_document_id": false
23+
},
24+
{
25+
"source_path": "articles/storage/blobs/storage-blob-scalable-app-upload-files.md",
26+
"redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-upload-files",
27+
"redirect_document_id": false
28+
},
29+
{
30+
"source_path": "articles/storage/blobs/storage-blob-scalable-app-verify-metrics.md",
31+
"redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-verify-metrics",
32+
"redirect_document_id": false
33+
},
334
{
435
"source_path": "articles/api-management/self-hosted-gateway-migration-guide.md",
536
"redirect_url": "/previous-versions/azure/api-management/self-hosted-gateway-migration-guide",
@@ -480,6 +511,7 @@
480511
"redirect_url": "/azure/azure-health-insights/overview",
481512
"redirect_document_id": false
482513
},
514+
483515
{
484516
"source_path_from_root": "/articles/azure-health-insights/response-info.md",
485517
"redirect_url": "/azure/azure-health-insights/overview",
@@ -488,7 +520,52 @@
488520
{
489521
"source_path_from_root": "/articles/azure-maps/tutorial-iot-hub-maps.md",
490522
"redirect_url": "/azure/azure-maps",
491-
"redirect_document_id": true
523+
"redirect_document_id": false
524+
},
525+
{
526+
"source_path_from_root": "/articles/azure-health-insights/oncophenotype/faq.md",
527+
"redirect_url": "/azure/azure-health-insights/overview",
528+
"redirect_document_id": false
529+
},
530+
{
531+
"source_path_from_root": "/articles/azure-health-insights/oncophenotype/get-started.md",
532+
"redirect_url": "/azure/azure-health-insights/overview",
533+
"redirect_document_id": false
534+
},
535+
{
536+
"source_path_from_root": "/articles/azure-health-insights/oncophenotype/inferences.md",
537+
"redirect_url": "/azure/azure-health-insights/overview",
538+
"redirect_document_id": false
539+
},
540+
{
541+
"source_path_from_root": "/articles/azure-health-insights/oncophenotype/model-configuration.md",
542+
"redirect_url": "/azure/azure-health-insights/overview",
543+
"redirect_document_id": false
544+
},
545+
{
546+
"source_path_from_root": "/articles/azure-health-insights/oncophenotype/overview.md",
547+
"redirect_url": "/azure/azure-health-insights/overview",
548+
"redirect_document_id": false
549+
},
550+
{
551+
"source_path_from_root": "/articles/azure-health-insights/oncophenotype/patient-info.md",
552+
"redirect_url": "/azure/azure-health-insights/overview",
553+
"redirect_document_id": false
554+
},
555+
{
556+
"source_path_from_root": "/articles/azure-health-insights/oncophenotype/support-and-help.md",
557+
"redirect_url": "/azure/azure-health-insights/overview",
558+
"redirect_document_id": false
559+
},
560+
{
561+
"source_path_from_root": "/articles/azure-health-insights/oncophenotype/transparency-note.md",
562+
"redirect_url": "/azure/azure-health-insights/overview",
563+
"redirect_document_id": false
564+
},
565+
{
566+
"source_path_from_root": "/articles/azure-health-insights/oncophenotype/index.yml",
567+
"redirect_url": "/azure/azure-health-insights/overview",
568+
"redirect_document_id": false
492569
},
493570
{
494571
"source_path_from_root": "/articles/azure-maps/about-creator.md",
@@ -2630,6 +2707,11 @@
26302707
"redirect_url": "/azure/migrate/whats-new#update-april-2024",
26312708
"redirect_document_id": false
26322709
},
2710+
{
2711+
"source_path": "articles/migrate/migrate-v1.md",
2712+
"redirect_url": "/azure/migrate/migrate-services-overview",
2713+
"redirect_document_id": false
2714+
},
26332715
{
26342716
"source_path_from_root": "/articles/mobile-apps/concepts/analytics.md",
26352717
"redirect_url": "/azure/developer/mobile-apps/analytics",
@@ -4645,6 +4727,11 @@
46454727
"redirect_url": "/azure/modeling-simulation-workbench/concept-storage",
46464728
"redirect_document_id": false
46474729
},
4730+
{
4731+
"source_path_from_root": "/articles/modeling-simulation-workbench/quickstart-create-portal.md",
4732+
"redirect_url": "/azure/modeling-simulation-workbench/get-started-modeling-simulation-workbench",
4733+
"redirect_document_id": false
4734+
},
46484735
{
46494736
"source_path_from_root": "/articles/load-balancer/upgrade-basic-standard.md",
46504737
"redirect_url": "/azure/load-balancer/upgrade-basic-standard-with-powershell",
@@ -4679,6 +4766,11 @@
46794766
"source_path_from_root": "/articles/load-balancer/load-balancer-ipv6-internet-cli.md",
46804767
"redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell",
46814768
"redirect_document_id": false
4769+
},
4770+
{
4771+
"source_path_from_root": "/articles/third-party-notices.md",
4772+
"redirect_url": "/azure-docs/ThirdPartyNotices.md",
4773+
"redirect_document_id": false
46824774
}
46834775
]
4684-
}
4776+
}

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@
3636
/articles/lighthouse @jasonwhowell @thomps23
3737
/articles/quotas @jasonwhowell @thomps23
3838
/articles/container-registry @jasonwhowell @thomps23
39-
/articles/kubernetes-fleet @jasonwhowell @thomps23
39+
/articles/kubernetes-fleet @MicrosoftDocs/azure-docs-codeowners

articles/active-directory-b2c/data-residency.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ Azure AD B2C is **generally available worldwide** with the option for **data res
3232

3333
If you enable [Go-Local add-on](#go-local-add-on), you can store your data exclusively in a specific country/region.
3434

35+
> [!NOTE]
36+
> Azure AD B2C is generally available in the Microsoft Azure global cloud and Microsoft Azure operated by 21Vianet. Azure AD B2C is not available in Microsoft Azure Government.
3537
3638
## Region availability
3739

articles/active-directory-b2c/faq.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,9 @@ sections:
268268
No, Azure AD B2C tenants don't support [group-based assignment to Microsoft Entra Enterprise Applications](../active-directory/manage-apps/assign-user-or-group-access-portal.md).
269269
270270
- question: |
271-
What Azure AD B2C features are unavailable in Microsoft Azure Government?
271+
Is Azure AD B2C available in Microsoft Azure Government?
272272
answer: |
273-
The following AD B2C features are currently unavailable in Microsoft Azure Government:
274-
275-
* API connectors
276-
* Conditional Access
273+
No, Azure AD B2C is not available in Microsoft Azure Government.
277274
278275
- question: |
279276
I am using rolling refresh tokens for my application and I am getting an invalid_grant error on redeeming newly acquired refresh tokens well within their set validity period. Why does this happen?

articles/active-directory-b2c/whats-new-docs.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "What's new in Azure Active Directory business-to-customer (B2C)"
33
description: "New and updated documentation for the Azure Active Directory business-to-customer (B2C)."
4-
ms.date: 09/11/2024
4+
ms.date: 10/01/2024
55
ms.service: active-directory
66
ms.subservice: B2C
77
ms.topic: whats-new
@@ -19,6 +19,12 @@ manager: CelesteDG
1919

2020
Welcome to what's new in Azure Active Directory B2C documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the B2C service, see [What's new in Microsoft Entra ID](../active-directory/fundamentals/whats-new.md), [Azure AD B2C developer release notes](custom-policy-developer-notes.md) and [What's new in Microsoft Entra External ID](/entra/external-id/whats-new-docs).
2121

22+
## September 2024
23+
24+
### Updated articles
25+
26+
- [Developer notes for Azure Active Directory B2C](custom-policy-developer-notes.md) - Updated feature availability for China cloud
27+
2228
## August 2024
2329

2430
This month, we changed Twitter to X in numerous articles and code samples.
@@ -33,10 +39,3 @@ This month, we changed Twitter to X in numerous articles and code samples.
3339

3440
- [Developer notes for Azure Active Directory B2C](custom-policy-developer-notes.md) - Updated Twitter to X
3541
- [Custom email verification with SendGrid](custom-email-sendgrid.md) - Updated the localization script
36-
37-
## June 2024
38-
39-
### Updated articles
40-
41-
- [Define an OAuth2 custom error technical profile in an Azure Active Directory B2C custom policy](oauth2-error-technical-profile.md) - Error code updates
42-
- [Configure authentication in a sample Python web app by using Azure AD B2C](configure-authentication-sample-python-web-app.md) - Python version updates
Binary file not shown.
Binary file not shown.
Binary file not shown.

articles/api-management/api-management-howto-app-insights.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -375,15 +375,8 @@ To emit custom metrics, perform the following configuration steps.
375375
376376
### Limits for custom metrics
377377
378-
Azure Monitor imposes [usage limits](/azure/azure-monitor/essentials/metrics-custom-overview#quotas-and-limits) for custom metrics that may affect your ability to emit metrics from API Management. For example, Azure Monitor currently sets a limit of 10 dimension keys per metric, and a limit of 50,000 total active time series per region in a subscription (within a 12 hour period).
379-
380-
These limits have the following implications for configuring custom metrics in API Management:
381-
382-
* You can configure a maximum of 10 custom dimensions per `emit-metric` policy.
383-
384-
* The number of active time series generated by the `emit-metric` policy within a 12 hour period is the product of the number of unique values of each configured dimension during the period. For example, if three custom dimensions were configured in the policy, and each dimension had 10 possible values within the period, the `emit-metric` policy would contribute 1,000 (10 x 10 x 10) active time series.
385-
386-
* If you configure the `emit-metric` policy in multiple API Management instances that are in the same region in a subscription, all instances can contribute to the regional active time series limit.
378+
[!INCLUDE [api-management-custom-metrics-limits](../../includes/api-management-custom-metrics-limits.md)]
379+
387380
388381
## Performance implications and log sampling
389382

articles/api-management/azure-openai-emit-token-metric-policy.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,21 @@ ms.custom:
1717

1818
[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
1919

20-
The `azure-openai-emit-token-metric` policy sends metrics to Application Insights about consumption of large language model tokens through Azure OpenAI Service APIs. Token count metrics include: Total Tokens, Prompt Tokens, and Completion Tokens.
20+
The `azure-openai-emit-token-metric` policy sends custom metrics to Application Insights about consumption of large language model tokens through Azure OpenAI Service APIs. Token count metrics include: Total Tokens, Prompt Tokens, and Completion Tokens.
2121

2222
[!INCLUDE [api-management-policy-generic-alert](../../includes/api-management-policy-generic-alert.md)]
2323

2424
[!INCLUDE [api-management-azure-openai-models](../../includes/api-management-azure-openai-models.md)]
2525

26+
## Limits for custom metrics
27+
28+
[!INCLUDE [api-management-custom-metrics-limits](../../includes/api-management-custom-metrics-limits.md)]
29+
2630

2731
## Prerequisites
2832

2933
* One or more Azure OpenAI Service APIs must be added to your API Management instance. For more information, see [Add an Azure OpenAI Service API to Azure API Management](./azure-openai-api-from-specification.md).
30-
* Your API Management instance must be integrated with Application insights. For more information, see [How to integrate Azure API Management with Azure Application Insights](./api-management-howto-app-insights.md#create-a-connection-using-the-azure-portal).
34+
* Your API Management instance must be integrated with Application insights. For more information, see [How to integrate Azure API Management with Azure Application Insights](./api-management-howto-app-insights.md).
3135
* Enable Application Insights logging for your Azure OpenAI APIs.
3236
* Enable custom metrics with dimensions in Application Insights. For more information, see [Emit custom metrics](api-management-howto-app-insights.md#emit-custom-metrics).
3337

@@ -46,7 +50,6 @@ The `azure-openai-emit-token-metric` policy sends metrics to Application Insight
4650
| Attribute | Description | Required | Default value |
4751
| --------- | -------------------------- | ------------------ | -------------- |
4852
| namespace | A string. Namespace of metric. Policy expressions aren't allowed. | No | API Management |
49-
| value | Value of metric expressed as a double. Policy expressions are allowed. | No | 1 |
5053

5154

5255
## Elements
@@ -88,15 +91,13 @@ The `azure-openai-emit-token-metric` policy sends metrics to Application Insight
8891

8992
## Example
9093

91-
The following example sends Azure OpenAI token count metrics to Application Insights along with User ID, Client IP, and API ID as dimensions.
94+
The following example sends Azure OpenAI token count metrics to Application Insights along with API ID as a custom dimension.
9295

9396
```xml
9497
<policies>
9598
<inbound>
9699
<azure-openai-emit-token-metric
97100
namespace="AzureOpenAI">
98-
<dimension name="User ID" />
99-
<dimension name="Client IP" value="@(context.Request.IpAddress)" />
100101
<dimension name="API ID" />
101102
</azure-openai-emit-token-metric>
102103
</inbound>

0 commit comments

Comments
 (0)