Merge remote-tracking branch 'upstream/main' into gennadk900

Author: GennadNY

.openpublishing.publish.config.json

@@ -1007,7 +1007,7 @@
     {
       "path_to_root": "azure-actions-workflow-samples",
       "url": "https://github.com/Azure/actions-workflow-samples",
-      "branch": "main",
+      "branch": "master",
       "branch_mapping": {}
     }  
   ],
@@ -1086,6 +1086,7 @@
   "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
   "articles/logic-apps/.openpublishing.redirection.logic-apps.json",
   "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
+  "articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
   "articles/mariadb/.openpublishing.redirection.mariadb.json",
   "articles/marketplace/.openpublishing.redirection.marketplace.json",
   "articles/mysql/.openpublishing.redirection.mysql.json",
@@ -1103,6 +1104,7 @@
   "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
   "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
   "articles/dev-box/.openpublishing.redirection.dev-box.json",
-  "articles/deployment-environments/.openpublishing.redirection.deployment-environments.json"
+  "articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
+  "articles/network-watcher/.openpublishing.redirection.network-watcher.json"
 ]
 }

.openpublishing.redirection.active-directory.json

@@ -1,5 +1,20 @@
 {
   "redirections": [
+    {
+      "source_path_from_root": "/articles/active-directory/develop/active-directory-enterprise-app-role-management.md",
+      "redirect_url": "/azure/active-directory/develop/enterprise-app-role-management",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/active-directory-schema-extensions.md",
+      "redirect_url": "/azure/active-directory/develop/schema-extensions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/active-directory-optional-claims.md",
+      "redirect_url": "/azure/active-directory/develop/optional-claims",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/develop/active-directory-jwt-claims-customization.md",
       "redirect_url": "/azure/active-directory/develop/jwt-claims-customization",
@@ -990,6 +1005,31 @@
       "redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/spa-quickstart-portal-react-ciam.md",
+      "redirect_url": "/azure/active-directory/external-identities/customers/spa-quickstart-portal-react-ciam",
+      "redirect_document_id": true 
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/spa-quickstart-portal-angular-ciam.md",
+      "redirect_url": "/azure/active-directory/external-identities/customers/spa-quickstart-portal-angular-ciam",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/spa-quickstart-portal-vanilla-js-ciam.md",
+      "redirect_url": "/azure/active-directory/external-identities/customers/spa-quickstart-portal-vanilla-js-ciam",
+      "redirect_document_id": true 
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/web-app-quickstart-portal-dotnet-ciam.md",
+      "redirect_url": "/azure/active-directory/external-identities/customers/web-app-quickstart-portal-dotnet-ciam",
+      "redirect_document_id": true 
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/web-app-quickstart-portal-node-js-ciam.md",
+      "redirect_url": "/azure/active-directory/external-identities/customers/web-app-quickstart-portal-node-js-ciam",
+      "redirect_document_id": true 
+    },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/conditional-access.md",
       "redirect_url": "/azure/active-directory/external-identities/authentication-conditional-access",
@@ -6580,6 +6620,11 @@
       "redirect_url": "/troubleshoot/azure/active-directory/troubleshoot-adding-apps",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/manage-apps/scripts/powershell-export-apps-with-expriring-secrets.md",
+      "redirect_url": "/troubleshoot/azure/active-directory/manage-apps/scripts/powershell-export-apps-with-expiring-secrets",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/application-config-add-app-problem-problem-adding-gallery-app.md",
       "redirect_url": "/troubleshoot/azure/active-directory/troubleshoot-adding-apps",
@@ -10240,6 +10285,76 @@
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/azure-ad-data-residency.md",
+      "redirect_url": "/azure/active-directory/fundamentals/data-residency",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/five-steps-to-full-application-integration-with-azure-ad.md",
+      "redirect_url": "/azure/active-directory/fundamentals/five-steps-to-full-application-integration",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/service-accounts-governing-azure.md",
+      "redirect_url": "/azure/active-directory/fundamentals/govern-service-accounts",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/service-accounts-introduction-azure.md",
+      "redirect_url": "/azure/active-directory/fundamentals/secure-service-accounts",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/whats-deprecated-azure-ad.md",
+      "redirect_url": "/azure/active-directory/fundamentals/what-is-deprecated",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-compare-azure-ad-to-ad.md",
+      "redirect_url": "/azure/active-directory/fundamentals/compare",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-ops-guide-iam.md",
+      "redirect_url": "/azure/active-directory/fundamentals/ops-guide-iam",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/standards/configure-azure-active-directory-for-fedramp-high-impact.md",
+      "redirect_url": "/azure/active-directory/standards/configure-for-fedramp-high-impact",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-ops-guide-ops.md",
+      "redirect_url": "/azure/active-directory/fundamentals/ops-guide-ops",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-ops-guide-intro.md",
+      "redirect_url": "/azure/active-directory/fundamentals/ops-guide-intro",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-ops-guide-auth.md",
+      "redirect_url": "/azure/active-directory/fundamentals/ops-guide-auth",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-ops-guide-govern.md",
+      "redirect_url": "/azure/active-directory/fundamentals/ops-guide-govern",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/manage-apps/datawiza-azure-ad-sso-mfa-oracle-ebs.md",
+      "redirect_url": "/azure/active-directory/manage-apps/datawiza-sso-mfa-oracle-ebs",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/manage-apps/cloudflare-azure-ad-integration.md",
+      "redirect_url": "/azure/active-directory/manage-apps/cloudflare-integration",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/active-directory/saas-apps/clarizen-provisioning-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -10965,6 +11080,11 @@
       "redirect_url": "/azure/active-directory/app-provisioning/customize-application-attributes",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory/manage-apps/migrate-applications-from-okta-to-azure-active-directory.md",
+      "redirect_url": "/azure/active-directory/manage-apps/migrate-applications-from-okta",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/active-directory/privileged-identity-management/pim-apis-concept.md",
       "redirect_url": "/azure/active-directory/privileged-identity-management/pim-apis",
@@ -11015,6 +11135,16 @@
       "redirect_url": "/azure/active-directory/privileged-identity-management/pim-complete-azure-ad-roles-and-resource-roles-review",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/manage-apps/f5-aad-integration.md",
+      "redirect_url": "/azure/active-directory/manage-apps/f5-integration",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/manage-apps/f5-aad-password-less-vpn.md",
+      "redirect_url": "/azure/active-directory/manage-apps/f5-passwordless-vpn",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/active-directory/privileged-identity-management/pim-how-to-perform-security-review.md",
       "redirect_url": "/azure/active-directory/privileged-identity-management/pim-perform-azure-ad-roles-and-resource-roles-review",
@@ -12400,6 +12530,12 @@
       "redirect_url": "/azure/active-directory/hybrid/connect/tshoot-connect-tshoot-sql-connectivity",
       "redirect_document_id": false
       },
+
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/secure-with-azure-ad-multiple-tenants.md",
+        "redirect_url": "/azure/active-directory/fundamentals/secure-multiple-tenants",
+        "redirect_document_id": true
+      },
 
       {
       "source_path_from_root": "/articles/active-directory/hybrid/tutorial-federation.md",
@@ -12425,7 +12561,6 @@
       "redirect_document_id": false
       },
 
