diff --git a/install/29_collect_default_trace.sql b/install/29_collect_default_trace.sql index 9760fab..b23f8b5 100644 --- a/install/29_collect_default_trace.sql +++ b/install/29_collect_default_trace.sql @@ -369,6 +369,15 @@ BEGIN AND ft.StartTime >= @cutoff_time AND ISNULL(ft.DatabaseID, 0) NOT IN (DB_ID(N'PerformanceMonitor'), 1, 3, 4) AND ISNULL(ft.DatabaseID, 0) < 32761 /*exclude contained AG system databases*/ + AND NOT EXISTS + ( + SELECT + 1/0 + FROM config.collector_database_exclusions AS e + JOIN sys.databases AS d + ON d.name = e.database_name + WHERE d.database_id = ISNULL(ft.DatabaseID, 0) + ) /* Filter for useful system events, excluding login failures */ diff --git a/install/31_collect_trace_analysis.sql b/install/31_collect_trace_analysis.sql index 58b998e..f934b32 100644 --- a/install/31_collect_trace_analysis.sql +++ b/install/31_collect_trace_analysis.sql @@ -284,6 +284,13 @@ BEGIN AND trc.DatabaseName NOT IN (N'master', N'msdb', N'model', N'tempdb', N'PerformanceMonitor') AND trc.DatabaseName NOT LIKE N'%[_]master' /*exclude contained AG system databases*/ AND trc.DatabaseName NOT LIKE N'%[_]msdb' /*exclude contained AG system databases*/ + AND NOT EXISTS + ( + SELECT + 1/0 + FROM config.collector_database_exclusions AS e + WHERE e.database_name = trc.DatabaseName + ) ORDER BY trc.StartTime DESC;