Merge branch 'master' into steveviAzureGov7

Author: stevevi

.openpublishing.publish.config.json

@@ -429,6 +429,12 @@
       "branch": "cli-preview",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "terraform",
+      "url": "https://github.com/Azure/terraform",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-qnamaker-nodejs",
       "url": "https://github.com/Azure-Samples/cognitive-services-qnamaker-nodejs",
@@ -819,13 +825,17 @@
     ".openpublishing.redirection.json",
     ".openpublishing.redirection.active-directory.json",
     ".openpublishing.redirection.data-factory.json",
+    ".openpublishing.redirection.defender-for-cloud.json",
     ".openpublishing.redirection.defender-for-iot.json",
     ".openpublishing.redirection.healthcare-apis.json",
     ".openpublishing.redirection.iot-hub.json",
     ".openpublishing.redirection.key-vault.json",
     ".openpublishing.redirection.media-services.json",
     ".openpublishing.redirection.security-benchmark.json",
     ".openpublishing.redirection.synapse-analytics.json",
+    ".openpublishing.redirection.azure-web-pubsub.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",
     "articles/communication-services/.openpublishing.redirection.communication-services.json",
     "articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
@@ -845,6 +855,8 @@
     "articles/purview/.openpublishing.redirection.purview.json",
     "articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
     "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
-    "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
+    "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
+    "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
+    "articles/mysql/.openpublishing.redirection.mysql.json"
   ]
 }

.openpublishing.redirection.active-directory.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-web-pubsub/howto-troubleshoot-diagnostic-logs.md",
+            "redirect_url": "/azure/azure-web-pubsub/howto-troubleshoot-resource-logs",
+            "redirect_document_id": false
+        }
+    ]
+}

.openpublishing.redirection.azure-web-pubsub.json

@@ -0,0 +1,199 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/security-center/azure-defender.md",
+            "redirect_url": "/azure/security-center/defender-for-cloud-introduction",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-introduction.md",
+            "redirect_url": "/azure/security-center/defender-for-cloud-introduction",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-os-coverage.md",
+            "redirect_url": "/azure/security-center/os-coverage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-just-in-time.md",
+            "redirect_url": "/azure/security-center/just-in-time-access-usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/just-in-time-explained.md",
+            "redirect_url": "/azure/security-center/just-in-time-access-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-adaptive-application.md",
+            "redirect_url": "/azure/security-center/adaptive-application-controls",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-file-integrity-monitoring.md",
+            "redirect_url": "/azure/security-center/file-integrity-monitoring-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-file-integrity-monitoring-baselines.md",
+            "redirect_url": "/azure/security-center/file-integrity-monitoring-usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/azure-defender-dashboard.md",
+            "redirect_url": "/azure/security-center/workload-protections-dashboard",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/enable-azure-defender.md",
+            "redirect_url": "/azure/security-center/enable-enhanced-security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-wdatp.md",
+            "redirect_url": "/azure/security-center/integration-defender-for-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/recommendations-compute-and-apps.md",
+            "redirect_url": "/azure/security-center/recommendations-reference#compute-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/defender-for-dns-usage.md",
+            "redirect_url": "/azure/security-center/defender-for-dns-introduction#respond-to-microsoft-defender-for-dns-alerts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/defender-for-key-vault-usage.md",
+            "redirect_url": "/azure/security-center/defender-for-key-vault-introduction#respond-to-microsoft-defender-for-key-vault-alerts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-services.md",
+            "redirect_url": "/azure/security-center/supported-machines-endpoint-solutions-clouds",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-threat-report.md",
+            "redirect_url": "/azure/security-center/threat-intelligence-reports",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-data-security.md",
+            "redirect_url": "/azure/security-center/data-security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-remediate-recommendations.md",
+            "redirect_url": "/azure/security-center/implement-security-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-permissions.md",
+            "redirect_url": "/azure/security-center/permissions",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-cross-tenant-management.md",
+            "redirect_url": "/azure/security-center/cross-tenant-management",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-management-groups.md",
+            "redirect_url": "/azure/security-center/management-groups-roles",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-info-protection-policy.md",
+            "redirect_url": "/azure/security-center/sql-information-protection-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-troubleshooting-guide.md",
+            "redirect_url": "/azure/security-center/troubleshooting-guide",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-endpoint-protection.md",
+            "redirect_url": "/azure/security-center/endpoint-protection-recommendations-technical",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-recommendations.md",
+            "redirect_url": "/azure/security-center/review-security-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-privacy.md",
+            "redirect_url": "/azure/security-center/privacy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-powershell-onboarding.md",
+            "redirect_url": "/azure/security-center/powershell-onboarding",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-partner-integration.md",
+            "redirect_url": "/azure/security-center/partner-integration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-provide-security-contacts.md",
+            "redirect_url": "/azure/security-center/configure-email-notifications",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-get-started.md",
+            "redirect_url": "/azure/security-center/get-started",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-network-recommendations.md",
+            "redirect_url": "/azure/security-center/protect-network-resources",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-compliance-dashboard.md",
+            "redirect_url": "/azure/security-center/regulatory-compliance-dashboard",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-pricing.md",
+            "redirect_url": "/azure/security-center/enhanced-security-features-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-enable-data-collection.md",
+            "redirect_url": "/azure/security-center/enable-data-collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-alerts-overview.md",
+            "redirect_url": "/azure/security-center/alerts-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-alert-validation.md",
+            "redirect_url": "/azure/security-center/alert-validation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-provide-security-contact-details.md",
+            "redirect_url": "/azure/security-center/configure-email-notifications",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-managing-and-responding-alerts.md",
+            "redirect_url": "/azure/security-center/managing-and-responding-alerts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/security-center/security-center-adaptive-network-hardening.md",
+            "redirect_url": "/azure/security-center/adaptive-network-hardening",
+            "redirect_document_id": false
+        }
+    ]
+}

.openpublishing.redirection.defender-for-cloud.json

@@ -125,6 +125,16 @@
       "redirect_url": "/azure/iot-hub/about-iot-hub",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/iot-hub/about-iot-hub.md",
+      "redirect_url": "/azure/iot-hub/iot-concepts-and-iot-hub",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-concepts.md",
+      "redirect_url": "/azure/iot-hub/iot-concepts-and-iot-hub",
+      "redirect_document_id": false
+    },   
     {
       "source_path_from_root": "/articles/iot-hub/quickstart-send-telemetry-xamarinforms.md",
       "redirect_url": "/azure/iot-hub/about-iot-hub",
@@ -928,7 +938,6 @@
       "redirect_url": "/azure/iot-hub/tutorial-x509-scripts",
       "redirect_document_id": false
     },
- 
     {
       "source_path_from_root": "/articles/iot-hub/iot-hub-gateway-kit-c-iot-gateway-connect-device-to-cloud.md",
       "redirect_url": "https://github.com/Azure/iot-edge/tree/master/v1/doc/commercial_gateway_kit/iot-hub-gateway-kit-c-iot-gateway-connect-device-to-cloud.md",
@@ -995,7 +1004,11 @@
       "redirect_url": "https://github.com/Azure/iot-edge/tree/master/v1/samples/simulated_device_cloud_upload/iot-hub-windows-iot-edge-simulated-device.md",
       "redirect_document_id": false
     },
-  
+    {
+      "source_path_from_root": "/articles/iot-hub/tutorial-firmware-update.md",
+      "redirect_url": "/azure/iot-hub-device-update/device-update-raspberry-pi",
+      "redirect_document_id": false
+    }
 
   ]
 }