Skip to content

Exclude RDS objects and rdsadmin DB from sp_Blitz checks #3713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Exclude RDS objects and rdsadmin DB from sp_Blitz checks #3713

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 62 additions & 27 deletions sp_Blitz.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,8 +570,7 @@ AS
SELECT
DB_NAME(d.database_id)
FROM sys.databases AS d
WHERE (DB_NAME(d.database_id) LIKE 'rdsadmin%'
OR LOWER(d.name) IN ('dbatools', 'dbadmin', 'dbmaintenance'))
WHERE LOWER(d.name) IN ('dbatools', 'dbadmin', 'dbmaintenance', 'rdsadmin')
OPTION(RECOMPILE);

/*Skip checks for database where we don't have read permissions*/
Expand Down Expand Up @@ -2047,7 +2046,9 @@ AS
''Performance'' AS FindingsGroup,
''Server Triggers Enabled'' AS Finding,
''https://www.brentozar.com/go/logontriggers/'' AS URL,
(''Server Trigger ['' + [name] ++ ''] is enabled. Make sure you understand what that trigger is doing - the less work it does, the better.'') AS Details FROM sys.server_triggers WHERE is_disabled = 0 AND is_ms_shipped = 0 OPTION (RECOMPILE);';
(''Server Trigger ['' + [name] ++ ''] is enabled. Make sure you understand what that trigger is doing - the less work it does, the better.'') AS Details
FROM sys.server_triggers
WHERE is_disabled = 0 AND is_ms_shipped = 0 AND name NOT LIKE ''rds^_%'' ESCAPE ''^'' OPTION (RECOMPILE);';

IF @Debug = 2 AND @StringToExecute IS NOT NULL PRINT @StringToExecute;
IF @Debug = 2 AND @StringToExecute IS NULL PRINT '@StringToExecute has gone NULL, for some reason.';
Expand Down Expand Up @@ -2706,7 +2707,8 @@ AS
+ '. Tables in the master database may not be restored in the event of a disaster.' ) AS Details
FROM master.sys.tables
WHERE is_ms_shipped = 0
AND name NOT IN ('CommandLog','SqlServerVersions','$ndo$srvproperty');
AND name NOT IN ('CommandLog','SqlServerVersions','$ndo$srvproperty')
AND name NOT LIKE 'rds^_%' ESCAPE '^';
/* That last one is the Dynamics NAV licensing table: https://github.com/BrentOzarULTD/SQL-Server-First-Responder-Kit/issues/2426 */
END;

Expand Down Expand Up @@ -4883,12 +4885,12 @@ AS
SET @StringToExecute = 'INSERT INTO #BlitzResults (CheckID, DatabaseName, Priority, FindingsGroup, Finding, URL, Details)
SELECT ' + CAST(@CurrentCheckID AS NVARCHAR(200)) + ', d.[name], ' + CAST(@CurrentPriority AS NVARCHAR(200)) + ', ''Non-Default Database Config'', ''' + @CurrentFinding + ''',''' + @CurrentURL + ''',''' + COALESCE(@CurrentDetails, 'This database setting is not the default.') + '''
FROM sys.databases d
WHERE d.database_id > 4 AND d.state = 0 AND (d.[' + @CurrentName + '] NOT IN (0, 60) OR d.[' + @CurrentName + '] IS NULL) OPTION (RECOMPILE);';
WHERE d.database_id > 4 AND DB_NAME(d.database_id) != ''rdsadmin'' AND d.state = 0 AND (d.[' + @CurrentName + '] NOT IN (0, 60) OR d.[' + @CurrentName + '] IS NULL) OPTION (RECOMPILE);';
ELSE
SET @StringToExecute = 'INSERT INTO #BlitzResults (CheckID, DatabaseName, Priority, FindingsGroup, Finding, URL, Details)
SELECT ' + CAST(@CurrentCheckID AS NVARCHAR(200)) + ', d.[name], ' + CAST(@CurrentPriority AS NVARCHAR(200)) + ', ''Non-Default Database Config'', ''' + @CurrentFinding + ''',''' + @CurrentURL + ''',''' + COALESCE(@CurrentDetails, 'This database setting is not the default.') + '''
FROM sys.databases d
WHERE d.database_id > 4 AND d.state = 0 AND (d.[' + @CurrentName + '] <> ' + @CurrentDefaultValue + ' OR d.[' + @CurrentName + '] IS NULL) OPTION (RECOMPILE);';
WHERE d.database_id > 4 AND DB_NAME(d.database_id) != ''rdsadmin'' AND d.state = 0 AND (d.[' + @CurrentName + '] <> ' + @CurrentDefaultValue + ' OR d.[' + @CurrentName + '] IS NULL) OPTION (RECOMPILE);';

