From e614b28f5a09415bc0aa4eab5e05ab4b2f1eb3f2 Mon Sep 17 00:00:00 2001 From: ClaudioESSilva Date: Wed, 23 Aug 2023 15:21:21 +0100 Subject: [PATCH] some cleaning --- source/checks/Agentv5.Tests.ps1 | 1 - .../internal/functions/Get-AllAgentInfo.ps1 | 51 ------------------- 2 files changed, 52 deletions(-) diff --git a/source/checks/Agentv5.Tests.ps1 b/source/checks/Agentv5.Tests.ps1 index 41ac57a0..945f5fe9 100644 --- a/source/checks/Agentv5.Tests.ps1 +++ b/source/checks/Agentv5.Tests.ps1 @@ -34,7 +34,6 @@ BeforeDiscovery { #TODO : Clean this up Write-PSFMessage -Message "Instances = $($InstancesToTest.Name)" -Level Verbose - Write-PSFMessage -Message "Instances = $($InstancesToTest.JobHistory)" -Level Verbose Set-PSFConfig -Module dbachecks -Name global.notcontactable -Value $NotContactable diff --git a/source/internal/functions/Get-AllAgentInfo.ps1 b/source/internal/functions/Get-AllAgentInfo.ps1 index d7f080ff..e4facd76 100644 --- a/source/internal/functions/Get-AllAgentInfo.ps1 +++ b/source/internal/functions/Get-AllAgentInfo.ps1 @@ -50,30 +50,6 @@ function Get-AllAgentInfo { # Agent Job History Initial fields $AgentJobHistory = $Instance.GetDefaultInitFields([Microsoft.SqlServer.Management.Smo.Agent.JobServer]) - #TODO: Clean up? - ## Database Initial Fields - #$DatabaseInitFields = $Instance.GetDefaultInitFields([Microsoft.SqlServer.Management.Smo.Database]) -# - ## Stored Procedure Initial Fields - #$StoredProcedureInitFields = $Instance.GetDefaultInitFields([Microsoft.SqlServer.Management.Smo.StoredProcedure]) -# - ## Information Initial Fields -# - ## Settings Initial Fields - #$SettingsInitFields = $Instance.GetDefaultInitFields([Microsoft.SqlServer.Management.Smo.Settings]) -# - ## Login Initial Fields - #$LoginInitFields = $Instance.GetDefaultInitFields([Microsoft.SqlServer.Management.Smo.Login]) -# - ## Log File Initial Fields - #$LogFileInitFields = $Instance.GetDefaultInitFields([Microsoft.SqlServer.Management.Smo.LogFile]) -# - ## Data File Initial Fields - #$DataFileInitFields = $Instance.GetDefaultInitFields([Microsoft.SqlServer.Management.Smo.DataFile]) - - # Configuration cannot have default init fields :-) - #$configurations = $false - # Set up blank ConfigValues object for any config we need to use in the checks $ConfigValues = [PSCustomObject]@{} @@ -154,19 +130,6 @@ function Get-AllAgentInfo { ActualDatabaseMailProfile = $Instance.Mail.Profiles.Name } } - - ##TODO: Clean up - #$databaseMailProfile += [PSCustomObject]@{ - # InstanceName = $Instance.Name - # ExpectedDatabaseMailProfile = 'null' - # ActualDatabaseMailProfile = 'null' - #} -# - #Write-PSFMessage -Message "InstanceName : $($databaseMailProfile.InstanceName)" -Level Verbose - #Write-PSFMessage -Message "ExpectedDatabaseMailProfile : $($databaseMailProfile.ExpectedDatabaseMailProfile)" -Level Verbose - #Write-PSFMessage -Message "ActualDatabaseMailProfile : $($databaseMailProfile.ActualDatabaseMailProfile)" -Level Verbose - #Write-PSFMessage -Message "ActualDatabaseMailProfile instance : $($Instance.Mail.Profiles.Name)" -Level Verbose - } 'AgentMailProfile' { $AgentMailProfileInitFields.Add("DatabaseMailProfile") | Out-Null # so we can check failsafe operators @@ -183,20 +146,6 @@ function Get-AllAgentInfo { ActualAgentMailProfile = $Instance.JobServer.DatabaseMailProfile } } - - #TODO: Clean up - #$databaseMailProfile = $ConfigValues.DatabaseMailProfile.ForEach{ - # [PSCustomObject]@{ - # InstanceName = $Instance.Name - # ExpectedDatabaseMailProfile = 'null' - # ActualDatabaseMailProfile = 'null' - # } - #} -# - #Write-PSFMessage -Message "InstanceName : $($databaseMailProfile.InstanceName)" -Level Verbose - #Write-PSFMessage -Message "ExpectedDatabaseMailProfile : $($databaseMailProfile.ExpectedDatabaseMailProfile)" -Level Verbose - #Write-PSFMessage -Message "ActualDatabaseMailProfile : $($databaseMailProfile.ActualDatabaseMailProfile)" -Level Verbose - #Write-PSFMessage -Message "ActualDatabaseMailProfile instance : $($Instance.JobServer.DatabaseMailProfile)" -Level Verbose } 'FailedJob' { $FailedJobInitFields.Add("Name") | Out-Null # so we can check Job Name