Skip to content

Commit 009aaec

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents d607c51 + 1cb80d4 commit 009aaec

File tree

7,476 files changed

+102492
-64541
lines changed

Some content is hidden

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

7,476 files changed

+102492
-64541
lines changed

.openpublishing.publish.config.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,12 @@
230230
"branch": "master",
231231
"branch_mapping": {}
232232
},
233+
{
234+
"path_to_root": "functions-docs-python-v2",
235+
"url": "https://github.com/Azure-Samples/functions-docs-python-v2",
236+
"branch": "main",
237+
"branch_mapping": {}
238+
},
233239
{
234240
"path_to_root": "functions-docs-powershell",
235241
"url": "https://github.com/Azure-Samples/functions-docs-powershell",
@@ -416,6 +422,12 @@
416422
"branch": "main",
417423
"branch_mapping": {}
418424
},
425+
{
426+
"path_to_root": "azureml-examples-archive",
427+
"url": "https://github.com/azure/azureml-examples",
428+
"branch": "v1-archive",
429+
"branch_mapping": {}
430+
},
419431
{
420432
"path_to_root": "azureml-examples-batch-pup",
421433
"url": "https://github.com/azure/azureml-examples",
@@ -1079,6 +1091,7 @@
10791091
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10801092
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
10811093
"articles/communication-services/.openpublishing.redirection.communication-services.json",
1094+
"articles/communications-gateway/.openpublishing.redirection.communications-gateway.json",
10821095
"articles/confidential-computing/.openpublishing.redirection.json",
10831096
"articles/container-apps/.openpublishing.redirection.container-apps.json",
10841097
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",

.openpublishing.redirection.active-directory.json

Lines changed: 189 additions & 15 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"source_path_from_root": "/articles/aks/web-app-routing.md",
1515
"redirect_url": "/azure/aks/app-routing",
1616
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/aks/aks-planned-maintenance-weekly-releases.md",
20+
"redirect_url": "/azure/aks/planned-maintenance",
21+
"redirect_document_id": false
1722
}
1823
]
1924
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6194,6 +6194,131 @@
61946194
"source_path_from_root": "/articles/azure-monitor/essentials/resource-logs-categories.md",
61956195
"redirect_url": "/azure/azure-monitor/reference/supported-logs/logs-index",
61966196
"redirect_document_id": false
6197+
},
6198+
{
6199+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus.md",
6200+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-enable",
6201+
"redirect_document_id": false
6202+
},
6203+
{
6204+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-enable.md",
6205+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-enable",
6206+
"redirect_document_id": false
6207+
},
6208+
{
6209+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-disable.md",
6210+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-disable",
6211+
"redirect_document_id": false
6212+
},
6213+
{
6214+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-from-arc-enabled-cluster.md",
6215+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-from-arc-enabled-cluster",
6216+
"redirect_document_id": false
6217+
},
6218+
{
6219+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-default.md",
6220+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-default",
6221+
"redirect_document_id": false
6222+
},
6223+
{
6224+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-configuration.md",
6225+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-configuration",
6226+
"redirect_document_id": false
6227+
},
6228+
{
6229+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-configuration-minimal.md",
6230+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-configuration-minimal",
6231+
"redirect_document_id": false
6232+
},
6233+
{
6234+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-scale.md",
6235+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-scale",
6236+
"redirect_document_id": false
6237+
},
6238+
{
6239+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-scrape-validate.md",
6240+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-scrape-validate",
6241+
"redirect_document_id": false
6242+
},
6243+
{
6244+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-multiple-workspaces.md",
6245+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-multiple-workspaces",
6246+
"redirect_document_id": false
6247+
},
6248+
{
6249+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-troubleshoot.md",
6250+
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-troubleshoot",
6251+
"redirect_document_id": false
6252+
},
6253+
{
6254+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write.md",
6255+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write",
6256+
"redirect_document_id": false
6257+
},
6258+
{
6259+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write-azure-ad-pod-identity.md",
6260+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write-azure-ad-pod-identity",
6261+
"redirect_document_id": false
6262+
},
6263+
{
6264+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write-managed-identity.md",
6265+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write-managed-identity",
6266+
"redirect_document_id": false
6267+
},
6268+
{
6269+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-remote-write-active-directory.md",
6270+
"redirect_url": "/azure/azure-monitor/containers/prometheus-remote-write-active-directory",
6271+
"redirect_document_id": false
6272+
},
6273+
{
6274+
"source_path_from_root": "/articles/azure-monitor/essentials/integrate-keda.md",
6275+
"redirect_url": "/azure/azure-monitor/containers/integrate-keda",
6276+
"redirect_document_id": false
6277+
},
6278+
{
6279+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-authorization-proxy.md",
6280+
"redirect_url": "/azure/azure-monitor/containers/prometheus-authorization-proxy",
6281+
"redirect_document_id": false
6282+
},
6283+
{
6284+
"source_path_from_root": "/articles/azure-monitor/azure-cli-metrics-alert-sample.md",
6285+
"redirect_url": "/azure/azure-monitor/alerts/azure-cli-metrics-alert-sample",
6286+
"redirect_document_id": false
6287+
},
6288+
{
6289+
"source_path_from_root": "/articles/azure-monitor/terminology.md",
6290+
"redirect_url": "/azure/azure-monitor/overview",
6291+
"redirect_document_id": false
6292+
},
6293+
{
6294+
"source_path_from_root": "/articles/azure-monitor/logs/create-pipeline-datacollector-api.md",
6295+
"redirect_url": "/azure/azure-monitor/logs/data-collector-api",
6296+
"redirect_document_id": false
6297+
},
6298+
{
6299+
"source_path_from_root": "/articles/azure-monitor/visualize/vmext-troubleshoot.md",
6300+
"redirect_url": "/azure/azure-monitor/agents/vmext-troubleshoot",
6301+
"redirect_document_id": false
6302+
},
6303+
{
6304+
"source_path_from_root": "/articles/azure-monitor/logs/unify-app-resource-data.md",
6305+
"redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
6306+
"redirect_document_id": false
6307+
},
6308+
{
6309+
"source_path_from_root": "/articles/azure-monitor/insights/solution-agenthealth.md",
6310+
"redirect_url": "/azure/azure-monitor/agents/solution-agenthealth",
6311+
"redirect_document_id": false
6312+
},
6313+
{
6314+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v3.md",
6315+
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6316+
"redirect_document_id": false
6317+
},
6318+
{
6319+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v4.md",
6320+
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6321+
"redirect_document_id": false
61976322
}
61986323
]
61996324
}

.openpublishing.redirection.azure-productivity.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,26 @@
184184
"source_path": "articles/lab-services/how-to-access-vm-for-students-within-teams.md",
185185
"redirect_url": "/azure/lab-services/tutorial-access-lab-virtual-machine-teams-canvas",
186186
"redirect_document_id": false
187+
},
188+
{
189+
"source_path": "articles/lab-services/lab-creator-support-information.md",
190+
"redirect_url": "/azure/lab-services/how-to-manage-labs",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path": "articles/lab-services/lab-user-support-information.md",
195+
"redirect_url": "/azure/lab-services/how-to-access-lab-virtual-machine",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path": "articles/lab-services/how-to-create-lab-plan-template.md",
200+
"redirect_url": "/azure/lab-services/how-to-create-lab-plan-bicep",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path": "articles/lab-services/how-to-create-lab-template.md",
205+
"redirect_url": "/azure/lab-services/how-to-create-lab-bicep",
206+
"redirect_document_id": false
187207
}
188208
]
189-
}
209+
}

0 commit comments

Comments
 (0)