Skip to content

Commit

Permalink
Merge branch 'main' into hh-1945408
Browse files Browse the repository at this point in the history
  • Loading branch information
@hhunter-ms
hhunter-ms committed May 27, 2022
2 parents abfba77 + 814cfa7 commit 7552a04
Show file tree
Hide file tree
Showing 7,332 changed files with 152,434 additions and 79,013 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
22 changes: 20 additions & 2 deletions .openpublishing.publish.config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@
"branch": "master",
"branch_mapping": {}
},
{
"path_to_root": "msdocs-storage-bind-function-service",
"url": "https://github.com/Azure-Samples/msdocs-storage-bind-function-service",
"branch": "main",
"branch_mapping": {}
},
{
"path_to_root": "azure_cli_scripts",
"url": "https://github.com/Azure-Samples/azure-cli-samples",
Expand Down Expand Up @@ -242,6 +248,12 @@
"branch": "main",
"branch_mapping": {}
},
{
"path_to_root": "azure-functions-kafka-extension",
"url": "https://github.com/Azure/azure-functions-kafka-extension",
"branch": "dev",
"branch_mapping": {}
},
{
"path_to_root": "azure-functions-python-worker-extension",
"url": "https://github.com/Azure-Samples/python-worker-extension-timer",
Expand Down Expand Up @@ -435,9 +447,15 @@
"branch_mapping": {}
},
{
"path_to_root": "azureml-examples-march-cli-preview",
"path_to_root": "azureml-examples-sdk-preview",
"url": "https://github.com/azure/azureml-examples",
"branch": "sdk-preview",
"branch_mapping": {}
},
{
"path_to_root": "azureml-examples-online-endpoint-vnet",
"url": "https://github.com/azure/azureml-examples",
"branch": "march-cli-preview",
"branch": "rsethur/mvnet",
"branch_mapping": {}
},
{
Expand Down
44 changes: 42 additions & 2 deletions .openpublishing.redirection.azure-monitor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/azure-monitor-app-hub.yml",
"redirect_url": "/azure/azure-monitor/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/troubleshoot-portal-connectivity.md",
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-portal-connectivity",
Expand All @@ -120,6 +125,11 @@
"redirect_url": "/azure/azure-monitor/logs/cost-logs",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/logs/design-logs-deployment.md",
"redirect_url": "/azure/azure-monitor/logs/workspace-design",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/apm-tables.md",
"redirect_url": "/azure/azure-monitor/app/convert-classic-resource#workspace-based-resource-changes",
Expand All @@ -132,12 +142,42 @@
},
{
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections.md",
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-scsm.md" ,
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections.md",
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-azure-redhat-setup.md" ,
"redirect_url": "/azure/azure-monitor/containers/container-insights-transition-hybrid",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-azure-redhat4-setup.md" ,
"redirect_url": "/azure/azure-monitor/containers/container-insights-transition-hybrid",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-metric-overview.md" ,
"redirect_url": "/azure/azure-monitor/alerts/alert-types.md#metric-alerts",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-alert-instances.md" ,
"redirect_url": "/azure/azure-monitor/alerts/alerts-page.md",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-unified-log.md" ,
"redirect_url": "/azure/azure-monitor/alerts/alert-types.md#log-alerts",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/alerts/activity-log-alerts.md" ,
"redirect_url": "/azure/azure-monitor/alerts/alert-types.md#activity-log-alerts",
"redirect_document_id": false
}
]
Expand Down
15 changes: 15 additions & 0 deletions .openpublishing.redirection.defender-for-cloud.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
"redirect_url": "/azure/defender-for-cloud/policy-reference",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/security-center/security-center-identity-access.md",
"redirect_url": "/azure/defender-for-cloud/multi-factor-authentication-enforcement",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/security-center/security-center-policy-definitions.md",
"redirect_url": "/azure/defender-for-cloud/policy-reference",
Expand Down Expand Up @@ -684,6 +689,16 @@
"source_path_from_root": "/articles/defender-for-cloud/defender-for-kubernetes-azure-arc.md",
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-enable?pivots=defender-for-container-arc#protect-arc-enabled-kubernetes-clusters",
"redirect_document_id": true
},
{
"source_path_from_root": "/articles/defender-for-cloud/defender-for-container-registries-cicd.md",
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-cicd",
"redirect_document_id": true
},
{
"source_path_from_root": "/articles/defender-for-cloud/defender-for-container-registries-usage.md",
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-usage",
"redirect_document_id": true
}
]
}
Loading

0 comments on commit 7552a04

Please sign in to comment.