Merge branch 'main' into php

Author: msangapu-msft

.github/workflows/stale.yml

@@ -23,11 +23,11 @@ jobs:
         # start-date: '2021-03-19'
         stale-pr-message: >
           This pull request has been inactive for at least 14 days.
-          If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.
+          If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation?branch=main) for instructions.
                     
-          [Get Help](https://review.docs.microsoft.com/help/contribute/help-options?branch=master)  
+          [Get Help](https://review.docs.microsoft.com/help/contribute/help-options?branch=main)  
           
           [Docs Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)  
           
-          [Resolve Merge Conflict](https://review.docs.microsoft.com/help/contribute/resolve-merge-conflicts?branch=master)  
+          [Resolve Merge Conflict](https://review.docs.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)  
         

.gitignore

@@ -24,4 +24,3 @@ AzureMigration.ps1
 .gitignore
 **/.vscode/settings.json
 *.pdn
-articles/azure-cache-for-redis/media/cache-managed-identity/Screenshot 2022-01-20 092913.pdn

.openpublishing.publish.config.json

@@ -441,6 +441,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azureml-examples-march-cli-preview",
+      "url": "https://github.com/azure/azureml-examples",
+      "branch": "march-cli-preview",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "terraform",
       "url": "https://github.com/Azure/terraform",
@@ -842,7 +848,26 @@
       "url": "https://github.com/Azure-Samples/msdocs-flask-postgresql-sample-app",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azuresignalr-samples",
+      "url": "https://github.com/aspnet/AzureSignalR-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azure-webpubsub",
+      "url": "https://github.com/Azure/azure-webpubsub",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "functions-sql-todo-sample",
+      "url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
+      "branch": "docs-snippets",
+      "branch_mapping": {}
     }
+
   ],
   "branch_target_mapping": {
     "live": [
@@ -866,6 +891,7 @@
   "redirection_files": [
     ".openpublishing.redirection.json",
     ".openpublishing.redirection.active-directory.json",
+    ".openpublishing.redirection.azure-blob.json",
     ".openpublishing.redirection.azure-sql.json",
     "articles/data-factory/.openpublishing.redirection.data-factory.json",
     ".openpublishing.redirection.defender-for-cloud.json",

.openpublishing.redirection.active-directory.json

@@ -340,6 +340,11 @@
       "redirect_url": "/articles/active-directory/saas-apps/miro-tutorial",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/mimecast-admin-console-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/mimecast-personal-portal-tutorial",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-saas-fax.plus-tutorial.md",
       "redirect_url": "/articles/active-directory/saas-apps/fax-plus-tutorial",
@@ -10771,8 +10776,13 @@
       "redirect_document_id": false
     },
     {
-      "source_path": "articles/active-directory/reports-monitoring/reference-azure-ad-sla-performance.md",
-      "redirect_url": "/azure/active-directory/reports-monitoring/overview-monitoring",
+      "source_path": "articles/active-directory/manage-apps/get-it-now-azure-marketplace.md",
+      "redirect_url": "/azure/active-directory/manage-apps/add-application-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md",
+      "redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",
       "redirect_document_id": false
     }
 

.openpublishing.redirection.azure-blob.json

@@ -0,0 +1,19 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/storage/blobs/storage-upload-process-images.md",
+            "redirect_url": "/azure/storage/blobs/blob-upload-function-trigger",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/storage/blobs/storage-secure-access-application.md",
+            "redirect_url": "/azure/storage/blobs/blob-upload-function-trigger",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/storage/blobs/storage-monitor-troubleshoot-storage-application.md",
+            "redirect_url": "/azure/storage/blobs/blob-upload-function-trigger",
+            "redirect_document_id": false
+        }
+    ]
+}

.openpublishing.redirection.azure-monitor.json

@@ -10,11 +10,6 @@
             "redirect_url": "/azure/azure-monitor/app/performance-counters",
             "redirect_document_id": true
         },
-        {
-            "source_path_from_root": "/articles/application-insights/cloudservices.md",
-            "redirect_url": "/azure/azure-monitor/app/azure-web-apps-net",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/service-bus-insights.md",
             "redirect_url": "/azure/service-bus-messaging/service-bus-insights",
@@ -39,7 +34,21 @@
             "source_path_from_root": "/articles/azure-monitor/app/change-analysis-troubleshoot.md",
             "redirect_url": "/azure/azure-monitor/change/change-analysis-troubleshoot",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/pricing.md",
+            "redirect_url": "/azure/azure-monitor/logs/cost-logs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/manage-cost-storage.md",
+            "redirect_url": "/azure/azure-monitor/logs/cost-logs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/data-ingestion-from-file.md",
+            "redirect_url": "/azure/azure-monitor/agents/data-sources-custom-logs",
+            "redirect_document_id": false
         }
-
     ]
 }

