Merge remote-tracking branch 'upstream/dev' into dev

Author: JohnDuprey

src/_nav.jsx

@@ -162,6 +162,11 @@ const _nav = [
         name: 'App Consent Requests',
         to: '/tenant/administration/app-consent-requests',
       },
+      {
+        component: CNavItem,
+        name: 'Authentication Methods',
+        to: '/tenant/administration/authentication-methods',
+      },
       {
         component: CNavItem,
         name: 'Tenant Onboarding',

src/data/alerts.json

@@ -89,5 +89,10 @@
     "name": "DepTokenExpiry",
     "label": "Alert on expiring DEP tokens",
     "recommendedRunInterval": "1d"
+  },
+  {
+    "name": "SoftDeletedMailboxes",
+    "label": "Alert on soft deleted mailboxes",
+    "recommendedRunInterval": "1d"
   }
-]
+]