[pull] master from KelvinTegelaar:master

Config/ExcludeSkuList.JSON

@@ -3,42 +3,10 @@
     "GUID": "90d8b3f8-712e-4f7b-aa1e-62e7ae6cbe96",
     "Product_Display_Name": "Business Apps (free)"
   },
-  {
-    "GUID": "90d8b3f8-712e-4f7b-aa1e-62e7ae6cbe96",
-    "Product_Display_Name": "Business Apps (free)"
-  },
-  {
-    "GUID": "f30db892-07e9-47e9-837c-80727f46fd3d",
-    "Product_Display_Name": "MICROSOFT FLOW FREE"
-  },
   {
     "GUID": "f30db892-07e9-47e9-837c-80727f46fd3d",
     "Product_Display_Name": "MICROSOFT FLOW FREE"
   },
-  {
-    "GUID": "f30db892-07e9-47e9-837c-80727f46fd3d",
-    "Product_Display_Name": "MICROSOFT FLOW FREE"
-  },
-  {
-    "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
-    "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
-  },
-  {
-    "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
-    "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
-  },
-  {
-    "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
-    "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
-  },
-  {
-    "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
-    "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
-  },
-  {
-    "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
-    "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
-  },
   {
     "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
     "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
@@ -47,10 +15,6 @@
     "GUID": "a403ebcc-fae0-4ca2-8c8c-7a907fd6c235",
     "Product_Display_Name": "Power BI (free)"
   },
-  {
-    "GUID": "a403ebcc-fae0-4ca2-8c8c-7a907fd6c235",
-    "Product_Display_Name": "Power BI (free)"
-  },
   {
     "GUID": "61e6bd70-fbdb-4deb-82ea-912842f39431",
     "Product_Display_Name": "Dynamics 365 Customer Service Insights Trial"
@@ -59,26 +23,6 @@
     "GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
     "Product_Display_Name": "Dynamics 365 Customer Voice Trial"
   },
-  {
-    "GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
-    "Product_Display_Name": "Dynamics 365 Customer Voice Trial"
-  },
-  {
-    "GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
-    "Product_Display_Name": "Dynamics 365 Customer Voice Trial"
-  },
-  {
-    "GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
-    "Product_Display_Name": "Dynamics 365 Customer Voice Trial"
-  },
-  {
-    "GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
-    "Product_Display_Name": "Dynamics 365 Customer Voice Trial"
-  },
-  {
-    "GUID": "338148b6-1b11-4102-afb9-f92b6cdc0f8d",
-    "Product_Display_Name": "DYNAMICS 365 P1 TRIAL FOR INFORMATION WORKERS"
-  },
   {
     "GUID": "338148b6-1b11-4102-afb9-f92b6cdc0f8d",
     "Product_Display_Name": "DYNAMICS 365 P1 TRIAL FOR INFORMATION WORKERS"
@@ -87,26 +31,6 @@
     "GUID": "fcecd1f9-a91e-488d-a918-a96cdb6ce2b0",
     "Product_Display_Name": "Microsoft Dynamics AX7 User Trial"
   },
-  {
-    "GUID": "fcecd1f9-a91e-488d-a918-a96cdb6ce2b0",
-    "Product_Display_Name": "Microsoft Dynamics AX7 User Trial"
-  },
-  {
-    "GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
-    "Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
-  },
-  {
-    "GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
-    "Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
-  },
-  {
-    "GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
-    "Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
-  },
-  {
-    "GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
-    "Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
-  },
   {
     "GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
     "Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
@@ -116,71 +40,59 @@
     "Product_Display_Name": "Microsoft Teams Trial"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
-  },
-  {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
-  },
-  {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
-  },
-  {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
+    "Product_Display_Name": "Power Virtual Agents Viral Trial"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "1f2f344a-700d-42c9-9427-5cea1d5d7ba6",
+    "Product_Display_Name": "MICROSOFT STREAM"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "6470687e-a428-4b7a-bef2-8a291ad947c9",
+    "Product_Display_Name": "WINDOWS STORE FOR BUSINESS"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "710779e8-3d4a-4c88-adb9-386c958d1fdf",
+    "Product_Display_Name": "MICROSOFT TEAMS EXPLORATORY"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "8c4ce438-32a7-4ac5-91a6-e22ae08d9c8b",
+    "Product_Display_Name": "Rights Management Adhoc"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "5b631642-bd26-49fe-bd20-1daaa972ef80",
+    "Product_Display_Name": "Microsoft Power Apps for Developer"
   },
   {
-    "GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
-    "Product_Display_Name": "Power Virtual Agents Viral Trial"
+    "GUID": "6a4a1628-9b9a-424d-bed5-4118f0ede3fd",
+    "Product_Display_Name": "Dynamics 365 Business Central for IWs"
   },
   {
-    "GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
-    "Product_Display_Name": "Power Virtual Agents Viral Trial"
+    "GUID": "6ec92958-3cc1-49db-95bd-bc6b3798df71",
+    "Product_Display_Name": "Dynamics 365 Sales Premium Viral Trial"
   },
   {
-    "GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
-    "Product_Display_Name": "Power Virtual Agents Viral Trial"
+    "GUID": "3f9f06f5-3c31-472c-985f-62d9c10ec167",
+    "Product_Display_Name": "Power Pages vTrial for Makers"
   },
   {
-    "GUID": "1f2f344a-700d-42c9-9427-5cea1d5d7ba6",
-    "Product_Display_Name": "MICROSOFT STREAM"
+    "GUID": "9c7bff7a-3715-4da7-88d3-07f57f8d0fb6",
+    "Product_Display_Name": "Dynamics 365 For Sales Professional Trial"
   },
   {
-    "GUID": "1f2f344a-700d-42c9-9427-5cea1d5d7ba6",
-    "Product_Display_Name": "MICROSOFT STREAM"
+    "GUID": "8f0c5670-4e56-4892-b06d-91c085d7004f",
+    "Product_Display_Name": "App Connect IW"
   },
   {
-    "GUID": "6470687e-a428-4b7a-bef2-8a291ad947c9",
-    "Product_Display_Name": "WINDOWS STORE FOR BUSINESS"
+    "GUID": "87bbbc60-4754-4998-8c88-227dca264858",
+    "Product_Display_Name": "Power Apps and Logic Flows"
   },
   {
-    "GUID": "6470687e-a428-4b7a-bef2-8a291ad947c9",
-    "Product_Display_Name": "WINDOWS STORE FOR BUSINESS"
+    "GUID": "e5788282-6381-469f-84f0-3d7d4021d34d",
+    "Product_Display_Name": "Office 365 Extra File Storage for GCC"
   },
   {
-    "GUID": "710779e8-3d4a-4c88-adb9-386c958d1fdf",
-    "Product_Display_Name": "MICROSOFT TEAMS EXPLORATORY"
+    "GUID": "99049c9c-6011-4908-bf17-15f496e6519d",
+    "Product_Display_Name": "Office 365 Extra File Storage"
   }
 ]

