Skip to content

Commit e793166

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into yelevin/connect-aws-s3-waf
2 parents 3d895a4 + bd8aeb4 commit e793166

File tree

3,685 files changed

+29177
-117356
lines changed

Some content is hidden

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

3,685 files changed

+29177
-117356
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@
4444
"branch": "main",
4545
"branch_mapping": {}
4646
},
47-
{
48-
"path_to_root": "acr-tasks",
49-
"url": "https://github.com/Azure-Samples/acr-tasks",
50-
"branch": "master",
51-
"branch_mapping": {}
52-
},
5347
{
5448
"path_to_root": "active-directory-b2c-javascript-nodejs-webapi",
5549
"url": "https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi",
@@ -74,12 +68,6 @@
7468
"branch": "master",
7569
"branch_mapping": {}
7670
},
77-
{
78-
"path_to_root": "azure_arc_sample",
79-
"url": "https://github.com/microsoft/azure_arc",
80-
"branch": "main",
81-
"branch_mapping": {}
82-
},
8371
{
8472
"path_to_root": "azure_cli_scripts",
8573
"url": "https://github.com/Azure-Samples/azure-cli-samples",

.openpublishing.redirection.json

Lines changed: 34 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/governance/machine-configuration/whats-new/migrating-from-dsc-extension.md ",
5+
"redirect_url": " https://azure.microsoft.com/updates/migrate-from-linux-dsc-extension-to-the-guest-configuration-feature-of-azure-policy-by-may-1-2025/",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
10+
"redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "articles/azure-app-configuration/rest-api-postman.md",
515
"redirect_url": "/previous-versions/azure/azure-app-configuration/rest-api-postman",
@@ -575,100 +585,10 @@
575585
"redirect_url": "https://azure.microsoft.com/features/azure-portal/",
576586
"redirect_document_id": false
577587
},
578-
{
579-
"source_path_from_root": "/articles/azure-portal/admin-timeout.md",
580-
"redirect_url": "/azure/azure-portal/set-preferences#change-the-directory-timeout-setting-admin",
581-
"redirect_document_id": false
582-
},
583-
{
584-
"source_path_from_root": "/articles/azure-portal/azure-portal-change-theme-high-contrast.md",
585-
"redirect_url": "/azure/azure-portal/set-preferences#choose-a-theme-or-enable-high-contrast",
586-
"redirect_document_id": false
587-
},
588-
{
589-
"source_path_from_root": "/articles/azure-portal/azure-portal-export-delete-settings.md",
590-
"redirect_url": "/azure/azure-portal/set-preferences#export-user-settings",
591-
"redirect_document_id": false
592-
},
593-
{
594-
"source_path_from_root": "/articles/azure-portal/mobile-app/microsoft-copilot-for-azure.md",
595-
"redirect_url": "/azure/azure-portal/mobile-app/microsoft-copilot-in-azure",
596-
"redirect_document_id": false
597-
},
598-
{
599-
"source_path_from_root": "/articles/azure-portal/original-preferences.md",
600-
"redirect_url": "/azure/azure-portal/set-preferences",
601-
"redirect_document_id": true
602-
},
603-
{
604-
"source_path_from_root": "/articles/azure-portal/resource-group-portal-linked-resources.md",
605-
"redirect_url": "/azure/azure-portal/azure-portal-dashboards",
606-
"redirect_document_id": false
607-
},
608-
{
609-
"source_path_from_root": "/articles/azure-portal/supportability/classic-deployment-model-quota-increase-requests.md",
610-
"redirect_url": "/azure/quotas/classic-deployment-model-quota-increase-requests",
611-
"redirect_document_id": true
612-
},
613-
{
614-
"source_path_from_root": "/articles/azure-portal/supportability/how-to-use-file-uploader.md",
615-
"redirect_url": "/azure/azure-portal/supportability/how-to-manage-azure-support-request#upload-files",
616-
"redirect_document_id": false
617-
},
618-
{
619-
"source_path_from_root": "/articles/azure-portal/supportability/low-priority-quota.md",
620-
"redirect_url": "/azure/quotas/spot-quota",
621-
"redirect_document_id": false
622-
},
623-
{
624-
"source_path_from_root": "/articles/azure-portal/supportability/networking-quota-requests.md",
625-
"redirect_url": "/azure/quotas/networking-quota-requests",
626-
"redirect_document_id": true
627-
},
628-
{
629-
"source_path_from_root": "/articles/azure-portal/supportability/per-vm-quota-requests.md",
630-
"redirect_url": "/azure/quotas/per-vm-quota-requests",
631-
"redirect_document_id": true
632-
},
633-
{
634-
"source_path_from_root": "/articles/azure-portal/supportability/quotas-overview.md",
635-
"redirect_url": "/azure/quotas/quotas-overview",
636-
"redirect_document_id": true
637-
},
638-
{
639-
"source_path_from_root": "/articles/azure-portal/supportability/regional-quota-requests.md",
640-
"redirect_url": "/azure/quotas/regional-quota-requests",
641-
"redirect_document_id": true
642-
},
643-
{
644-
"source_path_from_root": "/articles/azure-portal/supportability/resource-manager-core-quotas-request.md",
645-
"redirect_url": "/azure/quotas/regional-quota-requests",
646-
"redirect_document_id": false
647-
},
648-
{
649-
"source_path_from_root": "/articles/azure-portal/supportability/sku-series-unavailable.md",
650-
"redirect_url": "/troubleshoot/azure/general/region-access-request-process",
651-
"redirect_document_id": false
652-
},
653-
{
654-
"source_path_from_root": "/articles/azure-portal/supportability/spot-quota.md",
655-
"redirect_url": "/azure/quotas/spot-quota",
656-
"redirect_document_id": true
657-
},
658-
{
659-
"source_path_from_root": "/articles/azure-portal/supportability/view-quotas.md",
660-
"redirect_url": "/azure/quotas/view-quotas",
661-
"redirect_document_id": true
662-
},
663-
{
664-
"source_path_from_root": "/articles/azure-portal/tutorial-azureportal-devops.md",
665-
"redirect_url": "/azure/devops/pipelines/get-started-designer?toc=%2Fazure%2Fdevops%2Fuser-guide%2Ftoc.json&bc=%2Fazure%2Fdevops%2Fuser-guide%2Fbreadcrumb%2Ftoc.json&tabs=new-nav",
666-
"redirect_document_id": false
667-
},
668588
{
669589
"source_path_from_root": "/articles/azure-preview-portal-supported-browsers-devices.md",
670590
"redirect_url": "/azure/azure-portal/azure-portal-supported-browsers-devices",
671-
"redirect_document_id": true
591+
"redirect_document_id": false
672592
},
673593
{
674594
"source_path_from_root": "/articles/azure-resource-manager/management/control-plane-metrics.md",
@@ -783,12 +703,12 @@
783703
{
784704
"source_path_from_root": "/articles/azure-supportability/how-to-create-azure-support-request.md",
785705
"redirect_url": "/azure/azure-portal/supportability/how-to-create-azure-support-request",
786-
"redirect_document_id": true
706+
"redirect_document_id": false
787707
},
788708
{
789709
"source_path_from_root": "/articles/azure-supportability/how-to-use-file-uploader.md",
790710
"redirect_url": "/azure/azure-portal/supportability/how-to-use-file-uploader",
791-
"redirect_document_id": true
711+
"redirect_document_id": false
792712
},
793713
{
794714
"source_path_from_root": "/articles/azure-supportability/index.yml",
@@ -1470,16 +1390,6 @@
14701390
"redirect_url": "/azure/cloudfoundry",
14711391
"redirect_document_id": false
14721392
},
1473-
{
1474-
"source_path_from_root": "/articles/container-registry/manual-regional-move.md",
1475-
"redirect_url": "/azure/operational-excellence/relocation-container-registry",
1476-
"redirect_document_id": false
1477-
},
1478-
{
1479-
"source_path_from_root": "/articles/copilot/limited-access.md",
1480-
"redirect_url": "/azure/copilot/manage-access",
1481-
"redirect_document_id": false
1482-
},
14831393
{
14841394
"source_path_from_root": "/articles/data-catalog/data-catalog-developer-concepts.md",
14851395
"redirect_url": "/previous-versions/azure/data-catalog/data-catalog-developer-concepts",
@@ -2535,21 +2445,6 @@
25352445
"redirect_url": "/azure/developer/jenkins/pipeline-with-github-and-docker",
25362446
"redirect_document_id": false
25372447
},
2538-
{
2539-
"source_path_from_root": "/articles/kubernetes-fleet/access-fleet-kubernetes-api.md",
2540-
"redirect_url": "/azure/kubernetes-fleet/quickstart-access-fleet-kubernetes-api",
2541-
"redirect_document_id": false
2542-
},
2543-
{
2544-
"source_path_from_root": "/articles/kubernetes-fleet/configuration-propagation.md",
2545-
"redirect_url": "/azure/kubernetes-fleet/resource-propagation",
2546-
"redirect_document_id": false
2547-
},
2548-
{
2549-
"source_path_from_root": "/articles/kubernetes-fleet/resource-propagation.md",
2550-
"redirect_url": "/azure/kubernetes-fleet/concepts-resource-propagation",
2551-
"redirect_document_id": false
2552-
},
25532448
{
25542449
"source_path_from_root": "/articles/labs/anomaly-finder/apiref.md",
25552450
"redirect_url": "/azure/ai-services/anomaly-detector/",
@@ -2615,21 +2510,6 @@
26152510
"redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
26162511
"redirect_document_id": false
26172512
},
2618-
{
2619-
"source_path_from_root": "/articles/lighthouse/concepts/azure-delegated-resource-management.md",
2620-
"redirect_url": "/azure/lighthouse/concepts/architecture",
2621-
"redirect_document_id": true
2622-
},
2623-
{
2624-
"source_path_from_root": "/articles/lighthouse/how-to/partner-earned-credit.md",
2625-
"redirect_url": "/azure/cost-management-billing/manage/link-partner-id",
2626-
"redirect_document_id": false
2627-
},
2628-
{
2629-
"source_path_from_root": "/articles/lighthouse/samples/policy-samples.md",
2630-
"redirect_url": "/azure/lighthouse/samples/policy-reference",
2631-
"redirect_document_id": false
2632-
},
26332513
{
26342514
"source_path_from_root": "/articles/load-balancer/tutorial-cross-region-cli.md",
26352515
"redirect_url": "/azure/virtual-network/ip-services/tutorial-cross-region-portal",
@@ -2715,6 +2595,11 @@
27152595
"redirect_url": "/azure/azure-maps/zoom-levels-and-tile-grid",
27162596
"redirect_document_id": true
27172597
},
2598+
{
2599+
"source_path": "articles/managed-grafana/how-to-sync-teams-with-azure-ad-groups.md",
2600+
"redirect_url": "how-to-sync-teams-with-entra-groups",
2601+
"redirect_document_id": false
2602+
},
27182603
{
27192604
"source_path_from_root": "/articles/media-services/azure-media-player/azure-media-player-license.md",
27202605
"redirect_url": "/legal/azure-media-player/azure-media-player-license",
@@ -4769,6 +4654,21 @@
47694654
"source_path_from_root": "/articles/azure-glossary-cloud-terminology.md",
47704655
"redirect_url": "/azure/cloud-adoption-framework/ready/considerations/fundamental-concepts",
47714656
"redirect_document_id": false
4657+
},
4658+
{
4659+
"source_path_from_root": "/articles/load-balancer/load-balancer-ipv6-internet-ps.md",
4660+
"redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell",
4661+
"redirect_document_id": false
4662+
},
4663+
{
4664+
"source_path_from_root": "/articles/load-balancer/load-balancer-ipv6-internet-template.md",
4665+
"redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell",
4666+
"redirect_document_id": false
4667+
},
4668+
{
4669+
"source_path_from_root": "/articles/load-balancer/load-balancer-ipv6-internet-cli.md",
4670+
"redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell",
4671+
"redirect_document_id": false
47724672
}
47734673
]
4774-
}
4674+
}

