Skip to content

Commit bfdbb28

Browse files
committed
Fixed typo and MaxFullThreshold selection criteria
#305 Amended MaxFullThreshold selection to include filtering on server name. #306 Fixed Insert proc name typo
1 parent f1db3bb commit bfdbb28

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

SQLUndercoverInspector/SQLUndercoverinspectorV2.sql

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ GO
6565
Author: Adrian Buckman
6666
Created Date: 15/07/2017
6767

68-
Revision date: 18/07/2023
68+
Revision date: 19/07/2023
6969
Version: 2.8
7070

7171
Description: SQLUndercover Inspector setup script Case sensitive compatible.
@@ -129,7 +129,7 @@ SET ANSI_NULLS ON;
129129
SET QUOTED_IDENTIFIER ON;
130130
SET CONCAT_NULL_YIELDS_NULL ON;
131131

132-
DECLARE @Revisiondate DATE = '20230718';
132+
DECLARE @Revisiondate DATE = '20230719';
133133
DECLARE @Build VARCHAR(6) ='2.8'
134134

135135
DECLARE @JobID UNIQUEIDENTIFIER;
@@ -4994,14 +4994,19 @@ ALTER PROCEDURE [Inspector].[BackupsCheckInsert]
49944994
AS
49954995
BEGIN
49964996

4997-
--Revision date: 05/02/2023
4997+
--Revision date: 19/07/2023
49984998

49994999
DECLARE @Servername NVARCHAR(128) = @@SERVERNAME;
50005000
DECLARE @FullBackupThreshold INT = (Select [Value] FROM [Inspector].[Settings] WHERE Description = ''FullBackupThreshold'')
50015001
DECLARE @MaxFullThreshold INT;
50025002

50035003
SET @FullBackupThreshold = (SELECT ISNULL(TRY_CAST([Inspector].[GetServerModuleThreshold] (@Servername,''BackupsCheck'',''FullBackupThreshold'') AS INT),168));
5004-
SET @MaxFullThreshold = (SELECT MAX(FullThreshold) FROM [Inspector].[BackupsCheckThresholds] WHERE [IsActive] = 1);
5004+
SET @MaxFullThreshold = (SELECT MAX(FullThreshold) FROM [Inspector].[BackupsCheckThresholds] WHERE [Servername] = @Servername AND [IsActive] = 1);
5005+
5006+
IF (@MaxFullThreshold IS NULL)
5007+
BEGIN
5008+
SET @MaxFullThreshold = @FullBackupThreshold;
5009+
END
50055010

50065011
IF (@FullBackupThreshold < @MaxFullThreshold)
50075012
BEGIN
@@ -8336,14 +8341,19 @@ ALTER PROCEDURE [Inspector].[BackupsCheckReport]
83368341
)
83378342
AS
83388343
BEGIN
8339-
--Revision date: 12/10/2021
8344+
--Revision date: 19/07/2023
83408345

83418346
DECLARE @FullBackupThreshold INT = (SELECT ISNULL(TRY_CAST([Inspector].[GetServerModuleThreshold] (@Servername,@Modulename,''FullBackupThreshold'') AS INT),168));
83428347
DECLARE @DiffBackupThreshold INT = (SELECT TRY_CAST([Inspector].[GetServerModuleThreshold] (@Servername,@Modulename,''DiffBackupThreshold'') AS INT));
83438348
DECLARE @LogBackupThreshold INT = (SELECT ISNULL(TRY_CAST([Inspector].[GetServerModuleThreshold] (@Servername,@Modulename,''LogBackupThreshold'') AS INT),20));
83448349
DECLARE @LastCollection DATETIME;
83458350
DECLARE @ReportFrequency INT;
8346-
DECLARE @MaxFullThreshold INT = (SELECT MAX(FullThreshold) FROM [Inspector].[BackupsCheckThresholds] WHERE [IsActive] = 1);
8351+
DECLARE @MaxFullThreshold INT = (SELECT MAX(FullThreshold) FROM [Inspector].[BackupsCheckThresholds] WHERE [Servername] = @Servername AND [IsActive] = 1);
8352+
8353+
IF (@MaxFullThreshold IS NULL)
8354+
BEGIN
8355+
SET @MaxFullThreshold = @FullBackupThreshold;
8356+
END
83478357

83488358
IF (@FullBackupThreshold < @MaxFullThreshold)
83498359
BEGIN
@@ -12320,14 +12330,14 @@ BEGIN
1232012330
END';
1232112331

1232212332

12323-
IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[Inspector].[AgentJobInsert]') AND type in (N'P', N'PC'))
12333+
IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[Inspector].[AgentJobsInsert]') AND type in (N'P', N'PC'))
1232412334
BEGIN
12325-
EXEC dbo.sp_executesql @statement = N'CREATE PROCEDURE [Inspector].[AgentJobInsert] AS'
12335+
EXEC dbo.sp_executesql @statement = N'CREATE PROCEDURE [Inspector].[AgentJobsInsert] AS'
1232612336
END
1232712337

1232812338

1232912339

12330-
EXEC dbo.sp_executesql @statement = N'ALTER PROCEDURE [Inspector].[AgentJobInsert]
12340+
EXEC dbo.sp_executesql @statement = N'ALTER PROCEDURE [Inspector].[AgentJobsInsert]
1233112341
AS
1233212342
BEGIN
1233312343

0 commit comments

Comments
 (0)