Skip to content

Commit 6160305

Browse files
authored
Merge branch 'main' into feature/Task536167-10
2 parents 4d15bba + 82bae6a commit 6160305

File tree

5,268 files changed

+111025
-36190
lines changed

Some content is hidden

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

5,268 files changed

+111025
-36190
lines changed

.openpublishing.publish.config.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
"branch": "master",
7676
"branch_mapping": {}
7777
},
78+
{
79+
"path_to_root": "azure_storage-snippets",
80+
"url": "https://github.com/Azure-Samples/AzureStorageSnippets",
81+
"branch": "master",
82+
"branch_mapping": {}
83+
},
7884
{
7985
"path_to_root": "azure_cli_scripts",
8086
"url": "https://github.com/Azure-Samples/azure-cli-samples",
@@ -884,6 +890,8 @@
884890
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
885891
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
886892
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
887-
"articles/mysql/.openpublishing.redirection.mysql.json"
893+
"articles/mysql/.openpublishing.redirection.mysql.json",
894+
"articles/container-apps/.openpublishing.redirection.container-apps.json",
895+
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json"
888896
]
889897
}

.openpublishing.redirection.active-directory.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,11 @@
800800
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
801801
"redirect_document_id": false
802802
},
803+
{
804+
"source_path_from_root": "/articles/active-directory/external-identities/o365-external-user.md",
805+
"redirect_url": "/azure/active-directory/external-identities/what-is-b2b",
806+
"redirect_document_id": false
807+
},
803808
{
804809
"source_path_from_root": "/articles/active-directory/active-directory-b2b-current-preview-limitations.md",
805810
"redirect_url": "/azure/active-directory/active-directory-b2b-current-limitations",
@@ -7910,6 +7915,11 @@
79107915
"redirect_url": "/azure/active-directory/saas-apps/cisco-webex-provisioning-tutorial",
79117916
"redirect_document_id": false
79127917
},
7918+
{
7919+
"source_path_from_root": "/articles/active-directory/saas-apps/active-and-thriving-perth-airport-tutorial.md",
7920+
"redirect_url": "/azure/active-directory/saas-apps/active-and-thriving-tutorial",
7921+
"redirect_document_id": false
7922+
},
79137923
{
79147924
"source_path_from_root": "/articles/active-directory/active-directory-saas-cisco-webex-tutorial.md",
79157925
"redirect_url": "/azure/active-directory/saas-apps/cisco-webex-tutorial",

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
"source_path_from_root": "/articles/azure-monitor/insights/service-bus-insights.md",
2020
"redirect_url": "/azure/service-bus-messaging/service-bus-insights",
2121
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-overview.md",
25+
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
26+
"redirect_document_id": false
2227
}
2328
]
2429
}

.openpublishing.redirection.defender-for-iot.json

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
22
"redirections": [
3-
{
4-
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
5-
"redirect_url": "/azure/sentinel/iot-solution",
6-
"redirect_document_id": false
7-
},
83
{
94
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-building-the-defender-micro-agent-from-source.md",
105
"redirect_url": "/azure/defender-for-iot/device-builders/overview",
@@ -30,7 +25,17 @@
3025
"redirect_url": "/azure/defender-for-iot/organizations/getting-started",
3126
"redirect_document_id": false
3227
},
33-
{
28+
{
29+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-view-information-provided-in-alerts.md",
30+
"redirect_url": "/azure/defender-for-iot/organizations/how-to-view-alerts",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-alerts-on-your-sensor.md",
35+
"redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts#analytics-and-self-learning-engines",
36+
"redirect_document_id": false
37+
},
38+
{
3439
"source_path_from_root": "/azure/defender-for-iot/organizations/quickstart-system-prerequisites.md",
3540
"redirect_url": "/azure/defender-for-iot/organizations/getting-started",
3641
"redirect_document_id": false
@@ -230,11 +235,6 @@
230235
"redirect_url": "/azure/defender-for-iot/organizations/how-to-track-sensor-activity",
231236
"redirect_document_id": false
232237
},
233-
{
234-
"source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
235-
"redirect_url": "/azure/defender-for-iot/organizations/how-to-configure-with-sentinel",
236-
"redirect_document_id": false
237-
},
238238
{
239239
"source_path_from_root": "/articles/defender-for-iot/how-to-troubleshoot-the-sensor-and-on-premises-management-console.md",
240240
"redirect_url": "/azure/defender-for-iot/organizations/how-to-troubleshoot-the-sensor-and-on-premises-management-console",
@@ -564,6 +564,29 @@
564564
"source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-sdk.md",
565565
"redirect_url": "/azure/defender-for-iot/organizations",
566566
"redirect_document_id": false
567+
},
568+
{
569+
"source_path_from_root": "/articles/device-builders/how-to-configure-with-sentinel.md",
570+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
571+
"redirect_document_id": false
572+
},
573+
{
574+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
575+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
576+
"redirect_document_id": false
577+
},
578+
{
579+
"source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
580+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
581+
"redirect_document_id": false
582+
},
583+
{
584+
"source_path_from_root": "/articles/defender-for-iot/device-builders/concept-security-agent-authentication.md",
585+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-standalone-agent-binary-installation",
586+
"redirect_document_id": false
567587
}
568588
]
569-
}
589+
}
590+
591+
592+

0 commit comments

Comments
 (0)