CODEOWNERS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,11 @@
2929
/articles/advisor @jasonwhowell @thomps23
3030
/articles/chaos-studio @jasonwhowell @thomps23
3131
/articles/service-health @jasonwhowell @thomps23
32-
32+
/articles/azure-arc @jasonwhowell @thomps23
33+
/articles/azure-linux @jasonwhowell @thomps23
34+
/articles/azure-portal @jasonwhowell @thomps23
35+
/articles/copilot @jasonwhowell @thomps23
36+
/articles/lighthouse @jasonwhowell @thomps23
37+
/articles/quotas @jasonwhowell @thomps23
38+
/articles/container-registry @jasonwhowell @thomps23
39+
/articles/kubernetes-fleet @jasonwhowell @thomps23

articles/active-directory-b2c/azure-monitor.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Watch this video to learn how to configure monitoring for Azure AD B2C using Azu
4343
## Deployment overview
4444

4545
Azure AD B2C uses [Microsoft Entra monitoring](../active-directory/reports-monitoring/overview-monitoring-health.md). Unlike Microsoft Entra tenants, an Azure AD B2C tenant can't have a subscription associated with it. So, we need to take extra steps to enable the integration between Azure AD B2C and Log Analytics, which is where we send the logs.
46-
To enable _Diagnostic settings_ in Microsoft Entra ID within your Azure AD B2C tenant, you use [Azure Lighthouse](../lighthouse/overview.md) to [delegate a resource](../lighthouse/concepts/architecture.md), which allows your Azure AD B2C (the **Service Provider**) to manage a Microsoft Entra ID (the **Customer**) resource.
46+
To enable _Diagnostic settings_ in Microsoft Entra ID within your Azure AD B2C tenant, you use [Azure Lighthouse](/azure/lighthouse/overview) to [delegate a resource](/azure/lighthouse/concepts/architecture), which allows your Azure AD B2C (the **Service Provider**) to manage a Microsoft Entra ID (the **Customer**) resource.
4747