-      
       {
       "source_path_from_root": "/articles/active-directory/hybrid/whatis-aadc-admin-agent.md",
       "redirect_url": "/azure/active-directory/hybrid/connect/whatis-aadc-admin-agent",
@@ -12474,6 +12609,30 @@
         "redirect_url": "/azure/active-directory/privileged-identity-management/pim-perform-roles-and-resource-roles-review",
         "redirect_document_id": false
       },
+    
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-deployment-plans.md",
+        "redirect_url": "/azure/active-directory/fundamentals/deployment-plans",
+        "redirect_document_id": true
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/secure-with-azure-ad-best-practices.md",
+        "redirect_url": "/azure/active-directory/fundamentals/secure-fundamentals",
+        "redirect_document_id": false
+      },
+      
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/secure-with-azure-ad-fundamentals.md",
+        "redirect_url": "/azure/active-directory/fundamentals/secure-fundamentals",
+        "redirect_document_id": true
+      },
+    
+      {
+        "source_path_from_root": "/articles/active-directory/enterprise-users/clean-up-unmanaged-azure-ad-accounts.md",
+        "redirect_url": "/azure/active-directory/enterprise-users/clean-up-unmanaged-accounts",
+        "redirect_document_id": true
+      },
 
       {
         "source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-complete-azure-ad-roles-and-resource-roles-review.md",
@@ -12491,7 +12650,90 @@
         "source_path_from_root": "/articles/active-directory-domain-services/migrate-from-classic-vnet.md",
         "redirect_url": "/azure/active-directory-domain-services/overview",
         "redirect_document_id": false
-      }
+      },
 
