Skip to content

Commit cb4c25a

Browse files
committed
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev
2 parents c00453f + c3f3e25 commit cb4c25a

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ function Get-CIPPAlertEntraLicenseUtilization {
6666

6767
} catch {
6868
$ErrorMessage = Get-CippException -Exception $_
69-
Write-LogMessage -message "Failed to check license utilization: $($ErrorMessage.NormalizedError)" -API 'License Utilization Alert' -tenant $TenantFilter -sev Info -LogData $ErrorMessage
69+
Write-LogMessage -message "Failed to check license utilization: $($ErrorMessage.NormalizedError)" -API 'License Utilization Alert' -tenant $TenantFilter -sev Error -LogData $ErrorMessage
7070
}
7171
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function Get-CIPPAlertInactiveGuestUsers {
3939
"https://graph.microsoft.com/beta/users?`$select=id,UserPrincipalName,signInActivity,mail,userType,accountEnabled,assignedLicenses"
4040
}
4141

42-
$GraphRequest = New-GraphGetRequest -uri $Uri-tenantid $TenantFilter | Where-Object { $_.userType -eq 'Guest' }
42+
$GraphRequest = New-GraphGetRequest -uri $Uri -tenantid $TenantFilter | Where-Object { $_.userType -eq 'Guest' }
4343

4444
$AlertData = foreach ($user in $GraphRequest) {
4545
$lastInteractive = $user.signInActivity.lastSignInDateTime

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function Get-CIPPAlertMFAAlertUsers {
3535
}
3636

3737
} catch {
38-
Write-LogMessage -message "Failed to check MFA status for all users: $($_.exception.message)" -API 'MFA Alerts - Informational' -tenant $TenantFilter -sev Info
38+
Write-LogMessage -message "Failed to check MFA status for all users: $($_.exception.message)" -API 'MFA Alerts - Informational' -tenant $TenantFilter -sev Error
3939
}
4040

4141
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ function Get-CIPPAlertNewRole {
4343
Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $AlertData
4444
}
4545
} catch {
46-
Write-LogMessage -API 'Alerts' -tenant $($TenantFilter) -message "Could not get get role changes for $($TenantFilter): $(Get-NormalizedError -message $_.Exception.message)" -sev Error
46+
Write-LogMessage -API 'Alerts' -tenant $($TenantFilter) -message "Could not get role changes for $($TenantFilter): $(Get-NormalizedError -message $_.Exception.message)" -sev Error
4747
}
4848
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function Get-CIPPAlertStaleEntraDevices {
6464
enrollmentType = if ($device.enrollmentType) { $device.enrollmentType } else { 'N/A' }
6565
Enabled = if ($device.accountEnabled) { $device.accountEnabled } else { 'N/A' }
6666
Managed = if ($device.isManaged) { $device.isManaged } else { 'N/A' }
67-
Complaint = if ($device.isCompliant) { $device.isCompliant } else { 'N/A' }
67+
Compliant = if ($device.isCompliant) { $device.isCompliant } else { 'N/A' }
6868
JoinType = $TrustType
6969
lastActivity = if ($lastActivity) { $lastActivity } else { 'N/A' }
7070
DaysSinceLastActivity = if ($daysSinceLastActivity) { $daysSinceLastActivity } else { 'N/A' }
@@ -80,6 +80,6 @@ function Get-CIPPAlertStaleEntraDevices {
8080
}
8181
} catch {}
8282
} catch {
83-
Write-LogMessage -API 'Alerts' -tenant $($TenantFilter) -message "Failed to check inactive guest users for $($TenantFilter): $(Get-NormalizedError -message $_.Exception.message)" -sev Error
83+
Write-LogMessage -API 'Alerts' -tenant $($TenantFilter) -message "Failed to check stale Entra devices for $($TenantFilter): $(Get-NormalizedError -message $_.Exception.message)" -sev Error
8484
}
8585
}

0 commit comments

Comments
 (0)