Skip to content

Commit 624dc2d

Browse files
excluded tennats alerts
1 parent ba8ebcb commit 624dc2d

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Modules/CIPPCore/Public/Add-CIPPScheduledTask.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,15 @@ function Add-CIPPScheduledTask {
6464
if ([int64]$task.ScheduledTime -eq 0 -or [string]::IsNullOrEmpty($task.ScheduledTime)) {
6565
$task.ScheduledTime = [int64](([datetime]::UtcNow) - (Get-Date '1/1/1970')).TotalSeconds
6666
}
67-
67+
$excludedTenants = if ($task.excludedTenants.value) {
68+
$task.excludedTenants.value -join ','
69+
}
6870
$entity = @{
6971
PartitionKey = [string]'ScheduledTask'
7072
TaskState = [string]'Planned'
7173
RowKey = [string]$RowKey
7274
Tenant = $task.TenantFilter.value ? "$($task.TenantFilter.value)" : "$($task.TenantFilter)"
75+
excludedTenants = [string]$excludedTenants
7376
Name = [string]$task.Name
7477
Command = [string]$task.Command.value
7578
Parameters = [string]$Parameters

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-AddScheduledItem.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Function Invoke-AddScheduledItem {
1414
} else {
1515
$hidden = $true
1616
}
17-
$Result = Add-CIPPScheduledTask -Task $Request.body -Headers $Request.Headers -hidden $hidden -DisallowDuplicateName $Request.query.DisallowDuplicateName
17+
$Result = Add-CIPPScheduledTask -Task $Request.body -Headers $Request.Headers -hidden $hidden -DisallowDuplicateName $Request.query.DisallowDuplicateName
1818
Write-LogMessage -headers $Request.Headers -API $APINAME -message $Result -Sev 'Info'
1919

2020
Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{

Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-UserTasksOrchestrator.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ function Start-UserTasksOrchestrator {
3535
}
3636

3737
if ($task.Tenant -eq 'AllTenants') {
38-
$AllTenantCommands = foreach ($Tenant in $TenantList) {
38+
$ExcludedTenants = $task.excludedTenants -split ','
39+
Write-Host "Excluded Tenants from this task: $ExcludedTenants"
40+
$AllTenantCommands = foreach ($Tenant in $TenantList | Where-Object { $_.defaultDomainName -notin $ExcludedTenants }) {
3941
$NewParams = $task.Parameters.Clone()
4042
if ((Get-Command $task.Command).Parameters.TenantFilter) {
4143
$NewParams.TenantFilter = $Tenant.defaultDomainName

0 commit comments

Comments
 (0)