Merge branch 'KelvinTegelaar:master' into master

Author: luke255

Config/CIPPTimers.json

@@ -241,7 +241,7 @@
     "Id": "5e8a9b4c-2d6f-4a3e-b7c1-9d0e5f3a8b2c",
     "Command": "Start-IntuneReportExportOrchestrator",
     "Description": "Submit Intune report-export jobs ahead of nightly DB cache run",
-    "Cron": "0 0 2 * * *",
+    "Cron": "0 0 1 * * *",
     "Priority": 22,
     "RunOnProcessor": true,
     "TZOffset": true,

Config/ConversionTable.csv

@@ -59,6 +59,10 @@
     "GUID": "8c4ce438-32a7-4ac5-91a6-e22ae08d9c8b",
     "Product_Display_Name": "Rights Management Adhoc"
   },
+  {
+    "GUID": "093e8d14-a334-43d9-93e3-30589a8b47d0",
+    "Product_Display_Name": "Rights Management Service Basic Content Protection"
+  },
   {
     "GUID": "5b631642-bd26-49fe-bd20-1daaa972ef80",
     "Product_Display_Name": "Microsoft Power Apps for Developer"

Config/ExcludeSkuList.JSON

@@ -44,6 +44,31 @@
     ],
     "Hidden": true
   },
+  {
+    "Id": "CopilotAI",
+    "Name": "Copilot & AI",
+    "Description": "Under Development: Microsoft 365 Copilot and AI management pages including settings, usage reports, Agent365 packages, and Shadow AI analysis.",
+    "Enabled": false,
+    "AllowUserToggle": false,
+    "Timers": [],
+    "Endpoints": [
+      "ListCopilotSettings",
+      "ExecCopilotSettings",
+      "ListCopilotUsage",
+      "ListAgent365Packages",
+      "ListAgent365PackageDetail",
+      "ListShadowAI"
+    ],
+    "Pages": [
+      "/copilot/settings",
+      "/copilot/shadow-ai",
+      "/copilot/agent365/packages",
+      "/copilot/reports/copilot-adoption",
+      "/copilot/reports/copilot-usage",
+      "/copilot/reports/copilot-trend"
+    ],
+    "Hidden": true
+  },
   {
     "Id": "MCPServer",
     "Name": "MCP Server",
@@ -56,5 +81,20 @@
     ],
     "Pages": [],
     "Hidden": false
+  },
+  {
+    "Id": "AppInsights",
+    "Name": "App Insights",
+    "Description": "App Insights page not used in NG",
+    "Enabled": true,
+    "AllowUserToggle": false,
+    "Timers": [],
+    "Endpoints": [
+      "ExecAppInsightsQuery"
+    ],
+    "Pages": [
+      "/cipp/advanced/diagnostics"
+    ],
+    "Hidden": true
   }
 ]

Config/FeatureFlags.json

@@ -23,6 +23,18 @@
     {
       "resourceAppId": "00000003-0000-0000-c000-000000000000",
       "resourceAccess": [
+        {
+          "id": "ed31732f-9495-47ed-ba3b-4ed0948c1c64",
+          "type": "Role"
+        },
+        {
+          "id": "72f0655d-6228-4ddc-8e1b-164973b9213b",
+          "type": "Role"
+        },
+        {
+          "id": "556d5e2e-1081-4452-8147-26c3a1b06f58",
+          "type": "Role"
+        },
         {
           "id": "1bfefb4e-e0b5-418b-a88f-73c46d2cc8e9",
           "type": "Role"