Merge branch 'main' into nov30-eshaauthor

Author: kgremban

.openpublishing.publish.config.json

@@ -950,6 +950,7 @@
     "articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
     "articles/iot-develop/.openpublishing.redirection.iot-develop.json",
     "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
+    "articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
     "articles/mariadb/.openpublishing.redirection.mariadb.json",
     "articles/marketplace/.openpublishing.redirection.marketplace.json",
     "articles/mysql/.openpublishing.redirection.mysql.json",
@@ -977,6 +978,7 @@
     "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
     ".openpublishing.redirection.baremetal-infrastructure.json",
     "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
-    "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json"
+    "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
+    ".openpublishing.redirection.azure-vmware.json"
   ]
 }

.openpublishing.redirection.active-directory.json

@@ -45,6 +45,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -10921,6 +10926,11 @@
       "redirect_url": "/azure/azure-percept/index",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/howto-install-use-log-analytics-views.md",
+      "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
       "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",

.openpublishing.redirection.azure-monitor.json

@@ -5541,6 +5541,36 @@
             "source_path_from_root": "/articles/azure-monitor/logs/api/authentication-authorization.md",
             "redirect_url": "/azure/azure-monitor/logs/api/access-api",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/java-2x-get-started.md",
+            "redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/java-2x-trace-logs.md",
+            "redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/java-2x-agent.md",
+            "redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/java-2x-filter-telemetry.md",
+            "redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/java-2x-collectd.md",
+            "redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/java-2x-micrometer.md",
+            "redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-productivity.json

@@ -1,39 +1,89 @@
 {
-    "redirections": [
-        {
-            "source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
-            "redirect_url": "/azure/lab-services/lab-services-overview",
-            "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
-          "redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
-          "redirect_document_id": false
-      }
-    ]
-}
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
+      "redirect_url": "/azure/lab-services/lab-services-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
+      "redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-create-schedules-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-delete-lab-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-user-lists-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-vm-pool-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-get-started-create-lab-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-configure-teams-for-lab-plans",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/how-to-get-started-create-lab-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-configure-canvas-for-lab-plans",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/how-to-create-schedules-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-delete-lab-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-user-lists-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-vm-pool-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    }
+  ]
+}

.openpublishing.redirection.azure-vmware.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-vmware/send-logs-to-log-analytics.md",
+            "redirect_url": "/azure/azure-vmware/configure-vmware-syslogs",
+            "redirect_document_id": false
+        }
+    ]
+}

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

@@ -759,6 +759,16 @@
             "source_path_from_root": "/articles/defender-for-cloud/deploy-vulnerability-assessment-tvm.md",
             "redirect_url": "/azure/defender-for-cloud/deploy-vulnerability-assessment-defender-vulnerability-management",
             "redirect_document_id": true
-        }    
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/plan-multicloud-security-other-resources.md",
+            "redirect_url": "/azure/defender-for-cloud/multicloud",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/defender-for-servers-introduction.md",
+            "redirect_url": "/azure/defender-for-cloud/plan-defender-for-servers",
+            "redirect_document_id": true
+        }
       ]
 }

.openpublishing.redirection.healthcare-apis.json

@@ -194,8 +194,8 @@
     },
     {
         "source_path_from_root": "/articles/healthcare-apis/use-smart-on-fhir-proxy.md",
-        "redirect_url": "/azure/healthcare-apis/fhir/use-smart-on-fhir-proxy",
-        "redirect_document_id": true
+        "redirect_url": "/azure/healthcare-apis/azure-api-for-fhir/smart-on-fhir",
+        "redirect_document_id": false
     },
     {
         "source_path_from_root": "/articles/healthcare-apis/fhir/use-custom-headers.md",
@@ -357,11 +357,6 @@
         "redirect_url": "/azure/healthcare-apis/azure-api-for-fhir/tutorial-web-app-write-web-app",
         "redirect_document_id": true
     },
-    {
-        "source_path_from_root": "/articles/healthcare-apis/fhir/use-smart-on-fhir-proxy.md",
-        "redirect_url": "/azure/healthcare-apis/azure-api-for-fhir/use-smart-on-fhir-proxy",
-        "redirect_document_id": true
-    },
     {
         "source_path_from_root": "/articles/healthcare-apis/data-transformation/de-identified-export.md",
         "redirect_url": "/azure/healthcare-apis/fhir/de-identified-export",

.openpublishing.redirection.json

@@ -25603,36 +25603,6 @@
             "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-copy-managed-disks-to-same-or-different-subscription",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-copy-managed-disks-vhd.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-copy-managed-disks-vhd",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-copy-snapshot-to-same-or-different-subscription.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-copy-snapshot-to-same-or-different-subscription",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-copy-snapshot-to-storage-account.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-copy-snapshot-to-storage-account",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-create-managed-disk-from-snapshot.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-create-managed-disk-from-snapshot",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-create-managed-disk-from-vhd.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-create-managed-disk-from-vhd",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-create-snapshot-from-vhd.md",
-            "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-create-snapshot-from-vhd",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/virtual-machines/scripts/virtual-machines-powershell-sample-create-vm-from-managed-os-disks.md",
             "redirect_url": "/previous-versions/azure/virtual-machines/scripts/virtual-machines-powershell-sample-create-vm-from-managed-os-disks",

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.8 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

articles/active-directory-b2c/TOC.yml

@@ -9,9 +9,6 @@
   - name: Technical overview
     href: technical-overview.md
     displayName: Azure AD B2C architecture, SLA, Azure AD B2C high availability, Azure AD B2C SLA, HA
-    # Add learn module
-  - name: 'Authenticate users: NodeJs quick course'
-    href: /learn/modules/authenticate-users-node-web-app-use-azure-active-directory-b2c/ 
   - name: What's new in docs?
     href: whats-new-docs.md
 # Node Quickstarts