Skip to content

Commit 132ad90

Browse files
authored
Merge branch 'main' into 253120
2 parents 5d678fa + a1b1b21 commit 132ad90

File tree

3,105 files changed

+107075
-24011
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,105 files changed

+107075
-24011
lines changed

.openpublishing.publish.config.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,12 @@
236236
"branch": "main",
237237
"branch_mapping": {}
238238
},
239+
{
240+
"path_to_root": "functions-python-extensions",
241+
"url": "https://github.com/Azure/azure-functions-python-extensions",
242+
"branch": "dev",
243+
"branch_mapping": {}
244+
},
239245
{
240246
"path_to_root": "functions-python-tensorflow-tutorial",
241247
"url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
@@ -247,7 +253,7 @@
247253
"url": "https://github.com/Azure-Samples/function-app-arm-templates",
248254
"branch": "main",
249255
"branch_mapping": {}
250-
},
256+
},
251257
{
252258
"path_to_root": "functions-azure-product",
253259
"url": "https://github.com/Azure/Azure-Functions",
@@ -1004,6 +1010,12 @@
10041010
"branch": "docs-snippets",
10051011
"branch_mapping": {}
10061012
},
1013+
{
1014+
"path_to_root": "functions-openai-extension",
1015+
"url": "https://github.com/Azure/azure-functions-openai-extension",
1016+
"branch": "main",
1017+
"branch_mapping": {}
1018+
},
10071019
{
10081020
"path_to_root": "cosmos-db-nosql-dotnet-samples",
10091021
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
@@ -1225,6 +1237,7 @@
12251237
"redirection_files": [
12261238
".openpublishing.redirection.active-directory.json",
12271239
".openpublishing.redirection.ansible.json",
1240+
".openpublishing.redirection.api-center.json",
12281241
".openpublishing.redirection.api-management.json",
12291242
".openpublishing.redirection.app-service.json",
12301243
".openpublishing.redirection.asc-for-iot.json",
@@ -1342,6 +1355,7 @@
13421355
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
13431356
"articles/operator-insights/.openpublishing.redirection.operator-insights.json",
13441357
"articles/operator-nexus/.openpublishing.redirection.operator-nexus.json",
1358+
"articles/operator-service-manager/.openpublishing.redirection.operator-service-manager.json",
13451359
"articles/peering-service/.openpublishing.redirection.peering-service.json",
13461360
"articles/postgresql/.openpublishing.redirection.postgresql.json",
13471361
"articles/route-server/.openpublishing.redirection.route-server.json",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/api-center/use-vscode-extension-copilot.md",
5+
"redirect_url": "/azure/api-center/use-vscode-extension",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,11 @@
451451
"redirect_url": "/azure/aks/create-node-pools",
452452
"redirect_document_id": false
453453
},
454+
{
455+
"source_path_from_root": "/articles/copilot/limited-access.md",
456+
"redirect_url": "/azure/copilot/manage-access",
457+
"redirect_document_id": false
458+
},
454459
{
455460
"source_path_from_root": "/articles/aks/command-invoke.md",
456461
"redirect_url": "/azure/aks/access-private-cluster",

.openpublishing.redirection.azure-monitor.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6649,6 +6649,16 @@
66496649
"redirect_url": "/azure/azure-functions/functions-monitoring",
66506650
"redirect_document_id": false
66516651
},
6652+
{
6653+
"source_path_from_root": "/articles/azure-monitor/app/app-insights-azure-ad-api.md",
6654+
"redirect_url": "/azure/azure-monitor/app/azure-ad-authentication",
6655+
"redirect_document_id": false
6656+
},
6657+
{
6658+
"source_path_from_root": "/articles/azure-monitor/app/resources-roles-access-control.md",
6659+
"redirect_url": "/azure/azure-monitor/roles-permissions-security",
6660+
"redirect_document_id": false
6661+
},
66526662
{
66536663
"source_path_from_root": "/articles/azure-monitor/app/java-standalone-arguments.md",
66546664
"redirect_url": "/azure/azure-monitor/app/java-get-started-supplemental",

.openpublishing.redirection.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1870,6 +1870,14 @@
18701870
"redirect_url": "/azure/jenkins/tutorial-jenkins-deploy-web-app-azure-app-service",
18711871
"redirect_document_id": false
18721872
},
1873+
{
1874+
"source_path_from_root": "/articles/app-spaces/quickstart-deploy-web-app.md",
1875+
"redirect_url": "/azure/app-spaces/quickstart-deploy-sample-app"
1876+
},
1877+
{
1878+
"source_path_from_root": "/articles/app-spaces/deploy-app-spaces-template.md",
1879+
"redirect_url": "/azure/app-spaces/quickstart-deploy-your-app"
1880+
},
18731881
{
18741882
"source_path_from_root": "/articles/application-insights/app-insights-analytics-reference.md",
18751883
"redirect_url": "/azure/kusto/query/",
@@ -3625,6 +3633,11 @@
36253633
"redirect_url": "https://www.twilio.com/docs/usage/tutorials/serverless-webhooks-azure-functions-and-csharp",
36263634
"redirect_document_id": false
36273635
},
3636+
{
3637+
"source_path_from_root": "/articles/azure-functions/create-first-function-vs-code-web.md",
3638+
"redirect_url": "/azure/azure-functions",
3639+
"redirect_document_id": false
3640+
},
36283641
{
36293642
"source_path_from_root": "/articles/twilio-dotnet-how-to-use-for-voice-sms.md",
36303643
"redirect_url": "https://www.twilio.com/docs/usage/tutorials/serverless-webhooks-azure-functions-and-csharp",
@@ -4049,6 +4062,16 @@
40494062
"source_path_from_root":"/articles/cosmos-db/high-availability.md",
40504063
"redirect_url":"/azure/reliability/reliability-cosmos-db-nosql.md",
40514064
"redirect_document_id":false
4065+
},
4066+
{
4067+
"source_path_from_root":"/articles/migrate/how-to-assess.md",
4068+
"redirect_url":"/azure/migrate/whats-new#update-april-2024",
4069+
"redirect_document_id":false
4070+
},
4071+
{
4072+
"source_path_from_root":"/articles/migrate/prepare-isv-movere.md",
4073+
"redirect_url":"/azure/migrate/whats-new#update-april-2024",
4074+
"redirect_document_id":false
40524075
}
40534076
]
40544077
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/operator-service-manager/how-to-use-azure-operator-service-manager-cli-extension.md",
5+
"redirect_url": "/azure/operator-service-manager/concepts-about-azure-operator-service-manager-cli",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.sentinel.json

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,85 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/sentinel/automate-responses-with-playbooks.md#azure-logic-apps-basic-concepts",
5+
"redirect_url": "/azure/sentinel/playbooks/logic-apps-playbooks",
6+
"redirect_document_id": true
7+
},
8+
{
9+
"source_path": "articles/sentinel/automate-responses-with-playbooks.md#how-to-run-a-playbook",
10+
"redirect_url": "/azure/sentinel/playbooks/run-manage-playbooks",
11+
"redirect_document_id": true
12+
},
13+
{
14+
"source_path": "articles/sentinel/automate-responses-with-playbooks.md#recommended-playbooks",
15+
"redirect_url": "/azure/sentinel/playbooks/playbooks-recommendations",
16+
"redirect_document_id": true
17+
},
18+
{
19+
"source_path": "articles/sentinel/authenticate-playbooks-to-sentinel.md",
20+
"redirect_url": "/azure/sentinel/automation/authenticate-playbooks-to-sentinel",
21+
"redirect_document_id": true
22+
},
23+
{
24+
"source_path": "articles/sentinel/automate-responses-with-playbooks.md",
25+
"redirect_url": "/azure/sentinel/automation/automate-responses-with-playbooks",
26+
"redirect_document_id": true
27+
},
28+
{
29+
"source_path": "articles/sentinel/automation.md",
30+
"redirect_url": "/azure/sentinel/automation/automation",
31+
"redirect_document_id": true
32+
},
33+
{
34+
"source_path": "articles/sentinel/create-playbooks.md",
35+
"redirect_url": "/azure/sentinel/automation/create-playbooks",
36+
"redirect_document_id": true
37+
},
38+
{
39+
"source_path": "articles/sentinel/create-tasks-playbook.md",
40+
"redirect_url": "/azure/sentinel/automation/create-tasks-playbook",
41+
"redirect_document_id": true
42+
},
43+
{
44+
"source_path": "articles/sentinel/define-playbook-access-restrictions.md",
45+
"redirect_url": "/azure/sentinel/automation/define-playbook-access-restrictions",
46+
"redirect_document_id": true
47+
},
48+
{
49+
"source_path": "articles/sentinel/logic-apps-playbooks.md",
50+
"redirect_url": "/azure/sentinel/automation/logic-apps-playbooks",
51+
"redirect_document_id": true
52+
},
53+
{
54+
"source_path": "articles/sentinel/migrate-playbooks-to-automation-rules.md",
55+
"redirect_url": "/azure/sentinel/automation/migrate-playbooks-to-automation-rules",
56+
"redirect_document_id": true
57+
},
58+
{
59+
"source_path": "articles/sentinel/playbook-recommendations.md",
60+
"redirect_url": "/azure/sentinel/automation/playbook-recommendations",
61+
"redirect_document_id": true
62+
},
63+
{
64+
"source_path": "articles/sentinel/playbook-triggers-actions.md",
65+
"redirect_url": "/azure/sentinel/automation/playbook-triggers-actions",
66+
"redirect_document_id": true
67+
},
68+
{
69+
"source_path": "articles/sentinel/run-playbooks.md",
70+
"redirect_url": "/azure/sentinel/automation/run-playbooks",
71+
"redirect_document_id": true
72+
},
73+
{
74+
"source_path": "articles/sentinel/tutorial-respond-threats-playbook.md",
75+
"redirect_url": "/azure/sentinel/automation/tutorial-respond-threats-playbook",
76+
"redirect_document_id": true
77+
},
78+
{
79+
"source_path": "articles/sentinel/use-playbook-templates.md",
80+
"redirect_url": "/azure/sentinel/automation/use-playbook-templates",
81+
"redirect_document_id": true
82+
},
383
{
484
"source_path": "articles/sentinel/sap/deploy-data-connector-agent-container-other-methods.md",
585
"redirect_url": "/azure/sentinel/sap/deploy-data-connector-agent-container",

articles/active-directory-b2c/customize-ui-with-html.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Configure Blob storage for Cross-Origin Resource Sharing by performing the follo
264264
Validate that you're ready by performing the following steps:
265265

266266
1. Repeat the configure CORS step. For **Allowed origins**, enter `https://www.test-cors.org`
267-
1. Navigate to [www.test-cors.org](https://www.test-cors.org/)
267+
1. Navigate to [www.test-cors.org](https://cors-test.codehappy.dev/)
268268
1. For the **Remote URL** box, paste the URL of your HTML file. For example, `https://your-account.blob.core.windows.net/root/azure-ad-b2c/unified.html`
269269
1. Select **Send Request**.
270270
The result should be `XHR status: 200`.

articles/ai-services/cognitive-services-virtual-networks.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,9 @@ Currently, only IPv4 addresses are supported. Each Azure AI services resource su
370370
371371
To grant access from your on-premises networks to your Azure AI services resource with an IP network rule, identify the internet-facing IP addresses used by your network. Contact your network administrator for help.
372372
373-
If you use Azure ExpressRoute on-premises for public peering or Microsoft peering, you need to identify the NAT IP addresses. For more information, see [What is Azure ExpressRoute](../expressroute/expressroute-introduction.md).
373+
If you use Azure ExpressRoute on-premises for Microsoft peering, you need to identify the NAT IP addresses. For more information, see [What is Azure ExpressRoute](../expressroute/expressroute-introduction.md).
374374
375-
For public peering, each ExpressRoute circuit by default uses two NAT IP addresses. Each is applied to Azure service traffic when the traffic enters the Microsoft Azure network backbone. For Microsoft peering, the NAT IP addresses that are used are either customer provided or supplied by the service provider. To allow access to your service resources, you must allow these public IP addresses in the resource IP firewall setting.
376-
377-
To find your public peering ExpressRoute circuit IP addresses, [open a support ticket with ExpressRoute](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview) use the Azure portal. For more information, see [NAT requirements for Azure public peering](../expressroute/expressroute-nat.md#nat-requirements-for-azure-public-peering).
375+
For Microsoft peering, the NAT IP addresses that are used are either customer provided or supplied by the service provider. To allow access to your service resources, you must allow these public IP addresses in the resource IP firewall setting.
378376
379377
### Managing IP network rules
380378

0 commit comments

Comments
 (0)