Modules/CIPPCore/Public/Alerts/Get-CIPPAlertMXRecordChanged.ps1

@@ -24,11 +24,6 @@ function Get-CIPPAlertMXRecordChanged {
                 "$($Domain.Domain): MX records changed from [$($PreviousRecords -join ', ')] to [$($CurrentRecords -join ', ')]"
             }
         }
-
-        if ($ChangedDomains) {
-            Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $ChangedDomains
-        }
-
         # Update cache with current data
         foreach ($Domain in $DomainData) {
             $CurrentRecords = $Domain.ActualMXRecords.Hostname | Sort-Object
@@ -42,6 +37,12 @@ function Get-CIPPAlertMXRecordChanged {
             }
             Add-CIPPAzDataTableEntity @CacheTable -Entity $CacheEntity -Force
         }
+
+        if ($ChangedDomains) {
+            Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $ChangedDomains
+        }
+        return $true
+
     } catch {
         Write-LogMessage -message "Failed to check MX record changes: $($_.Exception.Message)" -API 'MX Record Alert' -tenant $TenantFilter -sev Error
     }

Modules/CIPPCore/Public/Alerts/Get-CIPPAlertSecureScore.ps1

@@ -0,0 +1,46 @@
+
+function Get-CippAlertSecureScore {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    #>
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory = $false)]
+        [Alias('input')]
+        $InputValue,
+        $TenantFilter
+    )
+    try {
+        $SecureScore = New-GraphGetRequest -uri 'https://graph.microsoft.com/v1.0/security/secureScores?$top=1' -tenantid $TenantFilter -noPagination $true
+        if ($InputValue.ThresholdType.value -eq "absolute") {
+            if ($SecureScore.currentScore -lt $InputValue.InputValue) {
+                $SecureScoreResult = [PSCustomObject]@{
+                    Message        = "Secure Score is below acceptable threshold"
+                    Tenant         = $TenantFilter
+                    CurrentScore   = $SecureScore.currentScore
+                    MaxSecureScore = $SecureScore.maxScore
+                }
+            } else {
+                $SecureScoreResult = @()
+            }
+        } elseif ($InputValue.ThresholdType.value -eq "percent") {
+            $PercentageScore = [math]::Round((($SecureScore.currentScore / $SecureScore.maxScore) * 100),2)
+            if ($PercentageScore -lt $InputValue.InputValue) {
+                $SecureScoreResult = [PSCustomObject]@{
+                    Message                  = "Secure Score is below acceptable threshold"
+                    Tenant                   = $TenantFilter
+                    CurrentScore             = $SecureScore.currentScore
+                    MaxScore                 = $SecureScore.maxScore
+                    CurrentScorePercentage   = [math]::Round($PercentageScore,2)
+                    ScoreThresholdPercentage = $InputValue.InputValue
+                }
+            } else {
+                $SecureScoreResult = @()
+            }
+        } 
+        Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $SecureScoreResult -PartitionKey SecureScore
+    } catch {
+        Write-AlertMessage -tenant $($TenantFilter) -message "Could not get Secure Score for $($TenantFilter): $(Get-NormalizedError -message $_.Exception.message)"
+    }
+}