4848
> [!TIP]
4949
> Azure Lighthouse is typically used to manage resources for multiple customers. However, it can also be used to manage resources **within an enterprise that has multiple Microsoft Entra tenants of its own**, which is what we are doing here, except that we are only delegating the management of single resource group.
@@ -113,7 +113,7 @@ To create the custom authorization and delegation in Azure Lighthouse, we use an
113113

114114
1. Sign in to the [Azure portal](https://portal.azure.com).
115115
1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Microsoft Entra ID tenant from the **Directories + subscriptions** menu.
116-
1. Use the **Deploy to Azure** button to open the Azure portal and deploy the template directly in the portal. For more information, see [create an Azure Resource Manager template](../lighthouse/how-to/onboard-customer.md#create-an-azure-resource-manager-template).
116+
1. Use the **Deploy to Azure** button to open the Azure portal and deploy the template directly in the portal. For more information, see [create an Azure Resource Manager template](/azure/lighthouse/how-to/onboard-customer#create-an-azure-resource-manager-template).
117117

118118
[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fazure-ad-b2c%2Fsiem%2Fmaster%2Ftemplates%2FrgDelegatedResourceManagement.json)
119119

@@ -141,7 +141,7 @@ To create the custom authorization and delegation in Azure Lighthouse, we use an
141141
]
142142
```
143143

144-
After you deploy the template, it can take a few minutes (typically no more than five) for the resource projection to complete. You can verify the deployment in your Microsoft Entra tenant and get the details of the resource projection. For more information, see [View and manage service providers](../lighthouse/how-to/view-manage-service-providers.md).
144+
After you deploy the template, it can take a few minutes (typically no more than five) for the resource projection to complete. You can verify the deployment in your Microsoft Entra tenant and get the details of the resource projection. For more information, see [View and manage service providers](/azure/lighthouse/how-to/view-manage-service-providers).
145145

146146
## 4. Select your subscription
147147

articles/api-management/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@
264264
- name: Set or edit policies
265265
href: set-edit-policies.md
266266
- name: Author policies using Microsoft Copilot in Azure
267-
href: ../copilot/author-api-management-policies.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
267+
href: /azure/copilot/author-api-management-policies?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
268268
- name: Debug policies in VS Code
269269
href: api-management-debug-policies.md
270270
- name: Policy expressions

0 commit comments

Comments
 (0)