IF @Debug = 2 AND @StringToExecute IS NOT NULL PRINT @StringToExecute;
IF @Debug = 2 AND @StringToExecute IS NULL PRINT '@StringToExecute has gone NULL, for some reason.';
Expand Down Expand Up @@ -6776,7 +6778,12 @@ IF @ProductVersionMajor >= 10

IF @Debug IN (1, 2) RAISERROR('Running CheckId [%d].', 0, 1, 99) WITH NOWAIT;

EXEC dbo.sp_MSforeachdb 'USE [?]; SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; IF EXISTS (SELECT * FROM sys.tables WITH (NOLOCK) WHERE name = ''sysmergepublications'' ) IF EXISTS ( SELECT * FROM sysmergepublications WITH (NOLOCK) WHERE retention = 0) INSERT INTO #BlitzResults (CheckID, DatabaseName, Priority, FindingsGroup, Finding, URL, Details) SELECT DISTINCT 99, DB_NAME(), 110, ''Performance'', ''Infinite merge replication metadata retention period'', ''https://www.brentozar.com/go/merge'', (''The ['' + DB_NAME() + ''] database has merge replication metadata retention period set to infinite - this can be the case of significant performance issues.'')';
EXEC dbo.sp_MSforeachdb 'USE [?];
Copy link
Member

@BrentOzar BrentOzar Oct 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we change this section?

Copy link
Author

@yoni-yad2 yoni-yad2 Nov 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BrentOzar I just added a new line for clarity.

SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
IF EXISTS (SELECT * FROM sys.tables WITH (NOLOCK) WHERE name = ''sysmergepublications'' )
IF EXISTS ( SELECT * FROM sysmergepublications WITH (NOLOCK) WHERE retention = 0)
INSERT INTO #BlitzResults (CheckID, DatabaseName, Priority, FindingsGroup, Finding, URL, Details)
SELECT DISTINCT 99, DB_NAME(), 110, ''Performance'', ''Infinite merge replication metadata retention period'', ''https://www.brentozar.com/go/merge'', (''The ['' + DB_NAME() + ''] database has merge replication metadata retention period set to infinite - this can be the case of significant performance issues.'')';
END;
/*
Note that by using sp_MSforeachdb, we're running the query in all
Expand Down Expand Up @@ -6813,7 +6820,7 @@ IF @ProductVersionMajor >= 10
''https://www.brentozar.com/go/querystore'',
(''The new SQL Server 2016 Query Store feature has not been enabled on this database.'')
FROM [?].sys.database_query_store_options WHERE desired_state = 0
AND N''?'' NOT IN (''master'', ''model'', ''msdb'', ''tempdb'', ''DWConfiguration'', ''DWDiagnostics'', ''DWQueue'', ''ReportServer'', ''ReportServerTempDB'') OPTION (RECOMPILE)';
AND ''?'' NOT IN (''master'', ''model'', ''msdb'', ''rdsadmin'', ''tempdb'', ''DWConfiguration'', ''DWDiagnostics'', ''DWQueue'', ''ReportServer'', ''ReportServerTempDB'') OPTION (RECOMPILE)';
END;

IF NOT EXISTS ( SELECT 1
Expand Down Expand Up @@ -6845,6 +6852,7 @@ IF @ProductVersionMajor >= 10
FROM [?].sys.database_query_store_options
WHERE desired_state <> 0
AND wait_stats_capture_mode = 0
AND ''?'' != ''rdsadmin''
OPTION (RECOMPILE)';
END;

Expand Down Expand Up @@ -6876,6 +6884,7 @@ IF @ProductVersionMajor >= 10
FROM [?].sys.database_query_store_options
WHERE desired_state <> 0
AND actual_state <> 2
AND ''?'' != ''rdsadmin''
OPTION (RECOMPILE)';
END;

Expand Down Expand Up @@ -6907,6 +6916,7 @@ IF @ProductVersionMajor >= 10
FROM [?].sys.database_query_store_options
WHERE desired_state <> 0
AND desired_state <> actual_state
AND ''?'' != ''rdsadmin''
OPTION (RECOMPILE)';
END;

Expand Down Expand Up @@ -6942,6 +6952,7 @@ IF @ProductVersionMajor >= 10
FROM [?].sys.database_query_store_options
WHERE desired_state <> 0 /* No point in checking this if Query Store is off. */
AND query_capture_mode_desc <> ''AUTO''
AND ''?'' != ''rdsadmin''
OPTION (RECOMPILE)';
END;

