Skip to content

Commit

Permalink
Merge branch 'main' into hh-1945403
Browse files Browse the repository at this point in the history
  • Loading branch information
@hhunter-ms
hhunter-ms committed Jun 9, 2022
2 parents 8c32246 + 0f453d7 commit 997f20b
Show file tree
Hide file tree
Showing 6,464 changed files with 92,672 additions and 59,086 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
31 changes: 28 additions & 3 deletions .openpublishing.publish.config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@
"need_preview_pull_request": true,
"contribution_branch_mappings": {},
"dependent_repositories": [
{
"path_to_root": "azure-dev-docs-pr",
"url": "https://github.com/MicrosoftDocs/azure-dev-docs-pr",
"branch": "main",
"branch_mapping": {}
},
{
"path_to_root": "terraform_samples",
"url": "https://github.com/Azure/terraform",
"branch": "master",
"branch_mapping": {}
},
{
"path_to_root": "quickstart-templates",
"url": "https://github.com/Azure/azure-quickstart-templates",
Expand Down Expand Up @@ -79,7 +91,7 @@
"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 @@ -889,8 +901,19 @@
"url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
"branch": "docs-snippets",
"branch_mapping": {}
},
{
"path_to_root": "ms-identity-node",
"url": "https://github.com/Azure-Samples/ms-identity-node",
"branch": "main",
"branch_mapping": {}
},
{
"path_to_root": "ms-identity-javascript-nodejs-desktop",
"url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
"branch": "main",
"branch_mapping": {}
}

],
"branch_target_mapping": {
"live": ["Publish", "PDF"],
Expand Down Expand Up @@ -922,6 +945,7 @@
".openpublishing.redirection.azure-monitor.json",
".openpublishing.redirection.azure-percept.json",
".openpublishing.redirection.azure-productivity.json",
".openpublishing.redirection.azure-australia.json",
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
"articles/azure-relay/.openpublishing.redirection.relay.json",
Expand Down Expand Up @@ -954,6 +978,7 @@
"articles/container-apps/.openpublishing.redirection.container-apps.json",
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json"
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
"articles/machine-learning/.openpublishing.redirection.machine-learning.json"
]
}
5 changes: 5 additions & 0 deletions .openpublishing.redirection.active-directory.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
"redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/active-directory/saas-apps/bridgelineunbound-tutorial.md",
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
Expand Down
84 changes: 84 additions & 0 deletions .openpublishing.redirection.azure-australia.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{
"redirections": [
{
"source_path_from_root": "/articles/azure-australia/australia-overview.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/azure-key-vault.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/azure-policy.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/gateway-egress-traffic.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/gateway-ingress-traffic.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/gateway-log-audit-visibility.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/gateway-secure-remote-administration.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/identity-federation.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/index.yml",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/recovery-backup.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/reference-library.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/role-privileged.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/secure-your-data.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/security-explained.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/system-monitor.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-australia/vpn-gateway.md",
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
"redirect_document_id": false
}
]
}
147 changes: 144 additions & 3 deletions .openpublishing.redirection.azure-monitor.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,65 @@
{
"redirections": [
{
"source_path_from_root": "/articles/azure-monitor/app/profiler.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/profiler-aspnetcore-linux.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler-aspnetcore-linux",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/profiler-azure-functions.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler-azure-functions",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/profiler-bring-your-own-storage.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler-bring-your-own-storage",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/profiler-cloudservice.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler-cloudservice",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/profiler-containers.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler-containers",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/profiler-overview.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler-overview",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/profiler-servicefabric.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler-servicefabric",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/profiler-settings.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler-settings",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/profiler-trackrequests.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler-trackrequests",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/profiler-troubleshooting.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler-troubleshooting",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/profiler-vm.md",
"redirect_url": "/azure/azure-monitor/profiler/profiler-vm",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/app/app-insights-dashboards.md",
"redirect_url": "/azure/azure-monitor/app/overview-dashboard",
Expand Down Expand Up @@ -65,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 @@ -77,13 +142,89 @@
},
{
"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/alerts-types",
"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-managing-alert-states.md" ,
"redirect_url": "/azure/azure-monitor/alerts/alerts-page",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-unified-log.md" ,
"redirect_url": "/azure/azure-monitor/alerts/alerts-types",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/alerts/activity-log-alerts.md" ,
"redirect_url": "/azure/azure-monitor/alerts/alerts-types",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-smartgroups-overview.md" ,
"redirect_url": "/azure/azure-monitor/alerts/alerts-types",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-smart-groups.md" ,
"redirect_url": "/azure/azure-monitor/alerts/alerts-types",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/insights/data-explorer.md" ,
"redirect_url": "/azure/data-explorer/data-explorer-insights",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-ga-release-faq.md" ,
"redirect_url": "/azure/azure-monitor/faq#vm-insights",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-log-search.md" ,
"redirect_url": "/azure/azure-monitor/alerts/vminsights-log-query",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/cli-samples.md" ,
"redirect_url": "/cli/azure/azure-cli-reference-for-monitor",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/powershell-samples.md" ,
"redirect_url": "/powershell/module/az.monitor",
"redirect_document_id": false
},
{
"source_path_from_root": "/articles/azure-monitor/insights/azure-cli-application-insights-component.md" ,
"redirect_url": "/cli/azure/monitor/app-insights",
"redirect_document_id": false
}
]
}
}

5 changes: 5 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
Loading

0 comments on commit 997f20b

Please sign in to comment.