+      {
+        "source_path_from_root": "/articles/active-directory/manage-apps/datawiza-azure-ad-sso-oracle-jde.md",
+        "redirect_url": "/azure/active-directory/manage-apps/datawiza-sso-oracle-jde",
+        "redirect_document_id": true
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/secure-with-azure-ad-introduction.md",
+        "redirect_url": "/azure/active-directory/fundamentals/secure-introduction",
+        "redirect_document_id": true
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/secure-with-azure-ad-resource-management.md",
+        "redirect_url": "/azure/active-directory/fundamentals/secure-resource-management",
+        "redirect_document_id": true
+      },
+      
+      {
+        "source_path_from_root": "/articles/active-directory/fundamentals/secure-with-azure-ad-single-tenant.md",
+        "redirect_url": "/azure/active-directory/fundamentals/secure-single-tenant",
+        "redirect_document_id": true
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/manage-apps/datawiza-azure-ad-sso-oracle-peoplesoft.md",
+        "redirect_url": "/azure/active-directory/manage-apps/datawiza-sso-oracle-peoplesoft",
+        "redirect_document_id": true
+      },
+      
+      {
+        "source_path_from_root": "/articles/active-directory/manage-apps/silverfort-azure-ad-integration.md",
+        "redirect_url": "/azure/active-directory/manage-apps/silverfort-integration",
+        "redirect_document_id": true
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/manage-apps/datawiza-with-azure-ad.md",
+        "redirect_url": "/azure/active-directory/manage-apps/datawiza-configure-sha",
+        "redirect_document_id": true
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/manage-apps/migrate-okta-federation-to-azure-active-directory.md",
+        "redirect_url": "/azure/active-directory/manage-apps/migrate-okta-federation",
+        "redirect_document_id": true
+      },
+      {
+        "source_path_from_root": "/articles/active-directory/manage-apps/migrate-okta-sign-on-policies-to-azure-active-directory-conditional-access.md",
+        "redirect_url": "/azure/active-directory/manage-apps/migrate-okta-sign-on-policies-conditional-access",
+        "redirect_document_id": true
+      },
+    
+      {
+        "source_path_from_root": "/articles/active-directory/standards/configure-azure-active-directory-for-cmmc-compliance.md",
+        "redirect_url": "/azure/active-directory/standards/configure-for-cmmc-compliance",
+        "redirect_document_id": true
+
+      },
+
+      {
+      "source_path_from_root": "/articles/active-directory/external-identities/customers/microsoft-graph-operations-custom-extensions.md",
+      "redirect_url": "/azure/active-directory/external-identities/customers/microsoft-graph-operations",
+      "redirect_document_id": false
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/external-identities/customers/microsoft-graph-operations-branding.md",
+        "redirect_url": "/azure/active-directory/external-identities/customers/microsoft-graph-operations",
+        "redirect_document_id": false
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/external-identities/customers/microsoft-graph-operations-user-flow.md",
+        "redirect_url": "/azure/active-directory/external-identities/customers/microsoft-graph-operations",
+        "redirect_document_id": false
+      },
+
+      {
+        "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-management-apis-overview.md",
+        "redirect_url": "/azure/active-directory/external-identities/customers/microsoft-graph-operations",
+        "redirect_document_id": false
+      }
+    
       ]
-}
+} 

.openpublishing.redirection.azure-monitor.json

@@ -6150,7 +6150,16 @@
             "source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
             "redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/opentelemetry-dotnet-exporter.md",
+            "redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/api/app-insights-azure-ad-api.md",
+            "redirect_url": "/azure/azure-monitor/app/app-insights-azure-ad-api",
+            "redirect_document_id": false
         }
-        
     ]
 }

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

@@ -712,6 +712,11 @@
             "source_path_from_root": "/articles/defender-for-iot/organizations/references-defender-for-iot-glossary.md",
             "redirect_url": "/azure/defender-for-iot/organizations/overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/faqs-ot.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/faqs-general",
+            "redirect_document_id": false
         }
     ]
 }