Expand Down Expand Up @@ -6972,7 +6983,9 @@ IF @ProductVersionMajor >= 10
''https://www.brentozar.com/go/cleanup'',
(''SQL 2016 RTM has a bug involving dumps that happen every time Query Store cleanup jobs run. This is fixed in CU1 and later: https://sqlserverupdates.com/sql-server-2016-updates/'')
FROM sys.databases AS d
WHERE d.is_query_store_on = 1 OPTION (RECOMPILE);';
WHERE d.is_query_store_on = 1
AND d.name != ''rdsadmin''
OPTION (RECOMPILE);';

IF @Debug = 2 AND @StringToExecute IS NOT NULL PRINT @StringToExecute;
IF @Debug = 2 AND @StringToExecute IS NULL PRINT '@StringToExecute has gone NULL, for some reason.';
Expand Down Expand Up @@ -7008,7 +7021,7 @@ IF @ProductVersionMajor >= 10
FROM [?].sys.database_query_store_options dqso
join master.sys.databases D on D.name = N''?''
WHERE ((dqso.actual_state = 0 AND D.is_query_store_on = 1) OR (dqso.actual_state <> 0 AND D.is_query_store_on = 0))
AND N''?'' NOT IN (''master'', ''model'', ''msdb'', ''tempdb'', ''DWConfiguration'', ''DWDiagnostics'', ''DWQueue'', ''ReportServer'', ''ReportServerTempDB'') OPTION (RECOMPILE)';
AND ''?'' NOT IN (''master'', ''model'', ''msdb'', ''rdsadmin'', ''tempdb'', ''DWConfiguration'', ''DWDiagnostics'', ''DWQueue'', ''ReportServer'', ''ReportServerTempDB'') OPTION (RECOMPILE)';
END;

IF NOT EXISTS ( SELECT 1
Expand All @@ -7035,11 +7048,12 @@ IF @ProductVersionMajor >= 10
''Multiple Log Files on One Drive'',
''https://www.brentozar.com/go/manylogs'',
(''The ['' + DB_NAME() + ''] database has multiple log files on the '' + LEFT(physical_name, 1) + '' drive. This is not a performance booster because log file access is sequential, not parallel.'')
FROM [?].sys.database_files WHERE type_desc = ''LOG''
AND N''?'' <> ''[tempdb]''
FROM [?].sys.database_files
WHERE type_desc = ''LOG''
AND ''?'' NOT IN (''rdsadmin'',''tempdb'')
GROUP BY LEFT(physical_name, 1)
HAVING COUNT(*) > 1
AND SUM(size) < 268435456 OPTION (RECOMPILE);';
HAVING COUNT(*) > 1 AND SUM(size) < 268435456
Copy link
Member

@BrentOzar BrentOzar Oct 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we change this section?

Copy link
Author

@yoni-yad2 yoni-yad2 Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BrentOzar I just reformatted the lines to separate the GROUP BY from the OPTION part for clarity.

OPTION (RECOMPILE);';
END;

IF NOT EXISTS ( SELECT 1
Expand Down Expand Up @@ -7068,6 +7082,7 @@ IF @ProductVersionMajor >= 10
(''The ['' + DB_NAME() + ''] database has multiple data files in one filegroup, but they are not all set up to grow in identical amounts. This can lead to uneven file activity inside the filegroup.'')
FROM [?].sys.database_files
WHERE type_desc = ''ROWS''
AND ''?'' != ''rdsadmin''
GROUP BY data_space_id
HAVING COUNT(DISTINCT growth) > 1 OR COUNT(DISTINCT is_percent_growth) > 1 OPTION (RECOMPILE);';
END;
Expand Down Expand Up @@ -7096,7 +7111,9 @@ IF @ProductVersionMajor >= 10
''https://www.brentozar.com/go/percentgrowth'' AS URL,
''The ['' + DB_NAME() + ''] database file '' + f.physical_name + '' has grown to '' + CONVERT(NVARCHAR(20), CONVERT(NUMERIC(38, 2), (f.size / 128.) / 1024.)) + '' GB, and is using percent filegrowth settings. This can lead to slow performance during growths if Instant File Initialization is not enabled.''
FROM [?].sys.database_files f
WHERE is_percent_growth = 1 and size > 128000 OPTION (RECOMPILE);';
WHERE is_percent_growth = 1 and size > 128000
AND ''?'' != ''rdsadmin''
OPTION (RECOMPILE);';
END;

/* addition by Henrik Staun Poulsen, Stovi Software */
Expand Down Expand Up @@ -7124,7 +7141,9 @@ IF @ProductVersionMajor >= 10
''https://www.brentozar.com/go/percentgrowth'' AS URL,
''The ['' + DB_NAME() + ''] database file '' + f.physical_name + '' is using 1MB filegrowth settings, but it has grown to '' + CAST((CAST(f.size AS BIGINT) * 8 / 1000000) AS NVARCHAR(10)) + '' GB. Time to up the growth amount.''
FROM [?].sys.database_files f
WHERE is_percent_growth = 0 and growth=128 and size > 128000 OPTION (RECOMPILE);';
WHERE is_percent_growth = 0 and growth=128 and size > 128000
AND ''?'' != ''rdsadmin''
OPTION (RECOMPILE);';
END;

IF NOT EXISTS ( SELECT 1
Expand Down Expand Up @@ -7154,7 +7173,9 @@ IF @ProductVersionMajor >= 10
''Enterprise Edition Features In Use'',
''https://www.brentozar.com/go/ee'',
(''The ['' + DB_NAME() + ''] database is using '' + feature_name + ''. If this database is restored onto a Standard Edition server, the restore will fail on versions prior to 2016 SP1.'')
FROM [?].sys.dm_db_persisted_sku_features OPTION (RECOMPILE);';
FROM [?].sys.dm_db_persisted_sku_features
WHERE ''?'' != ''rdsadmin''
OPTION (RECOMPILE);';
END;
END;

Expand Down Expand Up @@ -7212,8 +7233,9 @@ IF @ProductVersionMajor >= 10
''https://www.brentozar.com/go/repl'',
(''['' + DB_NAME() + ''] has MSreplication_objects tables in it, indicating it is a replication subscriber.'')
FROM [?].sys.tables
WHERE name = ''dbo.MSreplication_objects'' AND ''?'' <> ''master'' OPTION (RECOMPILE)';

WHERE name = ''dbo.MSreplication_objects''
AND ''?'' NOT IN (''master'', ''rdsadmin'')
OPTION (RECOMPILE)';
END;

IF NOT EXISTS ( SELECT 1
Expand Down Expand Up @@ -7241,7 +7263,9 @@ IF @ProductVersionMajor >= 10
''https://www.brentozar.com/go/trig'',
(''The ['' + DB_NAME() + ''] database has '' + CAST(SUM(1) AS NVARCHAR(50)) + '' triggers.'')
FROM [?].sys.triggers t INNER JOIN [?].sys.objects o ON t.parent_id = o.object_id
INNER JOIN [?].sys.schemas s ON o.schema_id = s.schema_id WHERE t.is_ms_shipped = 0 AND DB_NAME() != ''ReportServer''
INNER JOIN [?].sys.schemas s ON o.schema_id = s.schema_id
WHERE t.is_ms_shipped = 0
AND ''?'' NOT IN (''rdsadmin'', ''ReportServer'')
HAVING SUM(1) > 0 OPTION (RECOMPILE)';
END;

Expand Down Expand Up @@ -7271,7 +7295,9 @@ IF @ProductVersionMajor >= 10
''Plan Guides Failing'',
''https://www.brentozar.com/go/misguided'',
(''The ['' + DB_NAME() + ''] database has plan guides that are no longer valid, so the queries involved may be failing silently.'')
FROM [?].sys.plan_guides g CROSS APPLY fn_validate_plan_guide(g.plan_guide_id) OPTION (RECOMPILE)';
FROM [?].sys.plan_guides g CROSS APPLY fn_validate_plan_guide(g.plan_guide_id)
WHERE ''?'' != ''rdsadmin''
OPTION (RECOMPILE)';
END;

IF NOT EXISTS ( SELECT 1
Expand Down Expand Up @@ -7299,7 +7325,9 @@ IF @ProductVersionMajor >= 10
''https://www.brentozar.com/go/hypo'',
(''The index ['' + DB_NAME() + ''].['' + s.name + ''].['' + o.name + ''].['' + i.name + ''] is a leftover hypothetical index from the Index Tuning Wizard or Database Tuning Advisor. This index is not actually helping performance and should be removed.'')
from [?].sys.indexes i INNER JOIN [?].sys.objects o ON i.object_id = o.object_id INNER JOIN [?].sys.schemas s ON o.schema_id = s.schema_id
WHERE i.is_hypothetical = 1 OPTION (RECOMPILE);';
WHERE i.is_hypothetical = 1
AND ''?'' != ''rdsadmin''
OPTION (RECOMPILE);';
END;

IF NOT EXISTS ( SELECT 1
Expand Down Expand Up @@ -7355,7 +7383,9 @@ IF @ProductVersionMajor >= 10
''https://www.brentozar.com/go/trust'',
(''The ['' + DB_NAME() + ''] database has foreign keys that were probably disabled, data was changed, and then the key was enabled again. Simply enabling the key is not enough for the optimizer to use this key - we have to alter the table using the WITH CHECK CHECK CONSTRAINT parameter.'')
from [?].sys.foreign_keys i INNER JOIN [?].sys.objects o ON i.parent_object_id = o.object_id INNER JOIN [?].sys.schemas s ON o.schema_id = s.schema_id
WHERE i.is_not_trusted = 1 AND i.is_not_for_replication = 0 AND i.is_disabled = 0 AND N''?'' NOT IN (''master'', ''model'', ''msdb'', ''ReportServer'', ''ReportServerTempDB'') OPTION (RECOMPILE);';
WHERE i.is_not_trusted = 1 AND i.is_not_for_replication = 0 AND i.is_disabled = 0 AND ''?''
NOT IN (''master'', ''model'', ''msdb'', ''rdsadmin'', ''ReportServer'', ''ReportServerTempDB'')
OPTION (RECOMPILE);';
END;

IF NOT EXISTS ( SELECT 1
Expand Down Expand Up @@ -7844,8 +7874,10 @@ EXEC dbo.sp_MSforeachdb 'USE [?]; SET TRANSACTION ISOLATION LEVEL READ UNCOMMITT
INNER JOIN #DatabaseScopedConfigurationDefaults def1 ON dsc.configuration_id = def1.configuration_id
LEFT OUTER JOIN #DatabaseScopedConfigurationDefaults def ON dsc.configuration_id = def.configuration_id AND (cast(dsc.value as nvarchar(100)) = cast(def.default_value as nvarchar(100)) OR dsc.value IS NULL) AND (dsc.value_for_secondary = def.default_value_for_secondary OR dsc.value_for_secondary IS NULL)
LEFT OUTER JOIN #SkipChecks sk ON (sk.CheckID IS NULL OR def.CheckID = sk.CheckID) AND (sk.DatabaseName IS NULL OR sk.DatabaseName = DB_NAME())
WHERE def.configuration_id IS NULL AND sk.CheckID IS NULL ORDER BY 1
OPTION (RECOMPILE);';
WHERE def.configuration_id IS NULL AND sk.CheckID IS NULL
AND ''?'' != ''rdsadmin''
ORDER BY 1
OPTION (RECOMPILE);';
END;

/* Check 218 - Show me the dodgy SET Options */
Expand Down Expand Up @@ -7882,6 +7914,7 @@ EXEC dbo.sp_MSforeachdb 'USE [?]; SET TRANSACTION ISOLATION LEVEL READ UNCOMMITT
OR sm.uses_quoted_identifier <> 1
)
AND o.is_ms_shipped = 0
AND ''?'' != ''rdsadmin''
HAVING COUNT(1) > 0;';
END; --of Check 218.

Expand Down Expand Up @@ -7913,7 +7946,9 @@ EXEC dbo.sp_MSforeachdb 'USE [?]; SET TRANSACTION ISOLATION LEVEL READ UNCOMMITT
+ CAST(iro.sql_text AS NVARCHAR(1000)) AS Details
FROM sys.index_resumable_operations iro
JOIN sys.objects o ON iro.[object_id] = o.[object_id]
WHERE iro.state <> 0;';
WHERE iro.state <> 0
AND ''?'' != ''rdsadmin''
;';
END; --of Check 225.

--/* Check 220 - Statistics Without Histograms */
Expand Down Expand Up @@ -7947,7 +7982,7 @@ EXEC dbo.sp_MSforeachdb 'USE [?]; SET TRANSACTION ISOLATION LEVEL READ UNCOMMITT
-- WHERE o.is_ms_shipped = 0 AND o.type_desc = ''USER_TABLE''
-- AND h.object_id IS NULL
-- AND 0 < (SELECT SUM(row_count) FROM sys.dm_db_partition_stats ps WHERE ps.object_id = o.object_id)
-- AND ''?'' NOT IN (''master'', ''model'', ''msdb'', ''tempdb'')
-- AND ''?'' NOT IN (''master'', ''model'', ''msdb'', ''rdsadmin'', ''tempdb'')
-- HAVING COUNT(DISTINCT o.object_id) > 0;';
--END; --of Check 220.

Expand Down