.openpublishing.redirection.azure-sql.json

@@ -190,6 +190,16 @@
             "redirect_url": "/azure/azure-sql/managed-instance/job-automation-managed-instance",
             "redirect_document_id": true
         },   
+        {
+            "source_path_from_root": "/articles/azure-sql/managed-instance/link-feature.md",
+            "redirect_url": "/azure/azure-sql/managed-instance/managed-instance-link-feature-overview",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/managed-instance/link-feature-best-practices.md",
+            "redirect_url": "/azure/azure-sql/managed-instance/managed-instance-link-best-practices",
+            "redirect_document_id": true
+        }, 
         {
             "source_path_from_root": "/articles/azure-sql/database/service-tiers-general-purpose-business-critical.md",
             "redirect_url": "/azure/azure-sql/database/service-tiers-vcore",

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

@@ -1,5 +1,25 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/resources-manage-proprietary-protocols.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/overview#extend-support-to-proprietary-protocols",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-windows-endpoint-monitoring.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-control-what-traffic-is-monitored#configure-windows-endpoint-monitoring",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/concept-key-concepts.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/overview-eiot.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/overview",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-building-the-defender-micro-agent-from-source.md",
             "redirect_url": "/azure/defender-for-iot/device-builders/overview",
@@ -32,7 +52,7 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-alerts-on-your-sensor.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts#analytics-and-self-learning-engines",
+            "redirect_url": "/azure/defender-for-iot/organizations/overview",
             "redirect_document_id": false
         },
 	    {
@@ -47,7 +67,7 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-iot/concept-key-concepts.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts",
+            "redirect_url": "/azure/defender-for-iot/organizations/overview",
             "redirect_document_id": false
         },
         {
@@ -497,7 +517,7 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/resources-sensor-deployment-checklist.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/how-to-set-up-your-network#predeployment-checklist",
+            "redirect_url": "/azure/defender-for-iot/organizations/pre-deployment-checklist",
             "redirect_document_id": false
         },
         {

.openpublishing.redirection.iot-hub.json

@@ -938,6 +938,81 @@
       "redirect_url": "/azure/iot-hub/tutorial-x509-scripts",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-500xxx-internal-errors.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#500xxx-internal-errors",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-400027-connectionforcefullyclosedonnewconnection.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#40027-connectionforcefullyclosedonnewconnection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-401003-iothubunauthorized.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#401003-iothubunauthorized",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-403004-devicemaximumqueuedepthexceeded.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#403004-devicemaximumqueuedepthexceeded",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-403002-iothubquotaexceeded.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#403002-iothubquotaexceeded",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-403006-devicemaximumactivefileuploadlimitexceeded.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#403006-devicemaximumactivefileuploadlimitexceeded",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-404001-devicenotfound.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#404001-devicenotfound",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-404103-devicenotonline.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#404103-devicenotonline",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-404104-deviceconnectionclosedremotely.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#404104-deviceconnectionclosedremotely",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-409001-devicealreadyexists.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#409001-devicealreadyexists",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-409002-linkcreationconflict.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#409002-linkcreationconflict",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-412002-devicemessagelocklost.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#412002-devicemessagelocklost",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-429001-throttlingexception.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#429001-throttlingexception",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-503003-partitionnotfound.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#503003-partitionnotfound",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-troubleshoot-error-504101-gatewaytimeout.md",
+      "redirect_url": "/azure/iot-hub/troubleshoot-error-codes#504101-gatewaytimeout",
+      "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",
@@ -958,7 +1033,6 @@
       "redirect_url": "https://github.com/Azure/iot-edge/tree/master/v1/doc/commercial_gateway_kit/iot-hub-gateway-kit-c-use-iot-gateway-for-data-conversion.md",
       "redirect_document_id": false
     },
-
     {
       "source_path_from_root": "/articles/iot-hub/iot-hub-iot-edge-overview.md",
       "redirect_url": "https://github.com/Azure/iot-edge/tree/master/v1/doc/iot-hub-iot-edge-overview.md",
@@ -1008,7 +1082,31 @@
       "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
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-device-management-visual-studio.md",
+      "redirect_url": "/azure/iot-hub/iot-hub-device-management-iot-toolkit",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-operations-monitoring.md",
+      "redirect_url": "/azure/iot-hub/monitor-iot-hub",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-migrate-to-diagnostics-settings.md",
+      "redirect_url": "/azure/iot-hub/monitor-iot-hub",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-protocol-gateway.md",
+      "redirect_url": "/azure/iot-edge/iot-edge-as-gateway",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/iot-hub-visual-studio-cloud-device-messaging.md",
+      "redirect_url": "/azure/iot-hub/iot-hub-vscode-iot-toolkit-cloud-device-messaging",
+      "redirect_document_id": false
     }
-    
   ]
 }