From 6c628befe2229056734e0c39c10e6b91fd6d4cf0 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Sun, 15 Feb 2026 12:41:13 -0500
Subject: [PATCH 01/34] Fix XE ring buffer query timeouts on large buffers
 (#37)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Materialize the ring buffer XML into a table variable before shredding
with CROSS APPLY .nodes(). The inline subquery pattern forced SQL Server
to repeatedly parse the full 4MB+ XML blob, causing 2+ minute execution
times and 30-second CommandTimeout failures during sustained load.

Applied to all 4 XE ring buffer queries:
- Deadlock collection (on-prem + Azure SQL DB)
- Blocked process report collection (on-prem + Azure SQL DB)

Performance: ~2:44 → ~0.46s (~350x improvement).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 ...teCollectorService.BlockedProcessReport.cs | 64 +++++++++++++------
 .../RemoteCollectorService.Deadlocks.cs       | 64 +++++++++++++------
 2 files changed, 92 insertions(+), 36 deletions(-)

diff --git a/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs b/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
index f08a7ecf..62f241c5 100644
--- a/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
+++ b/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
@@ -273,23 +273,37 @@ Use .query() to get XML with structure intact, then CONVERT to nvarchar(max) */
             query = $@"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
+DECLARE
+    @PerformanceMonitor_BlockedProcess TABLE
+(
+    ring_buffer xml NOT NULL
+);
+
+INSERT
+    @PerformanceMonitor_BlockedProcess
+(
+    ring_buffer
+)
+SELECT
+    ring_xml = TRY_CAST(xet.target_data AS xml)
+FROM sys.dm_xe_database_session_targets AS xet
+JOIN sys.dm_xe_database_sessions AS xes
+  ON xes.address = xet.event_session_address
+WHERE xes.name = N'{BlockedProcessXeSessionName}'
+AND   xet.target_name = N'ring_buffer'
+OPTION(RECOMPILE);
+
 SELECT
     event_time = evt.value('(@timestamp)[1]', 'datetime2'),
     blocked_process_report_xml = CONVERT(nvarchar(max), evt.query('data[@name=""blocked_process""]/value/blocked-process-report'))
 FROM
 (
     SELECT
-        ring_xml = TRY_CAST(xet.target_data AS xml)
-    FROM sys.dm_xe_database_session_targets AS xet
-    JOIN sys.dm_xe_database_sessions AS xes
-      ON xes.address = xet.event_session_address
-    WHERE xes.name = N'{BlockedProcessXeSessionName}'
-    AND   xet.target_name = N'ring_buffer'
+        pmd.ring_buffer
+    FROM @PerformanceMonitor_BlockedProcess AS pmd
 ) AS rb
-CROSS APPLY rb.ring_xml.nodes('RingBufferTarget/event[@name=""blocked_process_report""]') AS q(evt)
+CROSS APPLY rb.ring_buffer.nodes('RingBufferTarget/event[@name=""blocked_process_report""]') AS q(evt)
 WHERE evt.value('(@timestamp)[1]', 'datetime2') > DATEADD(MINUTE, -10, SYSUTCDATETIME())
-ORDER BY
-    evt.value('(@timestamp)[1]', 'datetime2') DESC
 OPTION(RECOMPILE);";
         }
         else
@@ -299,23 +313,37 @@ Use .query() to get XML with structure intact, then CONVERT to nvarchar(max) */
             query = $@"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
+DECLARE
+    @PerformanceMonitor_BlockedProcess TABLE
+(
+    ring_buffer xml NOT NULL
+);
+
+INSERT
+    @PerformanceMonitor_BlockedProcess
+(
+    ring_buffer
+)
+SELECT
+    ring_xml = TRY_CAST(xet.target_data AS xml)
+FROM sys.dm_xe_session_targets AS xet
+JOIN sys.dm_xe_sessions AS xes
+  ON xes.address = xet.event_session_address
+WHERE xes.name = N'{BlockedProcessXeSessionName}'
+AND   xet.target_name = N'ring_buffer'
+OPTION(RECOMPILE);
+
 SELECT
     event_time = evt.value('(@timestamp)[1]', 'datetime2'),
     blocked_process_report_xml = CONVERT(nvarchar(max), evt.query('data[@name=""blocked_process""]/value/blocked-process-report'))
 FROM
 (
     SELECT
-        ring_xml = TRY_CAST(xet.target_data AS xml)
-    FROM sys.dm_xe_session_targets AS xet
-    JOIN sys.dm_xe_sessions AS xes
-      ON xes.address = xet.event_session_address
-    WHERE xes.name = N'{BlockedProcessXeSessionName}'
-    AND   xet.target_name = N'ring_buffer'
+        pmd.ring_buffer
+    FROM @PerformanceMonitor_BlockedProcess AS pmd
 ) AS rb
-CROSS APPLY rb.ring_xml.nodes('RingBufferTarget/event[@name=""blocked_process_report""]') AS q(evt)
+CROSS APPLY rb.ring_buffer.nodes('RingBufferTarget/event[@name=""blocked_process_report""]') AS q(evt)
 WHERE evt.value('(@timestamp)[1]', 'datetime2') > DATEADD(MINUTE, -10, SYSUTCDATETIME())
-ORDER BY
-    evt.value('(@timestamp)[1]', 'datetime2') DESC
 OPTION(RECOMPILE);";
         }
 
diff --git a/Lite/Services/RemoteCollectorService.Deadlocks.cs b/Lite/Services/RemoteCollectorService.Deadlocks.cs
index 67c4502e..af40e42d 100644
--- a/Lite/Services/RemoteCollectorService.Deadlocks.cs
+++ b/Lite/Services/RemoteCollectorService.Deadlocks.cs
@@ -271,6 +271,26 @@ Use .query() to get XML with structure intact, then CONVERT to nvarchar(max) */
             query = $@"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
+DECLARE
+    @PerformanceMonitor_Deadlock TABLE
+(
+    ring_buffer xml NOT NULL
+);
+
+INSERT
+    @PerformanceMonitor_Deadlock
+(
+    ring_buffer
+)
+SELECT
+    ring_xml = TRY_CAST(xet.target_data AS xml)
+FROM sys.dm_xe_database_session_targets AS xet
+JOIN sys.dm_xe_database_sessions AS xes
+  ON xes.address = xet.event_session_address
+WHERE xes.name = N'{DeadlockXeSessionName}'
+AND   xet.target_name = N'ring_buffer'
+OPTION(RECOMPILE);
+
 SELECT
     deadlock_time = evt.value('(@timestamp)[1]', 'datetime2'),
     victim_process_id = evt.value('(data[@name=""xml_report""]/value/deadlock/victim-list/victimProcess/@id)[1]', 'varchar(50)'),
@@ -278,17 +298,11 @@ Use .query() to get XML with structure intact, then CONVERT to nvarchar(max) */
 FROM
 (
     SELECT
-        ring_xml = TRY_CAST(xet.target_data AS xml)
-    FROM sys.dm_xe_database_session_targets AS xet
-    JOIN sys.dm_xe_database_sessions AS xes
-      ON xes.address = xet.event_session_address
-    WHERE xes.name = N'{DeadlockXeSessionName}'
-    AND   xet.target_name = N'ring_buffer'
+        pmd.ring_buffer
+    FROM @PerformanceMonitor_Deadlock AS pmd
 ) AS rb
-CROSS APPLY rb.ring_xml.nodes('RingBufferTarget/event[@name=""database_xml_deadlock_report""]') AS q(evt)
+CROSS APPLY rb.ring_buffer.nodes('RingBufferTarget/event[@name=""database_xml_deadlock_report""]') AS q(evt)
 WHERE evt.value('(@timestamp)[1]', 'datetime2') > DATEADD(MINUTE, -10, SYSUTCDATETIME())
-ORDER BY
-    evt.value('(@timestamp)[1]', 'datetime2') DESC
 OPTION(RECOMPILE);";
         }
         else
@@ -298,6 +312,26 @@ Use .query() to get XML with structure intact, then CONVERT to nvarchar(max) */
             query = $@"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
+DECLARE
+    @PerformanceMonitor_Deadlock TABLE
+(
+    ring_buffer xml NOT NULL
+);
+
+INSERT
+    @PerformanceMonitor_Deadlock
+(
+    ring_buffer
+)
+SELECT
+    ring_xml = TRY_CAST(xet.target_data AS xml)
+FROM sys.dm_xe_session_targets AS xet
+JOIN sys.dm_xe_sessions AS xes
+  ON xes.address = xet.event_session_address
+WHERE xes.name = N'{DeadlockXeSessionName}'
+AND   xet.target_name = N'ring_buffer'
+OPTION(RECOMPILE);
+
 SELECT
     deadlock_time = evt.value('(@timestamp)[1]', 'datetime2'),
     victim_process_id = evt.value('(data[@name=""xml_report""]/value/deadlock/victim-list/victimProcess/@id)[1]', 'varchar(50)'),
@@ -305,17 +339,11 @@ Use .query() to get XML with structure intact, then CONVERT to nvarchar(max) */
 FROM
 (
     SELECT
-        ring_xml = TRY_CAST(xet.target_data AS xml)
-    FROM sys.dm_xe_session_targets AS xet
-    JOIN sys.dm_xe_sessions AS xes
-      ON xes.address = xet.event_session_address
-    WHERE xes.name = N'{DeadlockXeSessionName}'
-    AND   xet.target_name = N'ring_buffer'
+        pmd.ring_buffer
+    FROM @PerformanceMonitor_Deadlock AS pmd
 ) AS rb
-CROSS APPLY rb.ring_xml.nodes('RingBufferTarget/event[@name=""xml_deadlock_report""]') AS q(evt)
+CROSS APPLY rb.ring_buffer.nodes('RingBufferTarget/event[@name=""xml_deadlock_report""]') AS q(evt)
 WHERE evt.value('(@timestamp)[1]', 'datetime2') > DATEADD(MINUTE, -10, SYSUTCDATETIME())
-ORDER BY
-    evt.value('(@timestamp)[1]', 'datetime2') DESC
 OPTION(RECOMPILE);";
         }
 

From e21f642cb932466a2bbbafd19634f6050b11f3b6 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Sun, 15 Feb 2026 14:32:13 -0500
Subject: [PATCH 02/34] Add Collection Health tab to Lite UI (#39)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Surface the existing GetCollectionHealthAsync() data in a new tab showing
per-collector status, run counts, failure rates, avg duration, timestamps,
and last error message. Includes column-level filtering.

The backend data (collection_log table, health computation) already existed
but was never displayed in the UI — only accessible via status bar tooltip
or MCP tool.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Lite/Controls/ServerTab.xaml                  | 43 +++++++++++++++++++
 Lite/Controls/ServerTab.xaml.cs               |  7 ++-
 .../LocalDataService.CollectionHealth.cs      |  8 ++++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/Lite/Controls/ServerTab.xaml b/Lite/Controls/ServerTab.xaml
index 144f662a..54c51ed7 100644
--- a/Lite/Controls/ServerTab.xaml
+++ b/Lite/Controls/ServerTab.xaml
@@ -971,6 +971,49 @@
                 </Grid>
             </TabItem>
 
+            <!-- Collection Health Tab -->
+            <TabItem Header="Collection Health">
+                <Grid Margin="8">
+                    <DataGrid x:Name="CollectionHealthGrid"
+                              AutoGenerateColumns="False" IsReadOnly="True"
+                              RowStyle="{StaticResource GridRowStyle}"
+                              HeadersVisibility="Column" GridLinesVisibility="Horizontal">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Binding="{Binding CollectorName}" Width="180">
+                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectorName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Collector" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding HealthStatus}" Width="90">
+                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HealthStatus" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Status" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding TotalRuns, StringFormat=N0}" Width="80">
+                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRuns" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Runs" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding SuccessCount, StringFormat=N0}" Width="80">
+                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SuccessCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Success" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding ErrorCount, StringFormat=N0}" Width="80">
+                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ErrorCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Errors" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding FailureRatePercent, StringFormat=N1}" Width="85">
+                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="FailureRatePercent" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Fail %" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding AvgDurationFormatted}" Width="100">
+                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgDurationFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Duration" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding LastSuccessFormatted}" Width="140">
+                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastSuccessFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Success" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding LastRunFormatted}" Width="140">
+                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastRunFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Run" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding LastError}" Width="*">
+                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastError" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Error" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                        </DataGrid.Columns>
+                    </DataGrid>
+                </Grid>
+            </TabItem>
+
         </TabControl>
     </Grid>
 </UserControl>
diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index 6c0c7cdd..f89a517b 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -58,6 +58,7 @@ public partial class ServerTab : UserControl
     private DataGridFilterManager<DatabaseConfigRow>? _databaseConfigFilterMgr;
     private DataGridFilterManager<DatabaseScopedConfigRow>? _dbScopedConfigFilterMgr;
     private DataGridFilterManager<TraceFlagRow>? _traceFlagsFilterMgr;
+    private DataGridFilterManager<CollectorHealthRow>? _collectionHealthFilterMgr;
 
     private static readonly HashSet<string> _defaultPerfmonCounters = new(StringComparer.OrdinalIgnoreCase)
     {
@@ -444,6 +445,7 @@ private async System.Threading.Tasks.Task RefreshAllDataAsync()
             var databaseScopedConfigTask = SafeQueryAsync(() => _dataService.GetLatestDatabaseScopedConfigAsync(_serverId));
             var traceFlagsTask = SafeQueryAsync(() => _dataService.GetLatestTraceFlagsAsync(_serverId));
             var runningJobsTask = SafeQueryAsync(() => _dataService.GetRunningJobsAsync(_serverId));
+            var collectionHealthTask = SafeQueryAsync(() => _dataService.GetCollectionHealthAsync(_serverId));
             /* Core data tasks */
             await System.Threading.Tasks.Task.WhenAll(
                 snapshotsTask, cpuTask, memoryTask, memoryTrendTask,
@@ -451,7 +453,7 @@ await System.Threading.Tasks.Task.WhenAll(
                 deadlockTask, blockedProcessTask, waitTypesTask, perfmonCountersTask,
                 queryStoreTask, memoryGrantTrendTask,
                 serverConfigTask, databaseConfigTask, databaseScopedConfigTask, traceFlagsTask,
-                runningJobsTask);
+                runningJobsTask, collectionHealthTask);
 
             /* Trend chart tasks - run separately so failures don't kill the whole refresh */
             var blockingTrendTask = SafeQueryAsync(() => _dataService.GetBlockingTrendAsync(_serverId, hoursBack, fromDate, toDate));
@@ -488,6 +490,7 @@ await System.Threading.Tasks.Task.WhenAll(
             _dbScopedConfigFilterMgr!.UpdateData(databaseScopedConfigTask.Result);
             _traceFlagsFilterMgr!.UpdateData(traceFlagsTask.Result);
             _runningJobsFilterMgr!.UpdateData(runningJobsTask.Result);
+            _collectionHealthFilterMgr!.UpdateData(collectionHealthTask.Result);
 
             /* Update memory summary */
             UpdateMemorySummary(memoryTask.Result);
@@ -1864,6 +1867,7 @@ private void InitializeFilterManagers()
         _databaseConfigFilterMgr = new DataGridFilterManager<DatabaseConfigRow>(DatabaseConfigGrid);
         _dbScopedConfigFilterMgr = new DataGridFilterManager<DatabaseScopedConfigRow>(DatabaseScopedConfigGrid);
         _traceFlagsFilterMgr = new DataGridFilterManager<TraceFlagRow>(TraceFlagsGrid);
+        _collectionHealthFilterMgr = new DataGridFilterManager<CollectorHealthRow>(CollectionHealthGrid);
 
         _filterManagers[QuerySnapshotsGrid] = _querySnapshotsFilterMgr;
         _filterManagers[QueryStatsGrid] = _queryStatsFilterMgr;
@@ -1876,6 +1880,7 @@ private void InitializeFilterManagers()
         _filterManagers[DatabaseConfigGrid] = _databaseConfigFilterMgr;
         _filterManagers[DatabaseScopedConfigGrid] = _dbScopedConfigFilterMgr;
         _filterManagers[TraceFlagsGrid] = _traceFlagsFilterMgr;
+        _filterManagers[CollectionHealthGrid] = _collectionHealthFilterMgr;
     }
 
     private void EnsureFilterPopup()
diff --git a/Lite/Services/LocalDataService.CollectionHealth.cs b/Lite/Services/LocalDataService.CollectionHealth.cs
index 46c85a10..5ba3a7a3 100644
--- a/Lite/Services/LocalDataService.CollectionHealth.cs
+++ b/Lite/Services/LocalDataService.CollectionHealth.cs
@@ -94,5 +94,13 @@ public string HealthStatus
     public string AvgDurationFormatted => AvgDurationMs < 1000
         ? $"{AvgDurationMs:F0} ms"
         : $"{AvgDurationMs / 1000:F1} s";
+
+    public string LastSuccessFormatted => LastSuccessTime.HasValue
+        ? LastSuccessTime.Value.ToLocalTime().ToString("MM/dd HH:mm:ss")
+        : "Never";
+
+    public string LastRunFormatted => LastRunTime.HasValue
+        ? LastRunTime.Value.ToLocalTime().ToString("MM/dd HH:mm:ss")
+        : "Never";
 }
 

From b9a6d710e9a2c3e2f1245ab2658e8666fd893801 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Sun, 15 Feb 2026 14:37:11 -0500
Subject: [PATCH 03/34] Add collector performance diagnostics to Lite UI (#40)

Expand the Collection Health tab into three sub-tabs:

- Health Summary: existing per-collector status grid (from #39)
- Collection Log: recent collection_log entries showing per-run timing
  (total, SQL, DuckDB split), rows collected, status, and errors
- Duration Trends: ScottPlot chart showing collector duration over time

Also adds:
- GetRecentCollectionLogAsync() query and CollectionLogRow model
- "Open Log File" button to open today's log in default editor
- Column-level filtering on the collection log grid

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Lite/Controls/ServerTab.xaml                  | 123 ++++++++++++------
 Lite/Controls/ServerTab.xaml.cs               |  64 ++++++++-
 .../LocalDataService.CollectionHealth.cs      |  68 ++++++++++
 3 files changed, 217 insertions(+), 38 deletions(-)

diff --git a/Lite/Controls/ServerTab.xaml b/Lite/Controls/ServerTab.xaml
index 54c51ed7..7cb808dc 100644
--- a/Lite/Controls/ServerTab.xaml
+++ b/Lite/Controls/ServerTab.xaml
@@ -974,43 +974,92 @@
             <!-- Collection Health Tab -->
             <TabItem Header="Collection Health">
                 <Grid Margin="8">
-                    <DataGrid x:Name="CollectionHealthGrid"
-                              AutoGenerateColumns="False" IsReadOnly="True"
-                              RowStyle="{StaticResource GridRowStyle}"
-                              HeadersVisibility="Column" GridLinesVisibility="Horizontal">
-                        <DataGrid.Columns>
-                            <DataGridTextColumn Binding="{Binding CollectorName}" Width="180">
-                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectorName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Collector" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn Binding="{Binding HealthStatus}" Width="90">
-                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HealthStatus" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Status" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn Binding="{Binding TotalRuns, StringFormat=N0}" Width="80">
-                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRuns" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Runs" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn Binding="{Binding SuccessCount, StringFormat=N0}" Width="80">
-                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SuccessCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Success" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn Binding="{Binding ErrorCount, StringFormat=N0}" Width="80">
-                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ErrorCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Errors" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn Binding="{Binding FailureRatePercent, StringFormat=N1}" Width="85">
-                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="FailureRatePercent" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Fail %" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn Binding="{Binding AvgDurationFormatted}" Width="100">
-                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgDurationFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Duration" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn Binding="{Binding LastSuccessFormatted}" Width="140">
-                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastSuccessFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Success" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn Binding="{Binding LastRunFormatted}" Width="140">
-                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastRunFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Run" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn Binding="{Binding LastError}" Width="*">
-                                <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastError" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Error" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
-                            </DataGridTextColumn>
-                        </DataGrid.Columns>
-                    </DataGrid>
+                    <TabControl Background="Transparent" BorderThickness="0">
+                        <TabItem Header="Health Summary">
+                            <DataGrid x:Name="CollectionHealthGrid"
+                                      AutoGenerateColumns="False" IsReadOnly="True"
+                                      RowStyle="{StaticResource GridRowStyle}"
+                                      HeadersVisibility="Column" GridLinesVisibility="Horizontal">
+                                <DataGrid.Columns>
+                                    <DataGridTextColumn Binding="{Binding CollectorName}" Width="180">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectorName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Collector" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding HealthStatus}" Width="90">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HealthStatus" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Status" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding TotalRuns, StringFormat=N0}" Width="80">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRuns" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Runs" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding SuccessCount, StringFormat=N0}" Width="80">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SuccessCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Success" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding ErrorCount, StringFormat=N0}" Width="80">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ErrorCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Errors" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding FailureRatePercent, StringFormat=N1}" Width="85">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="FailureRatePercent" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Fail %" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding AvgDurationFormatted}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgDurationFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Duration" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding LastSuccessFormatted}" Width="140">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastSuccessFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Success" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding LastRunFormatted}" Width="140">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastRunFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Run" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding LastError}" Width="*">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastError" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Error" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                </DataGrid.Columns>
+                            </DataGrid>
+                        </TabItem>
+                        <TabItem Header="Collection Log">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,4,0,8">
+                                    <Button Content="Open Log File" Click="OpenLogFile_Click" Padding="12,4" Margin="0,0,8,0"/>
+                                </StackPanel>
+                                <DataGrid Grid.Row="1" x:Name="CollectionLogGrid"
+                                          AutoGenerateColumns="False" IsReadOnly="True"
+                                          RowStyle="{StaticResource GridRowStyle}"
+                                          HeadersVisibility="Column" GridLinesVisibility="Horizontal">
+                                    <DataGrid.Columns>
+                                        <DataGridTextColumn Binding="{Binding CollectionTimeFormatted}" Width="130">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTimeFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Time" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding CollectorName}" Width="180">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectorName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Collector" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding Status}" Width="80">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Status" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Status" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding DurationFormatted}" Width="90">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DurationFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Duration" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding SqlDurationFormatted}" Width="90">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SqlDurationFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="SQL (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding DuckDbDurationFormatted}" Width="100">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DuckDbDurationFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="DuckDB (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding RowsCollected, StringFormat=N0}" Width="80">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RowsCollected" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Rows" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding ErrorMessage}" Width="*">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ErrorMessage" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Error" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
+                                    </DataGrid.Columns>
+                                </DataGrid>
+                            </Grid>
+                        </TabItem>
+                        <TabItem Header="Duration Trends">
+                            <ScottPlot:WpfPlot x:Name="CollectorDurationChart" Margin="4"/>
+                        </TabItem>
+                    </TabControl>
                 </Grid>
             </TabItem>
 
diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index f89a517b..4e30cdae 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -59,6 +59,7 @@ public partial class ServerTab : UserControl
     private DataGridFilterManager<DatabaseScopedConfigRow>? _dbScopedConfigFilterMgr;
     private DataGridFilterManager<TraceFlagRow>? _traceFlagsFilterMgr;
     private DataGridFilterManager<CollectorHealthRow>? _collectionHealthFilterMgr;
+    private DataGridFilterManager<CollectionLogRow>? _collectionLogFilterMgr;
 
     private static readonly HashSet<string> _defaultPerfmonCounters = new(StringComparer.OrdinalIgnoreCase)
     {
@@ -446,6 +447,7 @@ private async System.Threading.Tasks.Task RefreshAllDataAsync()
             var traceFlagsTask = SafeQueryAsync(() => _dataService.GetLatestTraceFlagsAsync(_serverId));
             var runningJobsTask = SafeQueryAsync(() => _dataService.GetRunningJobsAsync(_serverId));
             var collectionHealthTask = SafeQueryAsync(() => _dataService.GetCollectionHealthAsync(_serverId));
+            var collectionLogTask = SafeQueryAsync(() => _dataService.GetRecentCollectionLogAsync(_serverId, hoursBack));
             /* Core data tasks */
             await System.Threading.Tasks.Task.WhenAll(
                 snapshotsTask, cpuTask, memoryTask, memoryTrendTask,
@@ -453,7 +455,7 @@ await System.Threading.Tasks.Task.WhenAll(
                 deadlockTask, blockedProcessTask, waitTypesTask, perfmonCountersTask,
                 queryStoreTask, memoryGrantTrendTask,
                 serverConfigTask, databaseConfigTask, databaseScopedConfigTask, traceFlagsTask,
-                runningJobsTask, collectionHealthTask);
+                runningJobsTask, collectionHealthTask, collectionLogTask);
 
             /* Trend chart tasks - run separately so failures don't kill the whole refresh */
             var blockingTrendTask = SafeQueryAsync(() => _dataService.GetBlockingTrendAsync(_serverId, hoursBack, fromDate, toDate));
@@ -491,6 +493,8 @@ await System.Threading.Tasks.Task.WhenAll(
             _traceFlagsFilterMgr!.UpdateData(traceFlagsTask.Result);
             _runningJobsFilterMgr!.UpdateData(runningJobsTask.Result);
             _collectionHealthFilterMgr!.UpdateData(collectionHealthTask.Result);
+            _collectionLogFilterMgr!.UpdateData(collectionLogTask.Result);
+            UpdateCollectorDurationChart(collectionLogTask.Result);
 
             /* Update memory summary */
             UpdateMemorySummary(memoryTask.Result);
@@ -1844,6 +1848,62 @@ private static string CsvEscape(string value)
         return value;
     }
 
+    /* ========== Collection Health ========== */
+
+    private void UpdateCollectorDurationChart(List<CollectionLogRow> data)
+    {
+        ClearChart(CollectorDurationChart);
+        ApplyDarkTheme(CollectorDurationChart);
+
+        if (data.Count == 0) { CollectorDurationChart.Refresh(); return; }
+
+        /* Group by collector, plot each as a separate series */
+        var groups = data
+            .Where(d => d.DurationMs.HasValue && d.Status == "SUCCESS")
+            .GroupBy(d => d.CollectorName)
+            .OrderBy(g => g.Key)
+            .ToList();
+
+        int colorIdx = 0;
+        foreach (var group in groups)
+        {
+            var points = group.OrderBy(d => d.CollectionTime).ToList();
+            if (points.Count < 2) continue;
+
+            var times = points.Select(d => d.CollectionTime.ToLocalTime().ToOADate()).ToArray();
+            var durations = points.Select(d => (double)d.DurationMs!.Value).ToArray();
+
+            var scatter = CollectorDurationChart.Plot.Add.Scatter(times, durations);
+            scatter.LegendText = group.Key;
+            scatter.Color = ScottPlot.Color.FromHex(SeriesColors[colorIdx % SeriesColors.Length]);
+            scatter.LineWidth = 2;
+            scatter.MarkerSize = 0;
+            colorIdx++;
+        }
+
+        CollectorDurationChart.Plot.Axes.DateTimeTicksBottom();
+        ReapplyAxisColors(CollectorDurationChart);
+        CollectorDurationChart.Plot.YLabel("Duration (ms)");
+        CollectorDurationChart.Plot.Axes.AutoScale();
+        ShowChartLegend(CollectorDurationChart);
+        CollectorDurationChart.Refresh();
+    }
+
+    private void OpenLogFile_Click(object sender, RoutedEventArgs e)
+    {
+        var logDir = System.IO.Path.Combine(AppContext.BaseDirectory, "logs");
+        var logFile = System.IO.Path.Combine(logDir, $"lite_{DateTime.Now:yyyyMMdd}.log");
+
+        if (File.Exists(logFile))
+        {
+            Process.Start(new ProcessStartInfo(logFile) { UseShellExecute = true });
+        }
+        else if (Directory.Exists(logDir))
+        {
+            Process.Start(new ProcessStartInfo(logDir) { UseShellExecute = true });
+        }
+    }
+
     /// <summary>
     /// Stops the refresh timer when the tab is removed.
     /// </summary>
@@ -1868,6 +1928,7 @@ private void InitializeFilterManagers()
         _dbScopedConfigFilterMgr = new DataGridFilterManager<DatabaseScopedConfigRow>(DatabaseScopedConfigGrid);
         _traceFlagsFilterMgr = new DataGridFilterManager<TraceFlagRow>(TraceFlagsGrid);
         _collectionHealthFilterMgr = new DataGridFilterManager<CollectorHealthRow>(CollectionHealthGrid);
+        _collectionLogFilterMgr = new DataGridFilterManager<CollectionLogRow>(CollectionLogGrid);
 
         _filterManagers[QuerySnapshotsGrid] = _querySnapshotsFilterMgr;
         _filterManagers[QueryStatsGrid] = _queryStatsFilterMgr;
@@ -1881,6 +1942,7 @@ private void InitializeFilterManagers()
         _filterManagers[DatabaseScopedConfigGrid] = _dbScopedConfigFilterMgr;
         _filterManagers[TraceFlagsGrid] = _traceFlagsFilterMgr;
         _filterManagers[CollectionHealthGrid] = _collectionHealthFilterMgr;
+        _filterManagers[CollectionLogGrid] = _collectionLogFilterMgr;
     }
 
     private void EnsureFilterPopup()
diff --git a/Lite/Services/LocalDataService.CollectionHealth.cs b/Lite/Services/LocalDataService.CollectionHealth.cs
index 5ba3a7a3..254710fd 100644
--- a/Lite/Services/LocalDataService.CollectionHealth.cs
+++ b/Lite/Services/LocalDataService.CollectionHealth.cs
@@ -61,6 +61,74 @@ GROUP BY collector_name
         return items;
     }
 
+    /// <summary>
+    /// Gets recent collection log entries for a server, most recent first.
+    /// </summary>
+    public async Task<List<CollectionLogRow>> GetRecentCollectionLogAsync(int serverId, int hoursBack = 4, int maxRows = 500)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+        command.CommandText = @"
+SELECT
+    collector_name,
+    collection_time,
+    duration_ms,
+    sql_duration_ms,
+    duckdb_duration_ms,
+    rows_collected,
+    status,
+    error_message
+FROM collection_log
+WHERE server_id = $1
+AND   collection_time >= $2
+ORDER BY collection_time DESC
+LIMIT $3";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = DateTime.UtcNow.AddHours(-hoursBack) });
+        command.Parameters.Add(new DuckDBParameter { Value = maxRows });
+
+        var items = new List<CollectionLogRow>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new CollectionLogRow
+            {
+                CollectorName = reader.GetString(0),
+                CollectionTime = reader.GetDateTime(1),
+                DurationMs = reader.IsDBNull(2) ? null : (int?)Convert.ToInt32(reader.GetValue(2)),
+                SqlDurationMs = reader.IsDBNull(3) ? null : (int?)Convert.ToInt32(reader.GetValue(3)),
+                DuckDbDurationMs = reader.IsDBNull(4) ? null : (int?)Convert.ToInt32(reader.GetValue(4)),
+                RowsCollected = reader.IsDBNull(5) ? null : (int?)Convert.ToInt32(reader.GetValue(5)),
+                Status = reader.GetString(6),
+                ErrorMessage = reader.IsDBNull(7) ? null : reader.GetString(7)
+            });
+        }
+
+        return items;
+    }
+}
+
+public class CollectionLogRow
+{
+    public string CollectorName { get; set; } = "";
+    public DateTime CollectionTime { get; set; }
+    public int? DurationMs { get; set; }
+    public int? SqlDurationMs { get; set; }
+    public int? DuckDbDurationMs { get; set; }
+    public int? RowsCollected { get; set; }
+    public string Status { get; set; } = "";
+    public string? ErrorMessage { get; set; }
+
+    public string CollectionTimeFormatted => CollectionTime.ToLocalTime().ToString("MM/dd HH:mm:ss");
+
+    public string DurationFormatted => DurationMs.HasValue
+        ? (DurationMs.Value < 1000 ? $"{DurationMs.Value} ms" : $"{DurationMs.Value / 1000.0:F1} s")
+        : "";
+
+    public string SqlDurationFormatted => SqlDurationMs.HasValue ? $"{SqlDurationMs.Value} ms" : "";
+
+    public string DuckDbDurationFormatted => DuckDbDurationMs.HasValue ? $"{DuckDbDurationMs.Value} ms" : "";
 }
 
 public class CollectorHealthRow

From 27ade9df5ffed535d39e91a70cfdd29a9c799247 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Sun, 15 Feb 2026 15:47:42 -0500
Subject: [PATCH 04/34] Fix query_cost overflow in memory grant collector, add
 Last Error At column

- SafeToDecimal() guards against Infinity/NaN from SQL Server float columns
  that crash Convert.ToDecimal() (e.g. query_cost in dm_exec_query_memory_grants)
- Add Last Error At timestamp column to Health Summary grid so users can tell
  when an error occurred, not just what it was
- Add last_error_time to GetCollectionHealthAsync() query

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Lite/Controls/ServerTab.xaml                  |  3 +++
 .../LocalDataService.CollectionHealth.cs      | 11 ++++++--
 .../RemoteCollectorService.MemoryGrants.cs    |  2 +-
 Lite/Services/RemoteCollectorService.cs       | 26 +++++++++++++++++++
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/Lite/Controls/ServerTab.xaml b/Lite/Controls/ServerTab.xaml
index 7cb808dc..192b3a8a 100644
--- a/Lite/Controls/ServerTab.xaml
+++ b/Lite/Controls/ServerTab.xaml
@@ -1008,6 +1008,9 @@
                                     <DataGridTextColumn Binding="{Binding LastRunFormatted}" Width="140">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastRunFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Run" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding LastErrorFormatted}" Width="140">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastErrorFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Error At" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding LastError}" Width="*">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastError" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Error" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
diff --git a/Lite/Services/LocalDataService.CollectionHealth.cs b/Lite/Services/LocalDataService.CollectionHealth.cs
index 254710fd..c30557cf 100644
--- a/Lite/Services/LocalDataService.CollectionHealth.cs
+++ b/Lite/Services/LocalDataService.CollectionHealth.cs
@@ -31,7 +31,8 @@ public async Task<List<CollectorHealthRow>> GetCollectionHealthAsync(int serverI
     AVG(duration_ms) AS avg_duration_ms,
     MAX(CASE WHEN status = 'SUCCESS' THEN collection_time END) AS last_success_time,
     MAX(collection_time) AS last_run_time,
-    MAX(CASE WHEN status = 'ERROR' THEN error_message END) AS last_error
+    MAX(CASE WHEN status = 'ERROR' THEN error_message END) AS last_error,
+    MAX(CASE WHEN status = 'ERROR' THEN collection_time END) AS last_error_time
 FROM collection_log
 WHERE server_id = $1
 AND   collection_time >= $2
@@ -54,7 +55,8 @@ GROUP BY collector_name
                 AvgDurationMs = reader.IsDBNull(4) ? 0 : ToDouble(reader.GetValue(4)),
                 LastSuccessTime = reader.IsDBNull(5) ? null : reader.GetDateTime(5),
                 LastRunTime = reader.IsDBNull(6) ? null : reader.GetDateTime(6),
-                LastError = reader.IsDBNull(7) ? null : reader.GetString(7)
+                LastError = reader.IsDBNull(7) ? null : reader.GetString(7),
+                LastErrorTime = reader.IsDBNull(8) ? null : reader.GetDateTime(8)
             });
         }
 
@@ -141,6 +143,7 @@ public class CollectorHealthRow
     public DateTime? LastSuccessTime { get; set; }
     public DateTime? LastRunTime { get; set; }
     public string? LastError { get; set; }
+    public DateTime? LastErrorTime { get; set; }
 
     public double FailureRatePercent => TotalRuns > 0 ? (double)ErrorCount / TotalRuns * 100 : 0;
     public double HoursSinceLastSuccess => LastSuccessTime.HasValue
@@ -170,5 +173,9 @@ public string HealthStatus
     public string LastRunFormatted => LastRunTime.HasValue
         ? LastRunTime.Value.ToLocalTime().ToString("MM/dd HH:mm:ss")
         : "Never";
+
+    public string LastErrorFormatted => LastErrorTime.HasValue
+        ? LastErrorTime.Value.ToLocalTime().ToString("MM/dd HH:mm:ss")
+        : "";
 }
 
diff --git a/Lite/Services/RemoteCollectorService.MemoryGrants.cs b/Lite/Services/RemoteCollectorService.MemoryGrants.cs
index a9ad8a89..fd455f18 100644
--- a/Lite/Services/RemoteCollectorService.MemoryGrants.cs
+++ b/Lite/Services/RemoteCollectorService.MemoryGrants.cs
@@ -79,7 +79,7 @@ WHERE mg.session_id <> @@SPID
                 reader.IsDBNull(9) ? 0L : Convert.ToInt64(reader.GetValue(9)),
                 reader.IsDBNull(10) ? false : Convert.ToBoolean(reader.GetValue(10)),
                 reader.IsDBNull(11) ? 0 : Convert.ToInt32(reader.GetValue(11)),
-                reader.IsDBNull(12) ? 0m : Convert.ToDecimal(reader.GetValue(12))));
+                reader.IsDBNull(12) ? 0m : SafeToDecimal(reader.GetValue(12))));
         }
         sqlSw.Stop();
 
diff --git a/Lite/Services/RemoteCollectorService.cs b/Lite/Services/RemoteCollectorService.cs
index 9f1c5d07..9e2c3886 100644
--- a/Lite/Services/RemoteCollectorService.cs
+++ b/Lite/Services/RemoteCollectorService.cs
@@ -517,6 +517,32 @@ protected static int GetServerId(ServerConnection server)
         return GetDeterministicHashCode(server.ServerName);
     }
 
+    /// <summary>
+    /// Safely converts a SQL Server float/real value to decimal.
+    /// Returns 0 for Infinity, NaN, or values outside decimal range.
+    /// </summary>
+    protected static decimal SafeToDecimal(object value)
+    {
+        try
+        {
+            if (value is double d)
+            {
+                if (double.IsInfinity(d) || double.IsNaN(d))
+                    return 0m;
+            }
+            else if (value is float f)
+            {
+                if (float.IsInfinity(f) || float.IsNaN(f))
+                    return 0m;
+            }
+            return Convert.ToDecimal(value);
+        }
+        catch (OverflowException)
+        {
+            return 0m;
+        }
+    }
+
     /// <summary>
     /// Deterministic hash code for a string. .NET Core randomizes string.GetHashCode()
     /// per process, so we use a simple FNV-1a hash to get a stable value across restarts.

From 5bfc15d87ff5ccf8e72f1fe57859e733359ac727 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Sun, 15 Feb 2026 16:06:46 -0500
Subject: [PATCH 05/34] Use locale-aware date/time formatting throughout UI
 (#41)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace hardcoded US-style date formats (MM/dd, MMM d, h:mm tt) with the
"g" general format specifier which respects the user's system locale.

Dashboard:
- ServerConnectionStatus: "Checked" and "Online since" timestamps
- ManageServersWindow: Last Connected column
- CollectorScheduleWindow: Last Run and Next Run columns

Lite:
- ServerConnectionStatus: same "Checked" and "Online since" timestamps
- CollectorHealthRow/CollectionLogRow: all formatted timestamp properties

Does not change the time range picker (AM/PM hour list) — that needs a
separate design discussion.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Dashboard/CollectorScheduleWindow.xaml             | 4 ++--
 Dashboard/ManageServersWindow.xaml                 | 2 +-
 Dashboard/Models/ServerConnectionStatus.cs         | 5 ++---
 Lite/Models/ServerConnectionStatus.cs              | 5 ++---
 Lite/Services/LocalDataService.CollectionHealth.cs | 8 ++++----
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Dashboard/CollectorScheduleWindow.xaml b/Dashboard/CollectorScheduleWindow.xaml
index e002f72d..ee370e21 100644
--- a/Dashboard/CollectorScheduleWindow.xaml
+++ b/Dashboard/CollectorScheduleWindow.xaml
@@ -40,8 +40,8 @@
                     <DataGridTextColumn Header="Collector" Binding="{Binding DisplayName}" Width="180" IsReadOnly="True"/>
                     <DataGridTextColumn Header="Frequency (min)" Binding="{Binding FrequencyMinutes, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" Width="110"/>
                     <DataGridTextColumn Header="Retention (days)" Binding="{Binding RetentionDays, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" Width="110"/>
-                    <DataGridTextColumn Header="Last Run" Binding="{Binding LastRunTime, StringFormat='{}{0:MM/dd HH:mm}'}" Width="100" IsReadOnly="True"/>
-                    <DataGridTextColumn Header="Next Run" Binding="{Binding NextRunTime, StringFormat='{}{0:MM/dd HH:mm}'}" Width="100" IsReadOnly="True"/>
+                    <DataGridTextColumn Header="Last Run" Binding="{Binding LastRunTime, StringFormat='{}{0:g}'}" Width="100" IsReadOnly="True"/>
+                    <DataGridTextColumn Header="Next Run" Binding="{Binding NextRunTime, StringFormat='{}{0:g}'}" Width="100" IsReadOnly="True"/>
                     <DataGridTextColumn Header="Description" Binding="{Binding Description}" Width="*" IsReadOnly="True"/>
                 </DataGrid.Columns>
             </DataGrid>
diff --git a/Dashboard/ManageServersWindow.xaml b/Dashboard/ManageServersWindow.xaml
index 8f83ad24..9c279c8c 100644
--- a/Dashboard/ManageServersWindow.xaml
+++ b/Dashboard/ManageServersWindow.xaml
@@ -50,7 +50,7 @@
                     <DataGridTextColumn Header="Display Name" Binding="{Binding DisplayName}" Width="150"/>
                     <DataGridTextColumn Header="Server" Binding="{Binding ServerName}" Width="180"/>
                     <DataGridTextColumn Header="Authentication" Binding="{Binding AuthenticationDisplay}" Width="120"/>
-                    <DataGridTextColumn Header="Last Connected" Binding="{Binding LastConnected, StringFormat='{}{0:MM/dd/yyyy HH:mm}'}" Width="130"/>
+                    <DataGridTextColumn Header="Last Connected" Binding="{Binding LastConnected, StringFormat='{}{0:g}'}" Width="130"/>
                 </DataGrid.Columns>
             </DataGrid>
         </Border>
diff --git a/Dashboard/Models/ServerConnectionStatus.cs b/Dashboard/Models/ServerConnectionStatus.cs
index 15f84571..5000dd14 100644
--- a/Dashboard/Models/ServerConnectionStatus.cs
+++ b/Dashboard/Models/ServerConnectionStatus.cs
@@ -7,7 +7,6 @@
  */
 
 using System;
-using System.Globalization;
 
 namespace PerformanceMonitorDashboard.Models
 {
@@ -127,7 +126,7 @@ public string LastCheckedDisplay
                 if (elapsed.TotalHours < 24)
                     return $"Checked {(int)elapsed.TotalHours}h ago";
 
-                return $"Checked {LastChecked.Value.ToString("MMM d, h:mm tt", CultureInfo.CurrentCulture)}";
+                return $"Checked {LastChecked.Value.ToString("g")}";
             }
         }
 
@@ -147,7 +146,7 @@ public string StatusDurationDisplay
                 {
                     if (ServerStartTime.HasValue)
                     {
-                        return $"Online since {ServerStartTime.Value.ToString("MMM d, h:mm tt", CultureInfo.CurrentCulture)}";
+                        return $"Online since {ServerStartTime.Value.ToString("g")}";
                     }
                     return "Online";
                 }
diff --git a/Lite/Models/ServerConnectionStatus.cs b/Lite/Models/ServerConnectionStatus.cs
index 16977173..3bb56012 100644
--- a/Lite/Models/ServerConnectionStatus.cs
+++ b/Lite/Models/ServerConnectionStatus.cs
@@ -7,7 +7,6 @@
  */
 
 using System;
-using System.Globalization;
 
 namespace PerformanceMonitorLite.Models;
 
@@ -146,7 +145,7 @@ public string LastCheckedDisplay
             if (elapsed.TotalHours < 24)
                 return $"Checked {(int)elapsed.TotalHours}h ago";
 
-            return $"Checked {LastChecked.Value.ToString("MMM d, h:mm tt", CultureInfo.CurrentCulture)}";
+            return $"Checked {LastChecked.Value.ToString("g")}";
         }
     }
 
@@ -166,7 +165,7 @@ public string StatusDurationDisplay
             {
                 if (ServerStartTime.HasValue)
                 {
-                    return $"Online since {ServerStartTime.Value.ToString("MMM d, h:mm tt", CultureInfo.CurrentCulture)}";
+                    return $"Online since {ServerStartTime.Value.ToString("g")}";
                 }
                 return "Online";
             }
diff --git a/Lite/Services/LocalDataService.CollectionHealth.cs b/Lite/Services/LocalDataService.CollectionHealth.cs
index c30557cf..8a5da51a 100644
--- a/Lite/Services/LocalDataService.CollectionHealth.cs
+++ b/Lite/Services/LocalDataService.CollectionHealth.cs
@@ -122,7 +122,7 @@ public class CollectionLogRow
     public string Status { get; set; } = "";
     public string? ErrorMessage { get; set; }
 
-    public string CollectionTimeFormatted => CollectionTime.ToLocalTime().ToString("MM/dd HH:mm:ss");
+    public string CollectionTimeFormatted => CollectionTime.ToLocalTime().ToString("g");
 
     public string DurationFormatted => DurationMs.HasValue
         ? (DurationMs.Value < 1000 ? $"{DurationMs.Value} ms" : $"{DurationMs.Value / 1000.0:F1} s")
@@ -167,15 +167,15 @@ public string HealthStatus
         : $"{AvgDurationMs / 1000:F1} s";
 
     public string LastSuccessFormatted => LastSuccessTime.HasValue
-        ? LastSuccessTime.Value.ToLocalTime().ToString("MM/dd HH:mm:ss")
+        ? LastSuccessTime.Value.ToLocalTime().ToString("g")
         : "Never";
 
     public string LastRunFormatted => LastRunTime.HasValue
-        ? LastRunTime.Value.ToLocalTime().ToString("MM/dd HH:mm:ss")
+        ? LastRunTime.Value.ToLocalTime().ToString("g")
         : "Never";
 
     public string LastErrorFormatted => LastErrorTime.HasValue
-        ? LastErrorTime.Value.ToLocalTime().ToString("MM/dd HH:mm:ss")
+        ? LastErrorTime.Value.ToLocalTime().ToString("g")
         : "";
 }
 

From f132193936251c3ffff7d2ff2eefc48981e9b50f Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Sun, 15 Feb 2026 16:13:43 -0500
Subject: [PATCH 06/34] Switch time range picker to 24-hour format in both apps

Change hour picker from "12 AM", "1 AM", ... "11 PM" to
"00:00", "01:00", ... "23:00". Consistent with chart axis labels,
SQL Server log conventions, and international users.

Parse logic is index-based (SelectedIndex 0-23) so no functional change.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Dashboard/ServerTab.xaml.cs     | 2 +-
 Lite/Controls/ServerTab.xaml.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dashboard/ServerTab.xaml.cs b/Dashboard/ServerTab.xaml.cs
index 1d54bc03..3bff0a9d 100644
--- a/Dashboard/ServerTab.xaml.cs
+++ b/Dashboard/ServerTab.xaml.cs
@@ -172,7 +172,7 @@ private void InitializeTimeComboBoxes()
             for (int h = 0; h < 24; h++)
             {
                 var dt = DateTime.Today.AddHours(h);
-                hours.Add(dt.ToString("h tt")); // "12 AM", "1 AM", ..., "11 PM"
+                hours.Add(dt.ToString("HH:00")); // "00:00", "01:00", ..., "23:00"
             }
 
             GlobalFromHour.ItemsSource = hours;
diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index 4e30cdae..40f7877a 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -144,7 +144,7 @@ private void InitializeTimeComboBoxes()
         for (int h = 0; h < 24; h++)
         {
             var dt = DateTime.Today.AddHours(h);
-            hours.Add(dt.ToString("h tt")); // "12 AM", "1 AM", ..., "11 PM"
+            hours.Add(dt.ToString("HH:00")); // "00:00", "01:00", ..., "23:00"
         }
 
         FromHourCombo.ItemsSource = hours;

From 259b4d481e16c3880abae2076f0002d59ab1e851 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Sun, 15 Feb 2026 16:42:01 -0500
Subject: [PATCH 07/34] Fix chart X-axis double-converting custom range to
 server time (#49)

The custom date range was already in server time (from LocalToServerTime),
but the chart axis limit code added UtcOffsetMinutes again, shifting the
X-axis by the server's UTC offset. With UTC-8 this caused an 8-hour shift
(e.g. picking 8 AM-12 PM showed 12 AM-4 AM on the axis).

Fixed in all 4 chart methods: blocking trend, deadlock trend, wait stats,
and perfmon.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Lite/Controls/ServerTab.xaml.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index 40f7877a..0bc4c36e 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -811,8 +811,8 @@ private void UpdateBlockingTrendChart(List<TrendPoint> data, int hoursBack, Date
         DateTime rangeStart, rangeEnd;
         if (fromDate.HasValue && toDate.HasValue)
         {
-            rangeStart = fromDate.Value.AddMinutes(UtcOffsetMinutes);
-            rangeEnd = toDate.Value.AddMinutes(UtcOffsetMinutes);
+            rangeStart = fromDate.Value;
+            rangeEnd = toDate.Value;
         }
         else
         {
@@ -881,8 +881,8 @@ private void UpdateDeadlockTrendChart(List<TrendPoint> data, int hoursBack, Date
         DateTime rangeStart, rangeEnd;
         if (fromDate.HasValue && toDate.HasValue)
         {
-            rangeStart = fromDate.Value.AddMinutes(UtcOffsetMinutes);
-            rangeEnd = toDate.Value.AddMinutes(UtcOffsetMinutes);
+            rangeStart = fromDate.Value;
+            rangeEnd = toDate.Value;
         }
         else
         {
@@ -1184,8 +1184,8 @@ private async System.Threading.Tasks.Task UpdateWaitStatsChartFromPickerAsync()
             DateTime rangeStart, rangeEnd;
             if (IsCustomRange && fromDate.HasValue && toDate.HasValue)
             {
-                rangeStart = fromDate.Value.AddMinutes(UtcOffsetMinutes);
-                rangeEnd = toDate.Value.AddMinutes(UtcOffsetMinutes);
+                rangeStart = fromDate.Value;
+                rangeEnd = toDate.Value;
             }
             else
             {
@@ -1325,8 +1325,8 @@ private async System.Threading.Tasks.Task UpdatePerfmonChartFromPickerAsync()
             DateTime rangeStart, rangeEnd;
             if (IsCustomRange && fromDate.HasValue && toDate.HasValue)
             {
-                rangeStart = fromDate.Value.AddMinutes(UtcOffsetMinutes);
-                rangeEnd = toDate.Value.AddMinutes(UtcOffsetMinutes);
+                rangeStart = fromDate.Value;
+                rangeEnd = toDate.Value;
             }
             else
             {

From e23570385037a1dc0cbfd32b9d88ce94d1dff80a Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Sun, 15 Feb 2026 17:17:15 -0500
Subject: [PATCH 08/34] Persist dismissed alerts across restarts, fix
 time-range ack bug (#44)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

AlertStateService rewritten with JSON persistence (alert_state.json)
for silenced servers and acknowledged alerts. Acknowledgement now uses
timestamps instead of count comparison — switching time ranges no longer
re-triggers dismissed alerts. Only genuinely new events (collected after
the ack time) clear the acknowledgement.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Lite/Controls/ServerTab.xaml.cs    |  15 +++-
 Lite/MainWindow.xaml.cs            |  27 ++-----
 Lite/Services/AlertStateService.cs | 116 ++++++++++++++++++++++++-----
 3 files changed, 118 insertions(+), 40 deletions(-)

diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index 0bc4c36e..4e046652 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -83,7 +83,7 @@ public partial class ServerTab : UserControl
     /// <summary>
     /// Raised after each data refresh with alert counts for tab badge display.
     /// </summary>
-    public event Action<int, int>? AlertCountsChanged; /* blockingCount, deadlockCount */
+    public event Action<int, int, DateTime?>? AlertCountsChanged; /* blockingCount, deadlockCount, latestEventTimeUtc */
     public event Action<int>? ApplyTimeRangeRequested; /* selectedIndex */
     public event Func<Task>? ManualRefreshRequested;
 
@@ -522,10 +522,19 @@ await System.Threading.Tasks.Task.WhenAll(
 
             ConnectionStatusText.Text = $"{_server.ServerName} - Last refresh: {DateTime.Now:HH:mm:ss}";
 
-            /* Notify parent of alert counts for tab badge */
+            /* Notify parent of alert counts for tab badge.
+               Include the latest event timestamp so acknowledgement is only
+               cleared when genuinely new events arrive, not when the time range changes. */
             var blockingCount = blockedProcessTask.Result.Count;
             var deadlockCount = deadlockTask.Result.Count;
-            AlertCountsChanged?.Invoke(blockingCount, deadlockCount);
+            DateTime? latestEventTime = null;
+            if (blockingCount > 0 || deadlockCount > 0)
+            {
+                var latestBlocking = blockedProcessTask.Result.Max(r => (DateTime?)r.CollectionTime);
+                var latestDeadlock = deadlockTask.Result.Max(r => (DateTime?)r.CollectionTime);
+                latestEventTime = latestBlocking > latestDeadlock ? latestBlocking : latestDeadlock;
+            }
+            AlertCountsChanged?.Invoke(blockingCount, deadlockCount, latestEventTime);
         }
         catch (Exception ex)
         {
diff --git a/Lite/MainWindow.xaml.cs b/Lite/MainWindow.xaml.cs
index 0707ce4e..c0967a7a 100644
--- a/Lite/MainWindow.xaml.cs
+++ b/Lite/MainWindow.xaml.cs
@@ -50,9 +50,6 @@ public partial class MainWindow : Window
     private readonly Dictionary<string, bool> _activeBlockingAlert = new();
     private readonly Dictionary<string, bool> _activeDeadlockAlert = new();
 
-    /* Track previous alert counts to detect new alerts (for clearing acknowledgements) */
-    private readonly Dictionary<string, (int Blocking, int Deadlock)> _previousAlertCounts = new();
-
     public MainWindow()
     {
         InitializeComponent();
@@ -432,9 +429,9 @@ private async void ConnectToServer(ServerConnection server)
 
         /* Subscribe to alert counts for badge updates */
         var serverId = server.Id;
-        serverTab.AlertCountsChanged += (blockingCount, deadlockCount) =>
+        serverTab.AlertCountsChanged += (blockingCount, deadlockCount, latestEventTime) =>
         {
-            Dispatcher.Invoke(() => UpdateTabBadge(tabHeader, serverId, blockingCount, deadlockCount));
+            Dispatcher.Invoke(() => UpdateTabBadge(tabHeader, serverId, blockingCount, deadlockCount, latestEventTime));
         };
 
         /* Subscribe to "Apply to All" time range propagation */
@@ -599,23 +596,14 @@ private StackPanel CreateTabHeader(ServerConnection server)
         return panel;
     }
 
-    private void UpdateTabBadge(StackPanel tabHeader, string serverId, int blockingCount, int deadlockCount)
+    private void UpdateTabBadge(StackPanel tabHeader, string serverId, int blockingCount, int deadlockCount, DateTime? latestEventTime)
     {
         var totalAlerts = blockingCount + deadlockCount;
 
-        /* Check if new alerts arrived - if so, clear any acknowledgement */
-        if (_previousAlertCounts.TryGetValue(serverId, out var previous))
-        {
-            if (blockingCount > previous.Blocking || deadlockCount > previous.Deadlock)
-            {
-                /* New alerts - clear acknowledgement so badge shows again */
-                _alertStateService.ClearAcknowledgement(serverId);
-            }
-        }
-        _previousAlertCounts[serverId] = (blockingCount, deadlockCount);
-
-        /* Check suppression state */
-        bool shouldShow = totalAlerts > 0 && _alertStateService.ShouldShowAlerts(serverId);
+        /* Delegate count tracking and acknowledgement clearing to AlertStateService.
+           Uses latestEventTime to only clear ack when genuinely new events arrive,
+           not when the user just switches time ranges. */
+        bool shouldShow = _alertStateService.UpdateAlertCounts(serverId, blockingCount, deadlockCount, latestEventTime);
 
         foreach (var child in tabHeader.Children)
         {
@@ -709,7 +697,6 @@ private void CloseServerTab(string serverId)
 
             /* Clean up alert state for this server */
             _alertStateService.RemoveServerState(serverId);
-            _previousAlertCounts.Remove(serverId);
 
             // Show empty state if no tabs open
             if (_openServerTabs.Count == 0)
diff --git a/Lite/Services/AlertStateService.cs b/Lite/Services/AlertStateService.cs
index b4bb2e59..02b8d5e3 100644
--- a/Lite/Services/AlertStateService.cs
+++ b/Lite/Services/AlertStateService.cs
@@ -8,31 +8,36 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Text.Json;
 
 namespace PerformanceMonitorLite.Services
 {
     /// <summary>
     /// Manages alert state including suppression and acknowledgement for server tab badges.
-    /// Thread-safe: All HashSet operations are protected by _lock.
+    /// State is persisted to a JSON file so it survives app restarts.
+    /// Thread-safe: All operations are protected by _lock.
     /// </summary>
     public class AlertStateService
     {
         private readonly object _lock = new object();
+        private readonly string _stateFilePath;
 
-        // Suppression state (session-only for Lite - not persisted)
         private readonly HashSet<string> _silencedServers;
 
-        // Acknowledged alerts (session-only, clears on next refresh with new data)
-        private readonly HashSet<string> _acknowledgedAlerts;
+        /* Acknowledged alerts: serverId → UTC time of acknowledgement.
+           Alerts older than the ack time stay suppressed; new events clear it. */
+        private readonly Dictionary<string, DateTime> _acknowledgedAlerts;
 
-        // Event for when suppression state changes
         public event EventHandler? SuppressionStateChanged;
 
         public AlertStateService()
         {
+            _stateFilePath = Path.Combine(AppContext.BaseDirectory, "alert_state.json");
             _silencedServers = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-            _acknowledgedAlerts = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            _acknowledgedAlerts = new Dictionary<string, DateTime>(StringComparer.OrdinalIgnoreCase);
+            Load();
         }
 
         /// <summary>
@@ -42,12 +47,10 @@ public bool ShouldShowAlerts(string serverId)
         {
             lock (_lock)
             {
-                // Check if server is silenced
                 if (_silencedServers.Contains(serverId))
                     return false;
 
-                // Check if acknowledged this refresh cycle
-                if (_acknowledgedAlerts.Contains(serverId))
+                if (_acknowledgedAlerts.ContainsKey(serverId))
                     return false;
 
                 return true;
@@ -55,36 +58,51 @@ public bool ShouldShowAlerts(string serverId)
         }
 
         /// <summary>
-        /// Acknowledges alerts for a specific server (hides badge until next refresh with new data).
+        /// Updates alert counts and returns whether the badge should be shown.
+        /// Clears acknowledgement only if latestEventTime is newer than the ack timestamp,
+        /// meaning genuinely new events arrived (not just a time-range change).
         /// </summary>
-        public void AcknowledgeAlert(string serverId)
+        public bool UpdateAlertCounts(string serverId, int blockingCount, int deadlockCount, DateTime? latestEventTimeUtc)
         {
             lock (_lock)
             {
-                _acknowledgedAlerts.Add(serverId);
+                if (latestEventTimeUtc.HasValue
+                    && _acknowledgedAlerts.TryGetValue(serverId, out var ackTime)
+                    && latestEventTimeUtc.Value > ackTime)
+                {
+                    /* Event newer than acknowledgement — clear it */
+                    _acknowledgedAlerts.Remove(serverId);
+                    Save();
+                }
+
+                int totalAlerts = blockingCount + deadlockCount;
+                return totalAlerts > 0 && ShouldShowAlertsInternal(serverId);
             }
-            SuppressionStateChanged?.Invoke(this, EventArgs.Empty);
         }
 
         /// <summary>
-        /// Clears acknowledgement for a server (called when new alert data arrives).
+        /// Acknowledges alerts for a specific server. Persisted across restarts.
+        /// Alerts stay suppressed until new events arrive (counts increase).
         /// </summary>
-        public void ClearAcknowledgement(string serverId)
+        public void AcknowledgeAlert(string serverId)
         {
             lock (_lock)
             {
-                _acknowledgedAlerts.Remove(serverId);
+                _acknowledgedAlerts[serverId] = DateTime.UtcNow;
+                Save();
             }
+            SuppressionStateChanged?.Invoke(this, EventArgs.Empty);
         }
 
         /// <summary>
-        /// Silences a server entirely (no badges until unsilenced).
+        /// Silences a server entirely (no badges until unsilenced). Persisted across restarts.
         /// </summary>
         public void SilenceServer(string serverId)
         {
             lock (_lock)
             {
                 _silencedServers.Add(serverId);
+                Save();
             }
             SuppressionStateChanged?.Invoke(this, EventArgs.Empty);
         }
@@ -97,6 +115,7 @@ public void UnsilenceServer(string serverId)
             lock (_lock)
             {
                 _silencedServers.Remove(serverId);
+                Save();
             }
             SuppressionStateChanged?.Invoke(this, EventArgs.Empty);
         }
@@ -121,7 +140,70 @@ public void RemoveServerState(string serverId)
             {
                 _silencedServers.Remove(serverId);
                 _acknowledgedAlerts.Remove(serverId);
+                Save();
             }
         }
+
+        /* Internal check without re-acquiring lock */
+        private bool ShouldShowAlertsInternal(string serverId)
+        {
+            if (_silencedServers.Contains(serverId))
+                return false;
+            if (_acknowledgedAlerts.ContainsKey(serverId))
+                return false;
+            return true;
+        }
+
+        private void Save()
+        {
+            try
+            {
+                var state = new AlertStatePersisted
+                {
+                    SilencedServers = _silencedServers.ToList(),
+                    AcknowledgedAlerts = _acknowledgedAlerts.ToDictionary(kv => kv.Key, kv => kv.Value)
+                };
+                var json = JsonSerializer.Serialize(state, new JsonSerializerOptions { WriteIndented = true });
+                File.WriteAllText(_stateFilePath, json);
+            }
+            catch
+            {
+                /* Best effort — don't crash if file write fails */
+            }
+        }
+
+        private void Load()
+        {
+            try
+            {
+                if (!File.Exists(_stateFilePath)) return;
+
+                var json = File.ReadAllText(_stateFilePath);
+                var state = JsonSerializer.Deserialize<AlertStatePersisted>(json);
+                if (state == null) return;
+
+                if (state.SilencedServers != null)
+                {
+                    foreach (var s in state.SilencedServers)
+                        _silencedServers.Add(s);
+                }
+
+                if (state.AcknowledgedAlerts != null)
+                {
+                    foreach (var kv in state.AcknowledgedAlerts)
+                        _acknowledgedAlerts[kv.Key] = kv.Value;
+                }
+            }
+            catch
+            {
+                /* Best effort — start fresh if file is corrupted */
+            }
+        }
+
+        private class AlertStatePersisted
+        {
+            public List<string>? SilencedServers { get; set; }
+            public Dictionary<string, DateTime>? AcknowledgedAlerts { get; set; }
+        }
     }
 }

From 5e49b10a451cdea30c6fb593855204142dbb2d47 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Sun, 15 Feb 2026 19:29:15 -0500
Subject: [PATCH 09/34] Add average ms per wait chart toggle to both apps (#22)

Wait stats chart now has a Metric dropdown to switch between:
- Wait Time (ms/sec): existing per-second rate (default)
- Avg Wait Time (ms/wait): delta_wait_time_ms / delta_waiting_tasks

Shows which waits are individually painful vs just high volume.
Both Dashboard and Lite get the toggle, hover tooltip unit updates
to match, and Lite summary grid gains AvgWaitMsPerTask property.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../Controls/ResourceMetricsContent.xaml      |  9 +++-
 .../Controls/ResourceMetricsContent.xaml.cs   | 19 +++++--
 Dashboard/Helpers/ChartHoverHelper.cs         |  4 +-
 Dashboard/Models/WaitStatsDataPoint.cs        |  1 +
 .../DatabaseService.ResourceMetrics.cs        | 54 ++++++++++++++++++-
 Lite/Controls/ServerTab.xaml                  | 15 +++++-
 Lite/Controls/ServerTab.xaml.cs               | 18 +++++--
 Lite/Helpers/ChartHoverHelper.cs              |  4 +-
 Lite/Services/LocalDataService.WaitStats.cs   | 10 +++-
 9 files changed, 118 insertions(+), 16 deletions(-)

diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml b/Dashboard/Controls/ResourceMetricsContent.xaml
index 9ea43c3e..9694d495 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml
@@ -142,7 +142,14 @@
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
-                        <TextBlock Grid.Row="0" Text="Wait Stats Over Time" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                        <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,5">
+                            <TextBlock Text="Wait Stats Over Time" FontWeight="Bold" VerticalAlignment="Center" Margin="0,0,12,0"/>
+                            <TextBlock Text="Metric:" VerticalAlignment="Center" Margin="0,0,4,0" FontSize="11"/>
+                            <ComboBox x:Name="WaitStatsMetricCombo" SelectedIndex="0" SelectionChanged="WaitStatsMetric_SelectionChanged" FontSize="11" Padding="4,2">
+                                <ComboBoxItem Content="Wait Time (ms/sec)"/>
+                                <ComboBoxItem Content="Avg Wait Time (ms/wait)"/>
+                            </ComboBox>
+                        </StackPanel>
                         <ScottPlot:WpfPlot Grid.Row="1" x:Name="WaitStatsDetailChart"/>
                     </Grid>
                 </Border>
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml.cs b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
index 604aaff0..8d986440 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml.cs
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
@@ -1880,6 +1880,12 @@ private async void WaitType_CheckChanged(object sender, RoutedEventArgs e)
             await UpdateWaitStatsDetailChartAsync();
         }
 
+        private void WaitStatsMetric_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (_allWaitStatsDetailData != null)
+                LoadWaitStatsDetailChart(_allWaitStatsDetailData, _waitStatsDetailHoursBack, _waitStatsDetailFromDate, _waitStatsDetailToDate);
+        }
+
         private void RefreshWaitTypeListOrder()
         {
             if (_waitTypeItems == null) return;
@@ -2050,9 +2056,12 @@ private void LoadWaitStatsDetailChart(List<WaitStatsDataPoint>? data, int hoursB
                 WaitStatsDetailChart.Plot.Axes.Remove(existingWaitStatsPanel);
                 _legendPanels[WaitStatsDetailChart] = null;
             }
+            bool useAvgPerWait = WaitStatsMetricCombo?.SelectedIndex == 1;
+
             WaitStatsDetailChart.Plot.Clear();
             TabHelpers.ApplyDarkModeToChart(WaitStatsDetailChart);
             _waitStatsHover?.Clear();
+            if (_waitStatsHover != null) _waitStatsHover.Unit = useAvgPerWait ? "ms/wait" : "ms/sec";
 
             if (data == null || data.Count == 0 || _waitTypeItems == null)
             {
@@ -2067,7 +2076,6 @@ private void LoadWaitStatsDetailChart(List<WaitStatsDataPoint>? data, int hoursB
                 WaitStatsDetailChart.Refresh();
                 return;
             }
-
             var colors = TabHelpers.ChartColors;
 
             // Get all time points across all wait types for gap filling
@@ -2080,7 +2088,8 @@ private void LoadWaitStatsDetailChart(List<WaitStatsDataPoint>? data, int hoursB
                     .GroupBy(d => d.CollectionTime)
                     .Select(g => new {
                         CollectionTime = g.Key,
-                        WaitTimeMsPerSecond = g.Sum(x => x.WaitTimeMsPerSecond)
+                        WaitTimeMsPerSecond = g.Sum(x => x.WaitTimeMsPerSecond),
+                        AvgMsPerWait = g.Average(x => x.AvgMsPerWait)
                     })
                     .OrderBy(d => d.CollectionTime)
                     .ToList();
@@ -2088,7 +2097,9 @@ private void LoadWaitStatsDetailChart(List<WaitStatsDataPoint>? data, int hoursB
                 if (waitTypeData.Count >= 1)
                 {
                     var timePoints = waitTypeData.Select(d => d.CollectionTime);
-                    var values = waitTypeData.Select(d => (double)d.WaitTimeMsPerSecond);
+                    var values = useAvgPerWait
+                        ? waitTypeData.Select(d => (double)d.AvgMsPerWait)
+                        : waitTypeData.Select(d => (double)d.WaitTimeMsPerSecond);
                     var (xs, ys) = TabHelpers.FillTimeSeriesGaps(timePoints, values);
 
                     var scatter = WaitStatsDetailChart.Plot.Add.Scatter(xs, ys);
@@ -2124,7 +2135,7 @@ private void LoadWaitStatsDetailChart(List<WaitStatsDataPoint>? data, int hoursB
             WaitStatsDetailChart.Plot.Axes.DateTimeTicksBottom();
             WaitStatsDetailChart.Plot.Axes.SetLimitsX(xMin, xMax);
             TabHelpers.SetChartYLimitsWithLegendPadding(WaitStatsDetailChart);
-            WaitStatsDetailChart.Plot.YLabel("Wait Time (ms/sec)");
+            WaitStatsDetailChart.Plot.YLabel(useAvgPerWait ? "Avg Wait Time (ms/wait)" : "Wait Time (ms/sec)");
             WaitStatsDetailChart.Plot.HideGrid();
             TabHelpers.LockChartVerticalAxis(WaitStatsDetailChart);
             WaitStatsDetailChart.Refresh();
diff --git a/Dashboard/Helpers/ChartHoverHelper.cs b/Dashboard/Helpers/ChartHoverHelper.cs
index 747c5d55..048e0c37 100644
--- a/Dashboard/Helpers/ChartHoverHelper.cs
+++ b/Dashboard/Helpers/ChartHoverHelper.cs
@@ -18,7 +18,7 @@ internal sealed class ChartHoverHelper
     private readonly List<(ScottPlot.Plottables.Scatter Scatter, string Label)> _scatters = new();
     private readonly Popup _popup;
     private readonly TextBlock _text;
-    private readonly string _unit;
+    private string _unit;
     private DateTime _lastUpdate;
 
     public ChartHoverHelper(ScottPlot.WPF.WpfPlot chart, string unit)
@@ -53,6 +53,8 @@ public ChartHoverHelper(ScottPlot.WPF.WpfPlot chart, string unit)
         chart.MouseLeave += OnMouseLeave;
     }
 
+    public string Unit { get => _unit; set => _unit = value; }
+
     public void Clear() => _scatters.Clear();
 
     public void Add(ScottPlot.Plottables.Scatter scatter, string label) =>
diff --git a/Dashboard/Models/WaitStatsDataPoint.cs b/Dashboard/Models/WaitStatsDataPoint.cs
index 5471e88c..eba716b2 100644
--- a/Dashboard/Models/WaitStatsDataPoint.cs
+++ b/Dashboard/Models/WaitStatsDataPoint.cs
@@ -16,5 +16,6 @@ public class WaitStatsDataPoint
         public string WaitType { get; set; } = string.Empty;
         public decimal WaitTimeMsPerSecond { get; set; }
         public decimal SignalWaitTimeMsPerSecond { get; set; }
+        public decimal AvgMsPerWait { get; set; }
     }
 }
diff --git a/Dashboard/Services/DatabaseService.ResourceMetrics.cs b/Dashboard/Services/DatabaseService.ResourceMetrics.cs
index 2d2fb6f8..5bead59f 100644
--- a/Dashboard/Services/DatabaseService.ResourceMetrics.cs
+++ b/Dashboard/Services/DatabaseService.ResourceMetrics.cs
@@ -1723,6 +1723,14 @@ PARTITION BY
                 ORDER BY
                     ws.collection_time
             ),
+        waiting_tasks_delta =
+            ws.waiting_tasks_count - LAG(ws.waiting_tasks_count, 1, ws.waiting_tasks_count) OVER
+            (
+                PARTITION BY
+                    ws.wait_type
+                ORDER BY
+                    ws.collection_time
+            ),
         interval_seconds =
             DATEDIFF
             (
@@ -1754,6 +1762,12 @@ ELSE 0
             WHEN wd.interval_seconds > 0
             THEN CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
             ELSE 0
+        END,
+    avg_ms_per_wait =
+        CASE
+            WHEN wd.waiting_tasks_delta > 0
+            THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta
+            ELSE 0
         END
 FROM wait_deltas AS wd
 WHERE wd.wait_time_ms_delta > 0
@@ -1788,6 +1802,14 @@ PARTITION BY
                 ORDER BY
                     ws.collection_time
             ),
+        waiting_tasks_delta =
+            ws.waiting_tasks_count - LAG(ws.waiting_tasks_count, 1, ws.waiting_tasks_count) OVER
+            (
+                PARTITION BY
+                    ws.wait_type
+                ORDER BY
+                    ws.collection_time
+            ),
         interval_seconds =
             DATEDIFF
             (
@@ -1818,6 +1840,12 @@ ELSE 0
             WHEN wd.interval_seconds > 0
             THEN CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
             ELSE 0
+        END,
+    avg_ms_per_wait =
+        CASE
+            WHEN wd.waiting_tasks_delta > 0
+            THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta
+            ELSE 0
         END
 FROM wait_deltas AS wd
 WHERE wd.wait_time_ms_delta > 0
@@ -1840,7 +1868,8 @@ ORDER BY
                     CollectionTime = reader.GetDateTime(0),
                     WaitType = reader.IsDBNull(1) ? string.Empty : reader.GetString(1),
                     WaitTimeMsPerSecond = reader.IsDBNull(2) ? 0m : Convert.ToDecimal(reader.GetValue(2), CultureInfo.InvariantCulture),
-                    SignalWaitTimeMsPerSecond = reader.IsDBNull(3) ? 0m : Convert.ToDecimal(reader.GetValue(3), CultureInfo.InvariantCulture)
+                    SignalWaitTimeMsPerSecond = reader.IsDBNull(3) ? 0m : Convert.ToDecimal(reader.GetValue(3), CultureInfo.InvariantCulture),
+                    AvgMsPerWait = reader.IsDBNull(4) ? 0m : Convert.ToDecimal(reader.GetValue(4), CultureInfo.InvariantCulture)
                 });
             }
 
@@ -1890,6 +1919,12 @@ ORDER BY ws.collection_time
                 PARTITION BY ws.wait_type
                 ORDER BY ws.collection_time
             ),
+        waiting_tasks_delta =
+            ws.waiting_tasks_count - LAG(ws.waiting_tasks_count, 1, ws.waiting_tasks_count) OVER
+            (
+                PARTITION BY ws.wait_type
+                ORDER BY ws.collection_time
+            ),
         interval_seconds =
             DATEDIFF(SECOND, LAG(ws.collection_time, 1, ws.collection_time) OVER
             (
@@ -1911,6 +1946,10 @@ THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
     signal_wait_time_ms_per_second =
         CASE WHEN wd.interval_seconds > 0
         THEN CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+        ELSE 0 END,
+    avg_ms_per_wait =
+        CASE WHEN wd.waiting_tasks_delta > 0
+        THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta
         ELSE 0 END
 FROM wait_deltas AS wd
 WHERE wd.wait_time_ms_delta > 0
@@ -1939,6 +1978,12 @@ ORDER BY ws.collection_time
                 PARTITION BY ws.wait_type
                 ORDER BY ws.collection_time
             ),
+        waiting_tasks_delta =
+            ws.waiting_tasks_count - LAG(ws.waiting_tasks_count, 1, ws.waiting_tasks_count) OVER
+            (
+                PARTITION BY ws.wait_type
+                ORDER BY ws.collection_time
+            ),
         interval_seconds =
             DATEDIFF(SECOND, LAG(ws.collection_time, 1, ws.collection_time) OVER
             (
@@ -1959,6 +2004,10 @@ THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
     signal_wait_time_ms_per_second =
         CASE WHEN wd.interval_seconds > 0
         THEN CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+        ELSE 0 END,
+    avg_ms_per_wait =
+        CASE WHEN wd.waiting_tasks_delta > 0
+        THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta
         ELSE 0 END
 FROM wait_deltas AS wd
 WHERE wd.wait_time_ms_delta > 0
@@ -1982,7 +2031,8 @@ WHERE wd.wait_time_ms_delta > 0
                     CollectionTime = reader.GetDateTime(0),
                     WaitType = reader.IsDBNull(1) ? string.Empty : reader.GetString(1),
                     WaitTimeMsPerSecond = reader.IsDBNull(2) ? 0m : Convert.ToDecimal(reader.GetValue(2), CultureInfo.InvariantCulture),
-                    SignalWaitTimeMsPerSecond = reader.IsDBNull(3) ? 0m : Convert.ToDecimal(reader.GetValue(3), CultureInfo.InvariantCulture)
+                    SignalWaitTimeMsPerSecond = reader.IsDBNull(3) ? 0m : Convert.ToDecimal(reader.GetValue(3), CultureInfo.InvariantCulture),
+                    AvgMsPerWait = reader.IsDBNull(4) ? 0m : Convert.ToDecimal(reader.GetValue(4), CultureInfo.InvariantCulture)
                 });
             }
 
diff --git a/Lite/Controls/ServerTab.xaml b/Lite/Controls/ServerTab.xaml
index 192b3a8a..c99a7afe 100644
--- a/Lite/Controls/ServerTab.xaml
+++ b/Lite/Controls/ServerTab.xaml
@@ -145,7 +145,20 @@
                         </Grid>
                     </Border>
 
-                    <ScottPlot:WpfPlot Grid.Column="1" x:Name="WaitStatsChart"/>
+                    <Grid Grid.Column="1">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="8,4,0,0">
+                            <TextBlock Text="Metric:" VerticalAlignment="Center" Margin="0,0,6,0" FontSize="11"/>
+                            <ComboBox x:Name="WaitStatsMetricCombo" SelectedIndex="0" SelectionChanged="WaitStatsMetric_SelectionChanged" FontSize="11" Padding="4,2">
+                                <ComboBoxItem Content="Wait Time (ms/sec)"/>
+                                <ComboBoxItem Content="Avg Wait Time (ms/wait)"/>
+                            </ComboBox>
+                        </StackPanel>
+                        <ScottPlot:WpfPlot Grid.Row="1" x:Name="WaitStatsChart"/>
+                    </Grid>
                 </Grid>
             </TabItem>
 
diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index 4e046652..0d16810a 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -1139,6 +1139,11 @@ private void WaitTypeClearAll_Click(object sender, RoutedEventArgs e)
         _ = UpdateWaitStatsChartFromPickerAsync();
     }
 
+    private void WaitStatsMetric_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        _ = UpdateWaitStatsChartFromPickerAsync();
+    }
+
     private void WaitType_CheckChanged(object sender, RoutedEventArgs e)
     {
         if (_isUpdatingWaitTypeSelection) return;
@@ -1158,6 +1163,9 @@ private async System.Threading.Tasks.Task UpdateWaitStatsChartFromPickerAsync()
 
             if (selected.Count == 0) { WaitStatsChart.Refresh(); return; }
 
+            bool useAvgPerWait = WaitStatsMetricCombo?.SelectedIndex == 1;
+            if (_waitStatsHover != null) _waitStatsHover.Unit = useAvgPerWait ? "ms/wait" : "ms/sec";
+
             var hoursBack = GetHoursBack();
             DateTime? fromDate = null;
             DateTime? toDate = null;
@@ -1179,14 +1187,16 @@ private async System.Threading.Tasks.Task UpdateWaitStatsChartFromPickerAsync()
                 if (trend.Count == 0) continue;
 
                 var times = trend.Select(t => t.CollectionTime.AddMinutes(UtcOffsetMinutes).ToOADate()).ToArray();
-                var waitTime = trend.Select(t => t.WaitTimeMsPerSecond).ToArray();
+                var values = useAvgPerWait
+                    ? trend.Select(t => t.AvgMsPerWait).ToArray()
+                    : trend.Select(t => t.WaitTimeMsPerSecond).ToArray();
 
-                var plot = WaitStatsChart.Plot.Add.Scatter(times, waitTime);
+                var plot = WaitStatsChart.Plot.Add.Scatter(times, values);
                 plot.LegendText = selected[i].DisplayName;
                 plot.Color = ScottPlot.Color.FromHex(SeriesColors[i % SeriesColors.Length]);
                 _waitStatsHover?.Add(plot, selected[i].DisplayName);
 
-                if (waitTime.Length > 0) globalMax = Math.Max(globalMax, waitTime.Max());
+                if (values.Length > 0) globalMax = Math.Max(globalMax, values.Max());
             }
 
             WaitStatsChart.Plot.Axes.DateTimeTicksBottom();
@@ -1203,7 +1213,7 @@ private async System.Threading.Tasks.Task UpdateWaitStatsChartFromPickerAsync()
             }
             WaitStatsChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
             ReapplyAxisColors(WaitStatsChart);
-            WaitStatsChart.Plot.YLabel("Wait Time (ms/sec)");
+            WaitStatsChart.Plot.YLabel(useAvgPerWait ? "Avg Wait Time (ms/wait)" : "Wait Time (ms/sec)");
             SetChartYLimitsWithLegendPadding(WaitStatsChart, 0, globalMax > 0 ? globalMax : 100);
             ShowChartLegend(WaitStatsChart);
             WaitStatsChart.Refresh();
diff --git a/Lite/Helpers/ChartHoverHelper.cs b/Lite/Helpers/ChartHoverHelper.cs
index 5c1e41a0..71a8fbb7 100644
--- a/Lite/Helpers/ChartHoverHelper.cs
+++ b/Lite/Helpers/ChartHoverHelper.cs
@@ -18,7 +18,7 @@ internal sealed class ChartHoverHelper
     private readonly List<(ScottPlot.Plottables.Scatter Scatter, string Label)> _scatters = new();
     private readonly Popup _popup;
     private readonly TextBlock _text;
-    private readonly string _unit;
+    private string _unit;
     private DateTime _lastUpdate;
 
     public ChartHoverHelper(ScottPlot.WPF.WpfPlot chart, string unit)
@@ -53,6 +53,8 @@ public ChartHoverHelper(ScottPlot.WPF.WpfPlot chart, string unit)
         chart.MouseLeave += OnMouseLeave;
     }
 
+    public string Unit { get => _unit; set => _unit = value; }
+
     public void Clear() => _scatters.Clear();
 
     public void Add(ScottPlot.Plottables.Scatter scatter, string label) =>
diff --git a/Lite/Services/LocalDataService.WaitStats.cs b/Lite/Services/LocalDataService.WaitStats.cs
index b5678d77..b4c73d06 100644
--- a/Lite/Services/LocalDataService.WaitStats.cs
+++ b/Lite/Services/LocalDataService.WaitStats.cs
@@ -112,6 +112,7 @@ WITH raw AS
         collection_time,
         delta_wait_time_ms,
         delta_signal_wait_time_ms,
+        delta_waiting_tasks,
         date_diff('second', LAG(collection_time) OVER (ORDER BY collection_time), collection_time) AS interval_seconds
     FROM wait_stats
     WHERE server_id = $1
@@ -122,7 +123,8 @@ FROM wait_stats
 SELECT
     collection_time,
     CASE WHEN interval_seconds > 0 THEN CAST(delta_wait_time_ms AS DOUBLE) / interval_seconds ELSE 0 END AS wait_time_ms_per_second,
-    CASE WHEN interval_seconds > 0 THEN CAST(delta_signal_wait_time_ms AS DOUBLE) / interval_seconds ELSE 0 END AS signal_wait_time_ms_per_second
+    CASE WHEN interval_seconds > 0 THEN CAST(delta_signal_wait_time_ms AS DOUBLE) / interval_seconds ELSE 0 END AS signal_wait_time_ms_per_second,
+    CASE WHEN delta_waiting_tasks > 0 THEN CAST(delta_wait_time_ms AS DOUBLE) / delta_waiting_tasks ELSE 0 END AS avg_ms_per_wait
 FROM raw
 ORDER BY collection_time";
 
@@ -139,7 +141,8 @@ FROM raw
             {
                 CollectionTime = reader.GetDateTime(0),
                 WaitTimeMsPerSecond = reader.IsDBNull(1) ? 0 : reader.GetDouble(1),
-                SignalWaitTimeMsPerSecond = reader.IsDBNull(2) ? 0 : reader.GetDouble(2)
+                SignalWaitTimeMsPerSecond = reader.IsDBNull(2) ? 0 : reader.GetDouble(2),
+                AvgMsPerWait = reader.IsDBNull(3) ? 0 : reader.GetDouble(3)
             });
         }
 
@@ -155,6 +158,8 @@ public class WaitStatsRow
     public long TotalSignalWaitTimeMs { get; set; }
     public long ResourceWaitTimeMs => TotalWaitTimeMs - TotalSignalWaitTimeMs;
     public long SampleCount { get; set; }
+    public double AvgWaitMsPerTask => TotalWaitingTasks > 0 ? (double)TotalWaitTimeMs / TotalWaitingTasks : 0;
+    public string AvgWaitMsFormatted => AvgWaitMsPerTask < 0.1 ? "< 0.1 ms" : $"{AvgWaitMsPerTask:F1} ms";
     public string TotalWaitTimeFormatted => FormatMs(TotalWaitTimeMs);
     public string SignalWaitTimeFormatted => FormatMs(TotalSignalWaitTimeMs);
     public string ResourceWaitTimeFormatted => FormatMs(ResourceWaitTimeMs);
@@ -181,4 +186,5 @@ public class WaitStatsTrendPoint
     public DateTime CollectionTime { get; set; }
     public double WaitTimeMsPerSecond { get; set; }
     public double SignalWaitTimeMsPerSecond { get; set; }
+    public double AvgMsPerWait { get; set; }
 }

From 3f23f55bce4080deacef0115b5f5022156404fe6 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Sun, 15 Feb 2026 22:29:56 -0500
Subject: [PATCH 10/34] Fix minimize-to-tray setting ignored in Dashboard, add
 setting to Lite (#53)

Dashboard: SettingsWindow was creating its own UserPreferencesService
instance, so preference changes weren't visible to MainWindow's instance
(stale in-memory cache). Now shares the same instance via constructor
injection.

Lite: SystemTrayService always hid window on minimize with no preference
check. Added App.MinimizeToTray property, wired to settings.json
(key already existed but was unused), added checkbox to Settings UI.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Dashboard/MainWindow.xaml.cs              | 4 ++--
 Dashboard/Services/NotificationService.cs | 2 +-
 Dashboard/SettingsWindow.xaml.cs          | 9 +++++----
 Lite/App.xaml.cs                          | 6 ++++++
 Lite/Services/SystemTrayService.cs        | 2 +-
 Lite/Windows/SettingsWindow.xaml          | 2 ++
 Lite/Windows/SettingsWindow.xaml.cs       | 3 +++
 Lite/config/settings.json                 | 2 +-
 8 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Dashboard/MainWindow.xaml.cs b/Dashboard/MainWindow.xaml.cs
index f665f82c..10986daa 100644
--- a/Dashboard/MainWindow.xaml.cs
+++ b/Dashboard/MainWindow.xaml.cs
@@ -185,7 +185,7 @@ private void StartMcpServerIfEnabled()
 
         private void InitializeNotificationService()
         {
-            _notificationService = new NotificationService(this);
+            _notificationService = new NotificationService(this, _preferencesService);
             _notificationService.Initialize();
         }
 
@@ -756,7 +756,7 @@ private void ManageServers_Click(object sender, RoutedEventArgs e)
 
         private void Settings_Click(object sender, RoutedEventArgs e)
         {
-            var dialog = new SettingsWindow();
+            var dialog = new SettingsWindow(_preferencesService);
             dialog.Owner = this;
             if (dialog.ShowDialog() == true)
             {
diff --git a/Dashboard/Services/NotificationService.cs b/Dashboard/Services/NotificationService.cs
index e04199a2..ffa38c2e 100644
--- a/Dashboard/Services/NotificationService.cs
+++ b/Dashboard/Services/NotificationService.cs
@@ -208,7 +208,7 @@ private void OpenSettings()
             // Trigger settings via the main window
             if (_mainWindow is MainWindow mainWin)
             {
-                var settingsWindow = new SettingsWindow { Owner = mainWin };
+                var settingsWindow = new SettingsWindow(_preferencesService) { Owner = mainWin };
                 settingsWindow.ShowDialog();
             }
         }
diff --git a/Dashboard/SettingsWindow.xaml.cs b/Dashboard/SettingsWindow.xaml.cs
index 3a40f770..18c2a89e 100644
--- a/Dashboard/SettingsWindow.xaml.cs
+++ b/Dashboard/SettingsWindow.xaml.cs
@@ -11,20 +11,21 @@
 using System.Windows;
 using System.Windows.Controls;
 using PerformanceMonitorDashboard.Helpers;
+using PerformanceMonitorDashboard.Interfaces;
 using PerformanceMonitorDashboard.Services;
 
 namespace PerformanceMonitorDashboard
 {
     public partial class SettingsWindow : Window
     {
-        private readonly UserPreferencesService _preferencesService;
+        private readonly IUserPreferencesService _preferencesService;
         private bool _isLoading = true;
 
-        public SettingsWindow()
+        public SettingsWindow(IUserPreferencesService preferencesService)
         {
             InitializeComponent();
 
-            _preferencesService = new UserPreferencesService();
+            _preferencesService = preferencesService;
             LoadSettings();
             _isLoading = false;
         }
@@ -495,7 +496,7 @@ private async void TestEmailButton_Click(object sender, RoutedEventArgs e)
 
             try
             {
-                var emailService = EmailAlertService.Current ?? new EmailAlertService(_preferencesService);
+                var emailService = EmailAlertService.Current ?? new EmailAlertService((UserPreferencesService)_preferencesService);
                 var error = await emailService.SendTestEmailAsync(testPrefs);
 
                 if (error == null)
diff --git a/Lite/App.xaml.cs b/Lite/App.xaml.cs
index 00bbb874..146c45e9 100644
--- a/Lite/App.xaml.cs
+++ b/Lite/App.xaml.cs
@@ -56,6 +56,9 @@ public partial class App : Application
     public static bool AlertDeadlockEnabled { get; set; } = true;
     public static int AlertDeadlockThreshold { get; set; } = 1;
 
+    /* System tray settings */
+    public static bool MinimizeToTray { get; set; } = true;
+
     /* Update check settings */
     public static bool CheckForUpdatesOnStartup { get; set; } = true;
 
@@ -199,6 +202,9 @@ public static void LoadAlertSettings()
             if (root.TryGetProperty("alert_deadlock_enabled", out v)) AlertDeadlockEnabled = v.GetBoolean();
             if (root.TryGetProperty("alert_deadlock_threshold", out v)) AlertDeadlockThreshold = v.GetInt32();
 
+            /* System tray settings */
+            if (root.TryGetProperty("minimize_to_tray", out v)) MinimizeToTray = v.GetBoolean();
+
             /* Update check settings */
             if (root.TryGetProperty("check_for_updates_on_startup", out v)) CheckForUpdatesOnStartup = v.GetBoolean();
 
diff --git a/Lite/Services/SystemTrayService.cs b/Lite/Services/SystemTrayService.cs
index 209b1d97..8535777a 100644
--- a/Lite/Services/SystemTrayService.cs
+++ b/Lite/Services/SystemTrayService.cs
@@ -107,7 +107,7 @@ public void Initialize()
 
     private void MainWindow_StateChanged(object? sender, EventArgs e)
     {
-        if (_mainWindow.WindowState == WindowState.Minimized)
+        if (_mainWindow.WindowState == WindowState.Minimized && App.MinimizeToTray)
         {
             _mainWindow.Hide();
         }
diff --git a/Lite/Windows/SettingsWindow.xaml b/Lite/Windows/SettingsWindow.xaml
index 5de35bb0..26641c98 100644
--- a/Lite/Windows/SettingsWindow.xaml
+++ b/Lite/Windows/SettingsWindow.xaml
@@ -97,6 +97,8 @@
         <Border Grid.Row="4" Background="{DynamicResource BackgroundLightBrush}" CornerRadius="4" Padding="12" Margin="0,0,0,12">
             <StackPanel>
                 <TextBlock Text="Notifications" FontSize="14" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundBrush}"/>
+                <CheckBox x:Name="MinimizeToTrayCheckBox" Content="Minimize to system tray" Margin="0,8,0,0"
+                          Foreground="{DynamicResource ForegroundBrush}"/>
                 <CheckBox x:Name="AlertsEnabledCheckBox" Content="Enable notifications" Margin="0,8,0,0"
                           Foreground="{DynamicResource ForegroundBrush}" Checked="AlertsEnabledCheckBox_Changed" Unchecked="AlertsEnabledCheckBox_Changed"/>
                 <CheckBox x:Name="NotifyConnectionCheckBox" Content="Connection lost / restored" Margin="20,6,0,0"
diff --git a/Lite/Windows/SettingsWindow.xaml.cs b/Lite/Windows/SettingsWindow.xaml.cs
index 94769564..db67bbeb 100644
--- a/Lite/Windows/SettingsWindow.xaml.cs
+++ b/Lite/Windows/SettingsWindow.xaml.cs
@@ -221,6 +221,7 @@ private void CopyMcpCommandButton_Click(object sender, RoutedEventArgs e)
 
     private void LoadAlertSettings()
     {
+        MinimizeToTrayCheckBox.IsChecked = App.MinimizeToTray;
         AlertsEnabledCheckBox.IsChecked = App.AlertsEnabled;
         NotifyConnectionCheckBox.IsChecked = App.NotifyConnectionChanges;
         AlertCpuCheckBox.IsChecked = App.AlertCpuEnabled;
@@ -234,6 +235,7 @@ private void LoadAlertSettings()
 
     private void SaveAlertSettings()
     {
+        App.MinimizeToTray = MinimizeToTrayCheckBox.IsChecked == true;
         App.AlertsEnabled = AlertsEnabledCheckBox.IsChecked == true;
         App.NotifyConnectionChanges = NotifyConnectionCheckBox.IsChecked == true;
         App.AlertCpuEnabled = AlertCpuCheckBox.IsChecked == true;
@@ -260,6 +262,7 @@ private void SaveAlertSettings()
                 root = new JsonObject();
             }
 
+            root["minimize_to_tray"] = App.MinimizeToTray;
             root["alerts_enabled"] = App.AlertsEnabled;
             root["notify_connection_changes"] = App.NotifyConnectionChanges;
             root["alert_cpu_enabled"] = App.AlertCpuEnabled;
diff --git a/Lite/config/settings.json b/Lite/config/settings.json
index d0f98cf0..bb2c682a 100644
--- a/Lite/config/settings.json
+++ b/Lite/config/settings.json
@@ -3,7 +3,7 @@
   "archive_retention_days": 90,
   "default_time_range_hours": 24,
   "theme": "light",
-  "minimize_to_tray": false,
+  "minimize_to_tray": true,
   "start_collection_on_launch": true,
   "mcp_enabled": false,
   "mcp_port": 5151

From 177f57dd0623ac2b3b80496be40f30606537638c Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 08:41:05 -0500
Subject: [PATCH 11/34] Add alert types, alerts history view, column filtering,
 and dismiss/hide (#52, #56-59)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

New alert types for both Dashboard and Lite: Long-Running Queries,
Poison Waits, TempDB Space, Long-Running Jobs — each with configurable
thresholds in Settings, email notifications, tray toasts, and auto-clear
when conditions resolve.

Alerts History view aggregates all alerts across servers in a timeline
with severity-colored rows, time range and server filters, column-level
filtering, copy/export context menu, and dismiss/hide functionality.

Dashboard persists alert history to JSON on exit and reloads on startup.
Alerts are hidden (not deleted) when dismissed, surviving across sessions.
Lite stores alerts in DuckDB with a dismissed column (schema v9 migration).

Both apps auto-refresh the alerts view when visible and support
multi-select dismiss and bulk dismiss-all with confirmation.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Dashboard/Controls/AlertsHistoryContent.xaml  | 157 ++++++
 .../Controls/AlertsHistoryContent.xaml.cs     | 446 ++++++++++++++++++
 Dashboard/MainWindow.xaml                     |   6 +
 Dashboard/MainWindow.xaml.cs                  | 372 ++++++++++++++-
 Dashboard/Models/AlertHealthResult.cs         |   8 +-
 Dashboard/Models/AnomalousJobInfo.cs          |  21 +
 Dashboard/Models/LongRunningQueryInfo.cs      |  22 +
 Dashboard/Models/PoisonWaitDelta.cs           |  16 +
 Dashboard/Models/TempDbSpaceInfo.cs           |  23 +
 Dashboard/Models/UserPreferences.cs           |   8 +
 .../Services/DatabaseService.NocHealth.cs     | 219 ++++++++-
 Dashboard/Services/EmailAlertService.cs       | 112 ++++-
 Dashboard/Services/EmailTemplateBuilder.cs    |   4 +
 Dashboard/Services/NotificationService.cs     |  45 ++
 Dashboard/SettingsWindow.xaml                 |  52 ++
 Dashboard/SettingsWindow.xaml.cs              |  60 +++
 Lite/App.xaml.cs                              |  16 +
 Lite/Controls/AlertsHistoryTab.xaml           | 156 ++++++
 Lite/Controls/AlertsHistoryTab.xaml.cs        | 399 ++++++++++++++++
 Lite/Database/DuckDbInitializer.cs            |  17 +-
 Lite/Database/Schema.cs                       |   3 +-
 Lite/MainWindow.xaml                          |   4 +
 Lite/MainWindow.xaml.cs                       | 318 ++++++++++++-
 Lite/Services/EmailAlertService.cs            |  98 ++--
 Lite/Services/EmailTemplateBuilder.cs         |   4 +
 .../Services/LocalDataService.AlertHistory.cs | 191 ++++++++
 Lite/Services/LocalDataService.RunningJobs.cs |  61 +++
 Lite/Services/LocalDataService.TempDb.cs      |  57 +++
 Lite/Services/LocalDataService.WaitStats.cs   | 118 +++++
 Lite/Windows/SettingsWindow.xaml              |  28 ++
 Lite/Windows/SettingsWindow.xaml.cs           |  36 ++
 31 files changed, 3015 insertions(+), 62 deletions(-)
 create mode 100644 Dashboard/Controls/AlertsHistoryContent.xaml
 create mode 100644 Dashboard/Controls/AlertsHistoryContent.xaml.cs
 create mode 100644 Dashboard/Models/AnomalousJobInfo.cs
 create mode 100644 Dashboard/Models/LongRunningQueryInfo.cs
 create mode 100644 Dashboard/Models/PoisonWaitDelta.cs
 create mode 100644 Dashboard/Models/TempDbSpaceInfo.cs
 create mode 100644 Lite/Controls/AlertsHistoryTab.xaml
 create mode 100644 Lite/Controls/AlertsHistoryTab.xaml.cs
 create mode 100644 Lite/Services/LocalDataService.AlertHistory.cs

diff --git a/Dashboard/Controls/AlertsHistoryContent.xaml b/Dashboard/Controls/AlertsHistoryContent.xaml
new file mode 100644
index 00000000..41793f4c
--- /dev/null
+++ b/Dashboard/Controls/AlertsHistoryContent.xaml
@@ -0,0 +1,157 @@
+<UserControl x:Class="PerformanceMonitorDashboard.Controls.AlertsHistoryContent"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/Themes/DarkTheme.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+
+            <!-- Context Menu for DataGrid Copy/Export -->
+            <ContextMenu x:Key="DataGridContextMenu">
+                <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+                <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+                <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+                <Separator/>
+                <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+            </ContextMenu>
+
+            <Style x:Key="DefaultRowStyle" TargetType="DataGridRow">
+                <Setter Property="ContextMenu" Value="{StaticResource DataGridContextMenu}"/>
+            </Style>
+
+            <Style x:Key="AlertRowStyle" TargetType="DataGridRow" BasedOn="{StaticResource DefaultRowStyle}">
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding IsCritical}" Value="True">
+                        <Setter Property="Background" Value="#33DC2626"/>
+                    </DataTrigger>
+                    <DataTrigger Binding="{Binding IsWarning}" Value="True">
+                        <Setter Property="Background" Value="#33D97706"/>
+                    </DataTrigger>
+                    <DataTrigger Binding="{Binding IsResolved}" Value="True">
+                        <Setter Property="Background" Value="#3322C55E"/>
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <!-- Header Controls -->
+        <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10,5" Background="{DynamicResource BackgroundLightBrush}" Height="40">
+            <TextBlock Text="Alert History" VerticalAlignment="Center" Margin="5,0,10,0" FontWeight="Bold" FontSize="14"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <TextBlock Text="Time Range:" VerticalAlignment="Center" Margin="5,0,4,0"
+                       Foreground="{DynamicResource ForegroundMutedBrush}"/>
+            <ComboBox x:Name="TimeRangeComboBox" Width="100" VerticalAlignment="Center"
+                      SelectionChanged="TimeRangeComboBox_SelectionChanged">
+                <ComboBoxItem Content="Last 1 Hour" Tag="1"/>
+                <ComboBoxItem Content="Last 4 Hours" Tag="4"/>
+                <ComboBoxItem Content="Last 24 Hours" Tag="24" IsSelected="True"/>
+                <ComboBoxItem Content="Last 7 Days" Tag="168"/>
+                <ComboBoxItem Content="All" Tag="0"/>
+            </ComboBox>
+            <TextBlock Text="Server:" VerticalAlignment="Center" Margin="12,0,4,0"
+                       Foreground="{DynamicResource ForegroundMutedBrush}"/>
+            <ComboBox x:Name="ServerFilterComboBox" Width="160" VerticalAlignment="Center"
+                      SelectionChanged="ServerFilterComboBox_SelectionChanged">
+                <ComboBoxItem Content="All Servers" IsSelected="True"/>
+            </ComboBox>
+            <Button Content="Refresh" Click="RefreshButton_Click" Margin="12,0,0,0" Padding="10,4" MinWidth="70"
+                    Style="{StaticResource SuccessButton}"/>
+            <Button x:Name="DismissSelectedButton" Content="Dismiss Selected" Click="DismissSelected_Click"
+                    Margin="8,0,0,0" Padding="10,4" MinWidth="90" IsEnabled="False"/>
+            <Button Content="Dismiss All" Click="DismissAll_Click"
+                    Margin="4,0,0,0" Padding="10,4" MinWidth="70"/>
+            <TextBlock x:Name="AlertCountIndicator" Text="" Margin="12,0,0,0" VerticalAlignment="Center"
+                       FontStyle="Italic" Foreground="{DynamicResource AccentBrush}" FontWeight="SemiBold"/>
+        </StackPanel>
+
+        <!-- DataGrid -->
+        <Grid Grid.Row="1">
+            <DataGrid x:Name="AlertsDataGrid"
+                      AutoGenerateColumns="False"
+                      IsReadOnly="True"
+                      CanUserSortColumns="True"
+                      GridLinesVisibility="Horizontal"
+                      CanUserResizeColumns="True"
+                      SelectionMode="Extended"
+                      SelectionChanged="AlertsDataGrid_SelectionChanged"
+                      RowStyle="{StaticResource AlertRowStyle}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding TimeLocal}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TimeLocal" Click="AlertFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ServerName}" Width="140">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ServerName" Click="AlertFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Server" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding MetricName}" Width="160">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MetricName" Click="AlertFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Alert Type" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding CurrentValue}" Width="200">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CurrentValue" Click="AlertFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Value" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ThresholdValue}" Width="140">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ThresholdValue" Click="AlertFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Threshold" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding NotificationType}" Width="80">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NotificationType" Click="AlertFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Channel" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding StatusDisplay}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="StatusDisplay" Click="AlertFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Status" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+
+            <!-- Empty State -->
+            <TextBlock x:Name="NoAlertsMessage"
+                       Text="No alerts recorded in the selected time range"
+                       FontSize="14" Foreground="{DynamicResource ForegroundMutedBrush}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       Visibility="Collapsed"/>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Dashboard/Controls/AlertsHistoryContent.xaml.cs b/Dashboard/Controls/AlertsHistoryContent.xaml.cs
new file mode 100644
index 00000000..9741b2aa
--- /dev/null
+++ b/Dashboard/Controls/AlertsHistoryContent.xaml.cs
@@ -0,0 +1,446 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using Microsoft.Win32;
+using PerformanceMonitorDashboard.Helpers;
+using PerformanceMonitorDashboard.Models;
+using PerformanceMonitorDashboard.Services;
+
+namespace PerformanceMonitorDashboard.Controls
+{
+    public partial class AlertsHistoryContent : UserControl
+    {
+        private List<AlertHistoryDisplayItem> _allAlerts = new();
+
+        /* Column filter state */
+        private readonly Dictionary<string, ColumnFilterState> _columnFilters = new();
+        private Popup? _filterPopup;
+        private ColumnFilterPopup? _filterPopupContent;
+
+        public AlertsHistoryContent()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// Refreshes the alert history from the in-memory log.
+        /// </summary>
+        public void RefreshAlerts()
+        {
+            LoadAlerts();
+        }
+
+        private void LoadAlerts()
+        {
+            var service = EmailAlertService.Current;
+            if (service == null)
+            {
+                AlertsDataGrid.ItemsSource = null;
+                NoAlertsMessage.Visibility = Visibility.Visible;
+                AlertCountIndicator.Text = "";
+                return;
+            }
+
+            var hoursBack = GetSelectedHoursBack();
+            var entries = service.GetAlertHistory(hoursBack > 0 ? hoursBack : 8760, 500);
+
+            _allAlerts = entries.Select(e => new AlertHistoryDisplayItem
+            {
+                AlertTime = e.AlertTime,
+                ServerName = e.ServerName,
+                MetricName = e.MetricName,
+                CurrentValue = e.CurrentValue,
+                ThresholdValue = e.ThresholdValue,
+                NotificationType = e.NotificationType,
+                StatusDisplay = GetStatusDisplay(e),
+                IsResolved = e.MetricName.Contains("Cleared") || e.MetricName.Contains("Resolved"),
+                IsCritical = e.MetricName.Contains("Deadlock") || e.MetricName.Contains("Poison"),
+                IsWarning = !e.MetricName.Contains("Cleared") && !e.MetricName.Contains("Resolved")
+                            && !e.MetricName.Contains("Deadlock") && !e.MetricName.Contains("Poison")
+            }).ToList();
+
+            ApplyFilters();
+        }
+
+        private void ApplyFilters()
+        {
+            var filtered = _allAlerts.AsEnumerable();
+
+            /* Server filter */
+            if (ServerFilterComboBox.SelectedIndex > 0 &&
+                ServerFilterComboBox.SelectedItem is ComboBoxItem serverItem)
+            {
+                var serverName = serverItem.Content?.ToString();
+                if (!string.IsNullOrEmpty(serverName))
+                    filtered = filtered.Where(a => a.ServerName == serverName);
+            }
+
+            /* Column filters */
+            if (_columnFilters.Count > 0)
+            {
+                filtered = filtered.Where(item =>
+                {
+                    foreach (var filter in _columnFilters.Values)
+                    {
+                        if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
+                            return false;
+                    }
+                    return true;
+                });
+            }
+
+            var list = filtered.ToList();
+            AlertsDataGrid.ItemsSource = list;
+            NoAlertsMessage.Visibility = list.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+            AlertCountIndicator.Text = list.Count > 0 ? $"{list.Count} alert(s)" : "";
+
+            /* Populate server filter if needed */
+            PopulateServerFilter();
+        }
+
+        private void PopulateServerFilter()
+        {
+            var servers = _allAlerts
+                .Select(a => a.ServerName)
+                .Where(s => !string.IsNullOrEmpty(s))
+                .Distinct()
+                .OrderBy(s => s)
+                .ToList();
+
+            var currentSelection = ServerFilterComboBox.SelectedIndex > 0
+                ? (ServerFilterComboBox.SelectedItem as ComboBoxItem)?.Content?.ToString()
+                : null;
+
+            /* Only rebuild if the list changed */
+            var existingServers = ServerFilterComboBox.Items
+                .OfType<ComboBoxItem>()
+                .Skip(1)
+                .Select(i => i.Content?.ToString())
+                .ToList();
+
+            if (servers.SequenceEqual(existingServers)) return;
+
+            ServerFilterComboBox.SelectionChanged -= ServerFilterComboBox_SelectionChanged;
+
+            while (ServerFilterComboBox.Items.Count > 1)
+                ServerFilterComboBox.Items.RemoveAt(1);
+
+            foreach (var server in servers)
+            {
+                ServerFilterComboBox.Items.Add(new ComboBoxItem { Content = server });
+            }
+
+            /* Restore selection */
+            if (currentSelection != null)
+            {
+                for (int i = 1; i < ServerFilterComboBox.Items.Count; i++)
+                {
+                    if ((ServerFilterComboBox.Items[i] as ComboBoxItem)?.Content?.ToString() == currentSelection)
+                    {
+                        ServerFilterComboBox.SelectedIndex = i;
+                        break;
+                    }
+                }
+            }
+
+            ServerFilterComboBox.SelectionChanged += ServerFilterComboBox_SelectionChanged;
+        }
+
+        private int GetSelectedHoursBack()
+        {
+            if (TimeRangeComboBox.SelectedItem is ComboBoxItem item && item.Tag is string tagStr)
+            {
+                return int.TryParse(tagStr, out var hours) ? hours : 24;
+            }
+            return 24;
+        }
+
+        private static string GetStatusDisplay(AlertLogEntry entry)
+        {
+            if (entry.NotificationType == "email")
+            {
+                if (entry.AlertSent) return "Sent";
+                return !string.IsNullOrEmpty(entry.SendError) ? "Failed" : "Not sent";
+            }
+            return entry.AlertSent ? "Delivered" : "Shown";
+        }
+
+        #region Event Handlers
+
+        private void TimeRangeComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (IsLoaded)
+                LoadAlerts();
+        }
+
+        private void ServerFilterComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (IsLoaded)
+                ApplyFilters();
+        }
+
+        private void RefreshButton_Click(object sender, RoutedEventArgs e)
+        {
+            LoadAlerts();
+        }
+
+        private void AlertsDataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            DismissSelectedButton.IsEnabled = AlertsDataGrid.SelectedItems.Count > 0;
+        }
+
+        private void DismissSelected_Click(object sender, RoutedEventArgs e)
+        {
+            var service = EmailAlertService.Current;
+            if (service == null) return;
+
+            var selected = AlertsDataGrid.SelectedItems
+                .OfType<AlertHistoryDisplayItem>()
+                .ToList();
+
+            if (selected.Count == 0) return;
+
+            var keys = selected
+                .Select(s => (s.AlertTime, s.ServerName, s.MetricName))
+                .ToList();
+
+            service.HideAlerts(keys);
+            LoadAlerts();
+        }
+
+        private void DismissAll_Click(object sender, RoutedEventArgs e)
+        {
+            var service = EmailAlertService.Current;
+            if (service == null) return;
+
+            var displayCount = AlertsDataGrid.ItemsSource is ICollection<AlertHistoryDisplayItem> coll ? coll.Count : 0;
+            if (displayCount == 0) return;
+
+            var result = MessageBox.Show(
+                $"Dismiss all {displayCount} visible alert(s)?\n\nDismissed alerts are hidden from this view but preserved in the log.",
+                "Dismiss All Alerts",
+                MessageBoxButton.YesNo,
+                MessageBoxImage.Question);
+
+            if (result != MessageBoxResult.Yes) return;
+
+            var hoursBack = GetSelectedHoursBack();
+            string? serverName = null;
+            if (ServerFilterComboBox.SelectedIndex > 0 &&
+                ServerFilterComboBox.SelectedItem is ComboBoxItem serverItem)
+            {
+                serverName = serverItem.Content?.ToString();
+            }
+
+            service.HideAllAlerts(hoursBack > 0 ? hoursBack : 8760, serverName);
+            LoadAlerts();
+        }
+
+        #endregion
+
+        #region Column Filter Handlers
+
+        private void AlertFilter_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is not Button button || button.Tag is not string columnName) return;
+            ShowFilterPopup(button, columnName);
+        }
+
+        private void ShowFilterPopup(Button button, string columnName)
+        {
+            if (_filterPopup == null)
+            {
+                _filterPopupContent = new ColumnFilterPopup();
+                _filterPopupContent.FilterApplied += FilterPopup_FilterApplied;
+                _filterPopupContent.FilterCleared += FilterPopup_FilterCleared;
+
+                _filterPopup = new Popup
+                {
+                    Child = _filterPopupContent,
+                    StaysOpen = false,
+                    Placement = PlacementMode.Bottom,
+                    AllowsTransparency = true
+                };
+            }
+
+            _columnFilters.TryGetValue(columnName, out var existingFilter);
+            _filterPopupContent!.Initialize(columnName, existingFilter);
+
+            _filterPopup.PlacementTarget = button;
+            _filterPopup.IsOpen = true;
+        }
+
+        private void FilterPopup_FilterApplied(object? sender, FilterAppliedEventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+
+            if (e.FilterState.IsActive)
+                _columnFilters[e.FilterState.ColumnName] = e.FilterState;
+            else
+                _columnFilters.Remove(e.FilterState.ColumnName);
+
+            ApplyFilters();
+            UpdateFilterButtonStyles();
+        }
+
+        private void FilterPopup_FilterCleared(object? sender, EventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+        }
+
+        private void UpdateFilterButtonStyles()
+        {
+            foreach (var column in AlertsDataGrid.Columns)
+            {
+                if (column.Header is StackPanel stackPanel)
+                {
+                    var filterButton = stackPanel.Children.OfType<Button>().FirstOrDefault();
+                    if (filterButton?.Tag is string columnName)
+                    {
+                        bool hasActive = _columnFilters.TryGetValue(columnName, out var filter) && filter.IsActive;
+
+                        var textBlock = new System.Windows.Controls.TextBlock
+                        {
+                            Text = "\uE71C",
+                            FontFamily = new System.Windows.Media.FontFamily("Segoe MDL2 Assets"),
+                            Foreground = hasActive
+                                ? new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0xFF, 0xD7, 0x00))
+                                : new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0xFF, 0xFF, 0xFF))
+                        };
+                        filterButton.Content = textBlock;
+                        filterButton.ToolTip = hasActive && filter != null
+                            ? $"Filter: {filter.DisplayText}\n(Click to modify)"
+                            : "Click to filter";
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Context Menu Handlers
+
+        private void CopyCell_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.CurrentCell.Item != null)
+                {
+                    var cellContent = TabHelpers.GetCellContent(dataGrid, dataGrid.CurrentCell);
+                    if (!string.IsNullOrEmpty(cellContent))
+                        Clipboard.SetDataObject(cellContent, false);
+                }
+            }
+        }
+
+        private void CopyRow_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid?.SelectedItem != null)
+                    Clipboard.SetDataObject(TabHelpers.GetRowAsText(dataGrid, dataGrid.SelectedItem), false);
+            }
+        }
+
+        private void CopyAllRows_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var sb = new StringBuilder();
+                    var headers = dataGrid.Columns
+                        .OfType<DataGridBoundColumn>()
+                        .Select(c => TabHelpers.GetColumnHeader(c))
+                        .ToList();
+                    sb.AppendLine(string.Join("\t", headers));
+
+                    foreach (var item in dataGrid.Items)
+                        sb.AppendLine(TabHelpers.GetRowAsText(dataGrid, item));
+
+                    Clipboard.SetDataObject(sb.ToString(), false);
+                }
+            }
+        }
+
+        private void ExportToCsv_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var saveFileDialog = new SaveFileDialog
+                    {
+                        FileName = $"alert_history_{DateTime.Now:yyyyMMdd_HHmmss}.csv",
+                        DefaultExt = ".csv",
+                        Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*"
+                    };
+
+                    if (saveFileDialog.ShowDialog() == true)
+                    {
+                        try
+                        {
+                            var sb = new StringBuilder();
+                            var headers = dataGrid.Columns
+                                .OfType<DataGridBoundColumn>()
+                                .Select(c => TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(c)))
+                                .ToList();
+                            sb.AppendLine(string.Join(",", headers));
+
+                            foreach (var item in dataGrid.Items)
+                            {
+                                var values = TabHelpers.GetRowValues(dataGrid, item);
+                                sb.AppendLine(string.Join(",", values.Select(v => TabHelpers.EscapeCsvField(v))));
+                            }
+
+                            File.WriteAllText(saveFileDialog.FileName, sb.ToString());
+                            MessageBox.Show($"Data exported successfully to:\n{saveFileDialog.FileName}",
+                                "Export Complete", MessageBoxButton.OK, MessageBoxImage.Information);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show($"Error exporting data:\n\n{ex.Message}",
+                                "Export Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
+
+    public class AlertHistoryDisplayItem
+    {
+        public DateTime AlertTime { get; set; }
+        public string TimeLocal => AlertTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss");
+        public string ServerName { get; set; } = "";
+        public string MetricName { get; set; } = "";
+        public string CurrentValue { get; set; } = "";
+        public string ThresholdValue { get; set; } = "";
+        public string NotificationType { get; set; } = "";
+        public string StatusDisplay { get; set; } = "";
+        public bool IsResolved { get; set; }
+        public bool IsCritical { get; set; }
+        public bool IsWarning { get; set; }
+    }
+}
diff --git a/Dashboard/MainWindow.xaml b/Dashboard/MainWindow.xaml
index a5a1eb81..c285a568 100644
--- a/Dashboard/MainWindow.xaml
+++ b/Dashboard/MainWindow.xaml
@@ -146,6 +146,12 @@
                             Style="{StaticResource AccentButton}"
                             Height="32"
                             Margin="0,0,0,8"/>
+                    <Button x:Name="AlertsHistoryButton"
+                            Content="Alerts"
+                            Click="AlertsHistory_Click"
+                            Style="{StaticResource AccentButton}"
+                            Height="32"
+                            Margin="0,0,0,8"/>
                     <Separator Margin="0,0,0,8"/>
                     <Button x:Name="RefreshAllButton"
                             Content="&#x21BB; Refresh All Status"
diff --git a/Dashboard/MainWindow.xaml.cs b/Dashboard/MainWindow.xaml.cs
index 10986daa..3cd34e2f 100644
--- a/Dashboard/MainWindow.xaml.cs
+++ b/Dashboard/MainWindow.xaml.cs
@@ -44,6 +44,8 @@ public partial class MainWindow : Window
         private bool _isReallyClosing = false;
         private TabItem? _nocTab;
         private LandingPage? _landingPage;
+        private TabItem? _alertsTab;
+        private AlertsHistoryContent? _alertsHistoryContent;
         private McpHostService? _mcpHostService;
         private CancellationTokenSource? _mcpCts;
 
@@ -58,11 +60,20 @@ public partial class MainWindow : Window
         private readonly ConcurrentDictionary<string, bool> _activeBlockingAlert = new();
         private readonly ConcurrentDictionary<string, bool> _activeDeadlockAlert = new();
         private readonly ConcurrentDictionary<string, bool> _activeHighCpuAlert = new();
+        private readonly ConcurrentDictionary<string, DateTime> _lastPoisonWaitAlert = new();
+        private readonly ConcurrentDictionary<string, bool> _activePoisonWaitAlert = new();
+        private readonly ConcurrentDictionary<string, DateTime> _lastLongRunningQueryAlert = new();
+        private readonly ConcurrentDictionary<string, bool> _activeLongRunningQueryAlert = new();
+        private readonly ConcurrentDictionary<string, DateTime> _lastTempDbSpaceAlert = new();
+        private readonly ConcurrentDictionary<string, bool> _activeTempDbSpaceAlert = new();
+        private readonly ConcurrentDictionary<string, DateTime> _lastLongRunningJobAlert = new();
+        private readonly ConcurrentDictionary<string, bool> _activeLongRunningJobAlert = new();
         private readonly ConcurrentDictionary<string, long> _previousDeadlockCounts = new();
 
         private const double ExpandedWidth = 250;
         private const double CollapsedWidth = 52;
         private const string NocTabId = "__NOC_OVERVIEW__";
+        private const string AlertsTabId = "__ALERTS_HISTORY__";
 
         public MainWindow()
         {
@@ -129,6 +140,8 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
             LoadServerList();
             InitializeNotificationService();
             OpenNocTab();
+            OpenAlertsTab();
+            ServerTabControl.SelectedItem = _nocTab; /* Keep Overview as the active tab */
             LoadSidebarState();
             ConfigureConnectionStatusTimer();
             ConfigureAlertCheckTimer();
@@ -228,6 +241,9 @@ private void MainWindow_Closing(object? sender, System.ComponentModel.CancelEven
                 }
             }
 
+            // Save alert history to disk
+            _emailAlertService?.SaveAlertLog();
+
             // Clean up notification service
             _notificationService?.Dispose();
         }
@@ -569,6 +585,53 @@ private void NocOverview_Click(object sender, RoutedEventArgs e)
             OpenNocTab();
         }
 
+        private void AlertsHistory_Click(object sender, RoutedEventArgs e)
+        {
+            OpenAlertsTab();
+        }
+
+        private void OpenAlertsTab()
+        {
+            if (_alertsTab != null && ServerTabControl.Items.Contains(_alertsTab))
+            {
+                ServerTabControl.SelectedItem = _alertsTab;
+                _alertsHistoryContent?.RefreshAlerts();
+                return;
+            }
+
+            _alertsHistoryContent = new AlertsHistoryContent();
+
+            var headerPanel = new StackPanel { Orientation = Orientation.Horizontal };
+            var headerText = new TextBlock
+            {
+                Text = "Alert History",
+                VerticalAlignment = VerticalAlignment.Center,
+                FontWeight = FontWeights.SemiBold
+            };
+            var closeButton = new Button
+            {
+                Style = (Style)FindResource("TabCloseButton"),
+                Tag = AlertsTabId
+            };
+            closeButton.Click += CloseTab_Click;
+            headerPanel.Children.Add(headerText);
+            headerPanel.Children.Add(closeButton);
+
+            _alertsTab = new TabItem
+            {
+                Header = headerPanel,
+                Content = _alertsHistoryContent,
+                Tag = AlertsTabId
+            };
+
+            /* Insert after NOC tab if present, otherwise at position 0 */
+            var insertIndex = _nocTab != null && ServerTabControl.Items.Contains(_nocTab) ? 1 : 0;
+            ServerTabControl.Items.Insert(insertIndex, _alertsTab);
+            ServerTabControl.SelectedItem = _alertsTab;
+
+            _alertsHistoryContent.RefreshAlerts();
+        }
+
         private void CloseTab_Click(object sender, RoutedEventArgs e)
         {
             if (sender is Button button && button.Tag is string tabId)
@@ -583,6 +646,15 @@ private void CloseTab_Click(object sender, RoutedEventArgs e)
                         _landingPage = null;
                     }
                 }
+                else if (tabId == AlertsTabId)
+                {
+                    if (_alertsTab != null)
+                    {
+                        ServerTabControl.Items.Remove(_alertsTab);
+                        _alertsTab = null;
+                        _alertsHistoryContent = null;
+                    }
+                }
                 else if (_openTabs.TryGetValue(tabId, out var tabToClose))
                 {
                     _openTabs.Remove(tabId);
@@ -826,6 +898,38 @@ public void UpdateAllTabBadges(Dictionary<string, ServerHealthStatus> healthData
             }
         }
 
+        /// <summary>
+        /// Updates a server tab badge from AlertHealthResult (used by the alert engine).
+        /// Constructs a minimal ServerHealthStatus for the badge evaluation.
+        /// </summary>
+        private void UpdateTabBadgeFromAlertHealth(string serverId, AlertHealthResult health)
+        {
+            if (!_tabBadges.ContainsKey(serverId)) return;
+
+            /* Build a minimal ServerHealthStatus with the fields ShouldShowBadge needs */
+            var server = _serverManager.GetAllServers().FirstOrDefault(s => s.Id == serverId);
+            if (server == null) return;
+
+            var status = new ServerHealthStatus(server)
+            {
+                IsOnline = health.IsOnline,
+                CpuPercent = health.CpuPercent,
+                OtherCpuPercent = health.OtherCpuPercent,
+                LongestBlockedSeconds = health.LongestBlockedSeconds,
+                TotalBlocked = health.TotalBlocked
+            };
+
+            /* Set deadlock count twice to generate a delta.
+               First set establishes baseline (delta=0), second set creates actual delta. */
+            if (_previousDeadlockCounts.TryGetValue(serverId, out var prevDlCount))
+            {
+                status.DeadlockCount = prevDlCount;
+                status.DeadlockCount = health.DeadlockCount;
+            }
+
+            UpdateTabBadge(serverId, status);
+        }
+
         #region Independent Alert Engine
 
         private void ConfigureAlertCheckTimer()
@@ -850,6 +954,9 @@ private void ConfigureAlertCheckTimer()
         private async void AlertCheckTimer_Tick(object? sender, EventArgs e)
         {
             await CheckAllServerAlertsAsync();
+
+            /* Auto-refresh alert history if the tab is open */
+            _alertsHistoryContent?.RefreshAlerts();
         }
 
         /// <summary>
@@ -871,11 +978,15 @@ private async Task CheckAllServerAlertsAsync()
                     var connectionString = server.GetConnectionString(_credentialService);
                     var databaseService = new DatabaseService(connectionString);
                     var connStatus = _serverManager.GetConnectionStatus(server.Id);
-                    var health = await databaseService.GetAlertHealthAsync(connStatus.SqlEngineEdition);
+                    var health = await databaseService.GetAlertHealthAsync(connStatus.SqlEngineEdition, prefs.LongRunningQueryThresholdMinutes, prefs.LongRunningJobMultiplier);
 
                     if (health.IsOnline)
                     {
                         await EvaluateAlertConditionsAsync(server.Id, server.DisplayName, health, databaseService);
+
+                        /* Update tab badges from alert health data.
+                           This ensures badges update even when the NOC view isn't active. */
+                        await Dispatcher.InvokeAsync(() => UpdateTabBadgeFromAlertHealth(server.Id, health));
                     }
                 }
                 catch (Exception ex)
@@ -1022,6 +1133,161 @@ await _emailAlertService.TrySendAlertEmailAsync(
                 _emailAlertService.RecordAlert(serverId, serverName, "CPU Resolved",
                     cpuText, $"{prefs.CpuThresholdPercent}%", true, "tray");
             }
+
+            /* Poison wait alerts */
+            var triggeredWaits = prefs.NotifyOnPoisonWaits
+                ? health.PoisonWaits.FindAll(w => w.AvgMsPerWait >= prefs.PoisonWaitThresholdMs)
+                : new List<PoisonWaitDelta>();
+
+            if (triggeredWaits.Count > 0)
+            {
+                _activePoisonWaitAlert[serverId] = true;
+                if (!_lastPoisonWaitAlert.TryGetValue(serverId, out var lastAlert) || (now - lastAlert) >= AlertCooldown)
+                {
+                    var worst = triggeredWaits[0];
+                    _notificationService?.ShowPoisonWaitNotification(serverName, worst.WaitType, worst.AvgMsPerWait);
+                    _lastPoisonWaitAlert[serverId] = now;
+
+                    var allWaitNames = string.Join(", ", triggeredWaits.ConvertAll(w => $"{w.WaitType} ({w.AvgMsPerWait:F0}ms)"));
+                    _emailAlertService.RecordAlert(serverId, serverName, "Poison Wait",
+                        allWaitNames,
+                        $"{prefs.PoisonWaitThresholdMs}ms avg", true, "tray");
+
+                    var poisonContext = BuildPoisonWaitContext(triggeredWaits);
+
+                    await _emailAlertService.TrySendAlertEmailAsync(
+                        "Poison Wait",
+                        serverName,
+                        allWaitNames,
+                        $"{prefs.PoisonWaitThresholdMs}ms avg",
+                        serverId,
+                        poisonContext);
+                }
+            }
+            else if (_activePoisonWaitAlert.TryRemove(serverId, out var wasPoisonWait) && wasPoisonWait)
+            {
+                _notificationService?.ShowNotification("Poison Waits Cleared",
+                    $"{serverName}: Poison wait avg below threshold");
+                _emailAlertService.RecordAlert(serverId, serverName, "Poison Waits Cleared",
+                    "0", $"{prefs.PoisonWaitThresholdMs}ms avg", true, "tray");
+            }
+
+            /* Long-running query alerts */
+            bool longRunningTriggered = prefs.NotifyOnLongRunningQueries
+                && health.LongRunningQueries.Count > 0;
+
+            if (longRunningTriggered)
+            {
+                _activeLongRunningQueryAlert[serverId] = true;
+                if (!_lastLongRunningQueryAlert.TryGetValue(serverId, out var lastAlert) || (now - lastAlert) >= AlertCooldown)
+                {
+                    var worst = health.LongRunningQueries[0];
+                    var elapsedMinutes = worst.ElapsedSeconds / 60;
+                    var preview = Truncate(worst.QueryText, 80);
+                    _notificationService?.ShowLongRunningQueryNotification(
+                        serverName, worst.SessionId, elapsedMinutes, preview);
+                    _lastLongRunningQueryAlert[serverId] = now;
+
+                    _emailAlertService.RecordAlert(serverId, serverName, "Long-Running Query",
+                        $"Session #{worst.SessionId} running {elapsedMinutes}m",
+                        $"{prefs.LongRunningQueryThresholdMinutes}m", true, "tray");
+
+                    var lrqContext = BuildLongRunningQueryContext(health.LongRunningQueries);
+
+                    await _emailAlertService.TrySendAlertEmailAsync(
+                        "Long-Running Query",
+                        serverName,
+                        $"{health.LongRunningQueries.Count} query(s), longest {elapsedMinutes}m",
+                        $"{prefs.LongRunningQueryThresholdMinutes}m",
+                        serverId,
+                        lrqContext);
+                }
+            }
+            else if (_activeLongRunningQueryAlert.TryRemove(serverId, out var wasLongRunning) && wasLongRunning)
+            {
+                _notificationService?.ShowNotification("Long-Running Queries Cleared",
+                    $"{serverName}: No queries over threshold");
+                _emailAlertService.RecordAlert(serverId, serverName, "Long-Running Queries Cleared",
+                    "0", $"{prefs.LongRunningQueryThresholdMinutes}m", true, "tray");
+            }
+
+            /* TempDB space alerts */
+            bool tempDbExceeded = prefs.NotifyOnTempDbSpace
+                && health.TempDbSpace != null
+                && health.TempDbSpace.UsedPercent >= prefs.TempDbSpaceThresholdPercent;
+
+            if (tempDbExceeded)
+            {
+                var tempDb = health.TempDbSpace!;
+                _activeTempDbSpaceAlert[serverId] = true;
+                if (!_lastTempDbSpaceAlert.TryGetValue(serverId, out var lastAlert) || (now - lastAlert) >= AlertCooldown)
+                {
+                    _notificationService?.ShowTempDbSpaceNotification(serverName, tempDb.UsedPercent);
+                    _lastTempDbSpaceAlert[serverId] = now;
+
+                    _emailAlertService.RecordAlert(serverId, serverName, "TempDB Space",
+                        $"{tempDb.UsedPercent:F0}% used ({tempDb.TotalReservedMb:F0} MB)",
+                        $"{prefs.TempDbSpaceThresholdPercent}%", true, "tray");
+
+                    var tempDbContext = BuildTempDbSpaceContext(tempDb);
+
+                    await _emailAlertService.TrySendAlertEmailAsync(
+                        "TempDB Space",
+                        serverName,
+                        $"{tempDb.UsedPercent:F0}% used ({tempDb.TotalReservedMb:F0} MB)",
+                        $"{prefs.TempDbSpaceThresholdPercent}%",
+                        serverId,
+                        tempDbContext);
+                }
+            }
+            else if (_activeTempDbSpaceAlert.TryRemove(serverId, out var wasTempDb) && wasTempDb)
+            {
+                var pct = health.TempDbSpace != null ? $"{health.TempDbSpace.UsedPercent:F0}%" : "N/A";
+                _notificationService?.ShowNotification("TempDB Space Resolved",
+                    $"{serverName}: TempDB usage back to {pct}");
+                _emailAlertService.RecordAlert(serverId, serverName, "TempDB Space Resolved",
+                    pct, $"{prefs.TempDbSpaceThresholdPercent}%", true, "tray");
+            }
+
+            /* Anomalous Agent job alerts */
+            bool anomalousJobsTriggered = prefs.NotifyOnLongRunningJobs
+                && health.AnomalousJobs.Count > 0;
+
+            if (anomalousJobsTriggered)
+            {
+                _activeLongRunningJobAlert[serverId] = true;
+                var worst = health.AnomalousJobs[0];
+                var jobKey = $"{serverId}:{worst.JobId}:{worst.StartTime:O}";
+
+                if (!_lastLongRunningJobAlert.TryGetValue(jobKey, out var lastAlert) || (now - lastAlert) >= AlertCooldown)
+                {
+                    var currentMinutes = worst.CurrentDurationSeconds / 60;
+                    _notificationService?.ShowLongRunningJobNotification(
+                        serverName, worst.JobName, currentMinutes, worst.PercentOfAverage ?? 0);
+                    _lastLongRunningJobAlert[jobKey] = now;
+
+                    _emailAlertService.RecordAlert(serverId, serverName, "Long-Running Job",
+                        $"{worst.JobName} at {worst.PercentOfAverage:F0}% of avg ({currentMinutes}m)",
+                        $"{prefs.LongRunningJobMultiplier}x avg", true, "tray");
+
+                    var jobContext = BuildAnomalousJobContext(health.AnomalousJobs);
+
+                    await _emailAlertService.TrySendAlertEmailAsync(
+                        "Long-Running Job",
+                        serverName,
+                        $"{health.AnomalousJobs.Count} job(s) exceeding {prefs.LongRunningJobMultiplier}x average",
+                        $"{prefs.LongRunningJobMultiplier}x historical avg",
+                        serverId,
+                        jobContext);
+                }
+            }
+            else if (_activeLongRunningJobAlert.TryRemove(serverId, out var wasJob) && wasJob)
+            {
+                _notificationService?.ShowNotification("Long-Running Jobs Cleared",
+                    $"{serverName}: No jobs exceeding threshold");
+                _emailAlertService.RecordAlert(serverId, serverName, "Long-Running Jobs Cleared",
+                    "0", $"{prefs.LongRunningJobMultiplier}x avg", true, "tray");
+            }
         }
 
         private static string Truncate(string text, int maxLength = 300)
@@ -1139,6 +1405,110 @@ private static string Truncate(string text, int maxLength = 300)
             }
         }
 
+        private static AlertContext? BuildPoisonWaitContext(List<PoisonWaitDelta> triggeredWaits)
+        {
+            if (triggeredWaits.Count == 0) return null;
+
+            var context = new AlertContext();
+            foreach (var w in triggeredWaits)
+            {
+                context.Details.Add(new AlertDetailItem
+                {
+                    Heading = w.WaitType,
+                    Fields = new()
+                    {
+                        ("Avg ms/wait", $"{w.AvgMsPerWait:F1}"),
+                        ("Delta wait ms", $"{w.DeltaMs:N0}"),
+                        ("Delta tasks", $"{w.DeltaTasks:N0}")
+                    }
+                });
+            }
+            return context;
+        }
+
+        private static AlertContext? BuildLongRunningQueryContext(List<LongRunningQueryInfo> queries)
+        {
+            if (queries.Count == 0) return null;
+
+            var context = new AlertContext();
+            foreach (var q in queries.GetRange(0, Math.Min(3, queries.Count)))
+            {
+                var item = new AlertDetailItem
+                {
+                    Heading = $"Session #{q.SessionId} — {q.ElapsedSeconds / 60}m {q.ElapsedSeconds % 60}s",
+                    Fields = new()
+                };
+
+                if (!string.IsNullOrEmpty(q.DatabaseName))
+                    item.Fields.Add(("Database", q.DatabaseName));
+                if (!string.IsNullOrEmpty(q.ProgramName))
+                    item.Fields.Add(("Program", q.ProgramName));
+                if (!string.IsNullOrEmpty(q.QueryText))
+                    item.Fields.Add(("Query", Truncate(q.QueryText)));
+                item.Fields.Add(("CPU Time", $"{q.CpuTimeMs:N0} ms"));
+                item.Fields.Add(("Reads", $"{q.Reads:N0}"));
+                item.Fields.Add(("Writes", $"{q.Writes:N0}"));
+                if (!string.IsNullOrEmpty(q.WaitType))
+                    item.Fields.Add(("Wait Type", q.WaitType));
+                if (q.BlockingSessionId.HasValue && q.BlockingSessionId.Value > 0)
+                    item.Fields.Add(("Blocked By", $"Session #{q.BlockingSessionId.Value}"));
+
+                context.Details.Add(item);
+            }
+            return context;
+        }
+
+        private static AlertContext? BuildAnomalousJobContext(List<AnomalousJobInfo> jobs)
+        {
+            if (jobs.Count == 0) return null;
+
+            var context = new AlertContext();
+            foreach (var j in jobs.GetRange(0, Math.Min(3, jobs.Count)))
+            {
+                context.Details.Add(new AlertDetailItem
+                {
+                    Heading = j.JobName,
+                    Fields = new()
+                    {
+                        ("Current Duration", FormatDuration(j.CurrentDurationSeconds)),
+                        ("Avg Duration", FormatDuration(j.AvgDurationSeconds)),
+                        ("P95 Duration", FormatDuration(j.P95DurationSeconds)),
+                        ("% of Average", j.PercentOfAverage.HasValue ? $"{j.PercentOfAverage:F0}%" : "N/A"),
+                        ("Started", j.StartTime.ToString("yyyy-MM-dd HH:mm:ss"))
+                    }
+                });
+            }
+            return context;
+        }
+
+        private static string FormatDuration(long seconds)
+        {
+            if (seconds < 60) return $"{seconds}s";
+            if (seconds < 3600) return $"{seconds / 60}m {seconds % 60}s";
+            return $"{seconds / 3600}h {(seconds % 3600) / 60}m";
+        }
+
+        private static AlertContext? BuildTempDbSpaceContext(TempDbSpaceInfo tempDb)
+        {
+            var context = new AlertContext();
+            context.Details.Add(new AlertDetailItem
+            {
+                Heading = $"TempDB — {tempDb.UsedPercent:F0}% Used",
+                Fields = new()
+                {
+                    ("Total Reserved", $"{tempDb.TotalReservedMb:F0} MB"),
+                    ("Unallocated", $"{tempDb.UnallocatedMb:F0} MB"),
+                    ("User Objects", $"{tempDb.UserObjectReservedMb:F0} MB"),
+                    ("Internal Objects", $"{tempDb.InternalObjectReservedMb:F0} MB"),
+                    ("Version Store", $"{tempDb.VersionStoreReservedMb:F0} MB"),
+                    ("Top Consumer", tempDb.TopConsumerSessionId > 0
+                        ? $"Session #{tempDb.TopConsumerSessionId} ({tempDb.TopConsumerMb:F0} MB)"
+                        : "None")
+                }
+            });
+            return context;
+        }
+
         #endregion
 
         #region Alert Suppression Context Menu Handlers
diff --git a/Dashboard/Models/AlertHealthResult.cs b/Dashboard/Models/AlertHealthResult.cs
index 312507ea..e51f232f 100644
--- a/Dashboard/Models/AlertHealthResult.cs
+++ b/Dashboard/Models/AlertHealthResult.cs
@@ -6,11 +6,13 @@
  * Licensed under the MIT License. See LICENSE file in the project root for full license information.
  */
 
+using System.Collections.Generic;
+
 namespace PerformanceMonitorDashboard.Models
 {
     /// <summary>
     /// Lightweight result from alert-only health queries.
-    /// Contains only the 3 metrics needed for alert evaluation (CPU, blocking, deadlocks).
+    /// Contains only the metrics needed for alert evaluation (CPU, blocking, deadlocks, poison waits).
     /// Used by MainWindow's independent alert timer to avoid running all 9 NOC queries.
     /// </summary>
     public class AlertHealthResult
@@ -20,6 +22,10 @@ public class AlertHealthResult
         public long TotalBlocked { get; set; }
         public decimal LongestBlockedSeconds { get; set; }
         public long DeadlockCount { get; set; }
+        public List<PoisonWaitDelta> PoisonWaits { get; set; } = new();
+        public List<LongRunningQueryInfo> LongRunningQueries { get; set; } = new();
+        public TempDbSpaceInfo? TempDbSpace { get; set; }
+        public List<AnomalousJobInfo> AnomalousJobs { get; set; } = new();
         public bool IsOnline { get; set; } = true;
 
         /// <summary>
diff --git a/Dashboard/Models/AnomalousJobInfo.cs b/Dashboard/Models/AnomalousJobInfo.cs
new file mode 100644
index 00000000..d6796674
--- /dev/null
+++ b/Dashboard/Models/AnomalousJobInfo.cs
@@ -0,0 +1,21 @@
+/*
+ * Performance Monitor Dashboard
+ * Copyright (c) 2026 Darling Data, LLC
+ * Licensed under the MIT License - see LICENSE file for details
+ */
+
+using System;
+
+namespace PerformanceMonitorDashboard.Models
+{
+    public class AnomalousJobInfo
+    {
+        public string JobName { get; set; } = "";
+        public string JobId { get; set; } = "";
+        public long CurrentDurationSeconds { get; set; }
+        public long AvgDurationSeconds { get; set; }
+        public long P95DurationSeconds { get; set; }
+        public decimal? PercentOfAverage { get; set; }
+        public DateTime StartTime { get; set; }
+    }
+}
diff --git a/Dashboard/Models/LongRunningQueryInfo.cs b/Dashboard/Models/LongRunningQueryInfo.cs
new file mode 100644
index 00000000..68c55fb1
--- /dev/null
+++ b/Dashboard/Models/LongRunningQueryInfo.cs
@@ -0,0 +1,22 @@
+/*
+ * Performance Monitor Dashboard
+ * Copyright (c) 2026 Darling Data, LLC
+ * Licensed under the MIT License - see LICENSE file for details
+ */
+
+namespace PerformanceMonitorDashboard.Models
+{
+    public class LongRunningQueryInfo
+    {
+        public int SessionId { get; set; }
+        public string DatabaseName { get; set; } = "";
+        public string QueryText { get; set; } = "";
+        public string ProgramName { get; set; } = "";
+        public long ElapsedSeconds { get; set; }
+        public long CpuTimeMs { get; set; }
+        public long Reads { get; set; }
+        public long Writes { get; set; }
+        public string? WaitType { get; set; }
+        public int? BlockingSessionId { get; set; }
+    }
+}
diff --git a/Dashboard/Models/PoisonWaitDelta.cs b/Dashboard/Models/PoisonWaitDelta.cs
new file mode 100644
index 00000000..1da38168
--- /dev/null
+++ b/Dashboard/Models/PoisonWaitDelta.cs
@@ -0,0 +1,16 @@
+/*
+ * Performance Monitor Dashboard
+ * Copyright (c) 2026 Darling Data, LLC
+ * Licensed under the MIT License - see LICENSE file for details
+ */
+
+namespace PerformanceMonitorDashboard.Models
+{
+    public class PoisonWaitDelta
+    {
+        public string WaitType { get; set; } = "";
+        public long DeltaMs { get; set; }
+        public long DeltaTasks { get; set; }
+        public double AvgMsPerWait { get; set; }
+    }
+}
diff --git a/Dashboard/Models/TempDbSpaceInfo.cs b/Dashboard/Models/TempDbSpaceInfo.cs
new file mode 100644
index 00000000..216044b3
--- /dev/null
+++ b/Dashboard/Models/TempDbSpaceInfo.cs
@@ -0,0 +1,23 @@
+/*
+ * Performance Monitor Dashboard
+ * Copyright (c) 2026 Darling Data, LLC
+ * Licensed under the MIT License - see LICENSE file for details
+ */
+
+namespace PerformanceMonitorDashboard.Models
+{
+    public class TempDbSpaceInfo
+    {
+        public double TotalReservedMb { get; set; }
+        public double UnallocatedMb { get; set; }
+        public double UserObjectReservedMb { get; set; }
+        public double InternalObjectReservedMb { get; set; }
+        public double VersionStoreReservedMb { get; set; }
+        public int TopConsumerSessionId { get; set; }
+        public double TopConsumerMb { get; set; }
+
+        public double UsedPercent => TotalReservedMb + UnallocatedMb > 0
+            ? TotalReservedMb / (TotalReservedMb + UnallocatedMb) * 100
+            : 0;
+    }
+}
diff --git a/Dashboard/Models/UserPreferences.cs b/Dashboard/Models/UserPreferences.cs
index 58f8723d..07f874fe 100644
--- a/Dashboard/Models/UserPreferences.cs
+++ b/Dashboard/Models/UserPreferences.cs
@@ -78,6 +78,14 @@ public class UserPreferences
         public int DeadlockThreshold { get; set; } = 1; // Alert when deadlocks >= X since last check
         public bool NotifyOnHighCpu { get; set; } = true;
         public int CpuThresholdPercent { get; set; } = 90; // Alert when CPU > X%
+        public bool NotifyOnPoisonWaits { get; set; } = true;
+        public int PoisonWaitThresholdMs { get; set; } = 500; // Alert when avg ms per wait > X
+        public bool NotifyOnLongRunningQueries { get; set; } = true;
+        public int LongRunningQueryThresholdMinutes { get; set; } = 30; // Alert when query runs > X minutes
+        public bool NotifyOnTempDbSpace { get; set; } = true;
+        public int TempDbSpaceThresholdPercent { get; set; } = 80; // Alert when TempDB used > X%
+        public bool NotifyOnLongRunningJobs { get; set; } = true;
+        public int LongRunningJobMultiplier { get; set; } = 3; // Alert when job runs > Nx historical average
 
         // SMTP email alert settings
         public bool SmtpEnabled { get; set; } = false;
diff --git a/Dashboard/Services/DatabaseService.NocHealth.cs b/Dashboard/Services/DatabaseService.NocHealth.cs
index 5cb57cc0..f678a3c3 100644
--- a/Dashboard/Services/DatabaseService.NocHealth.cs
+++ b/Dashboard/Services/DatabaseService.NocHealth.cs
@@ -7,6 +7,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient;
 using PerformanceMonitorDashboard.Helpers;
@@ -119,7 +120,7 @@ public async Task RefreshNocHealthStatusAsync(ServerHealthStatus status, int eng
         /// Lightweight alert-only health check. Runs 3 queries instead of 9.
         /// Used by MainWindow's independent alert timer.
         /// </summary>
-        public async Task<AlertHealthResult> GetAlertHealthAsync(int engineEdition = 0)
+        public async Task<AlertHealthResult> GetAlertHealthAsync(int engineEdition = 0, int longRunningQueryThresholdMinutes = 30, int longRunningJobMultiplier = 3)
         {
             var result = new AlertHealthResult();
 
@@ -133,8 +134,12 @@ public async Task<AlertHealthResult> GetAlertHealthAsync(int engineEdition = 0)
                 var cpuTask = GetCpuPercentAsync(connection, engineEdition);
                 var blockingTask = GetBlockingValuesAsync(connection);
                 var deadlockTask = GetDeadlockCountAsync(connection);
+                var poisonWaitTask = GetPoisonWaitDeltasAsync(connection);
+                var longRunningTask = GetLongRunningQueriesAsync(connection, longRunningQueryThresholdMinutes);
+                var tempDbTask = GetTempDbSpaceAsync(connection);
+                var anomalousJobTask = GetAnomalousJobsAsync(connection, longRunningJobMultiplier);
 
-                await Task.WhenAll(cpuTask, blockingTask, deadlockTask);
+                await Task.WhenAll(cpuTask, blockingTask, deadlockTask, poisonWaitTask, longRunningTask, tempDbTask, anomalousJobTask);
 
                 var cpuResult = await cpuTask;
                 result.CpuPercent = cpuResult.SqlCpu;
@@ -145,6 +150,10 @@ public async Task<AlertHealthResult> GetAlertHealthAsync(int engineEdition = 0)
                 result.LongestBlockedSeconds = blockingResult.LongestBlockedSeconds;
 
                 result.DeadlockCount = await deadlockTask;
+                result.PoisonWaits = await poisonWaitTask;
+                result.LongRunningQueries = await longRunningTask;
+                result.TempDbSpace = await tempDbTask;
+                result.AnomalousJobs = await anomalousJobTask;
             }
             catch (Exception ex)
             {
@@ -538,5 +547,211 @@ dx.id DESC
                 Logger.Warning($"Failed to get last deadlock event time: {ex.Message}");
             }
         }
+
+        /// <summary>
+        /// Gets recent poison wait deltas (THREADPOOL, RESOURCE_SEMAPHORE, RESOURCE_SEMAPHORE_QUERY_COMPILE)
+        /// from collected wait stats. Returns entries where avg ms per wait exceeds zero.
+        /// </summary>
+        private async Task<List<PoisonWaitDelta>> GetPoisonWaitDeltasAsync(SqlConnection connection)
+        {
+            const string query = @"SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+                SELECT TOP (3)
+                    wait_type,
+                    wait_time_ms_delta,
+                    waiting_tasks_count_delta,
+                    avg_ms_per_wait =
+                        CASE WHEN waiting_tasks_count_delta > 0
+                        THEN CAST(wait_time_ms_delta AS decimal(19, 2)) / waiting_tasks_count_delta
+                        ELSE 0 END
+                FROM collect.wait_stats
+                WHERE wait_type IN (N'THREADPOOL', N'RESOURCE_SEMAPHORE', N'RESOURCE_SEMAPHORE_QUERY_COMPILE')
+                AND waiting_tasks_count_delta > 0
+                AND collection_time >= DATEADD(MINUTE, -10, SYSDATETIME())
+                ORDER BY collection_time DESC
+                OPTION(MAXDOP 1, RECOMPILE);";
+
+            var results = new List<PoisonWaitDelta>();
+
+            try
+            {
+                using var cmd = new SqlCommand(query, connection);
+                cmd.CommandTimeout = 10;
+                using var reader = await cmd.ExecuteReaderAsync();
+
+                while (await reader.ReadAsync())
+                {
+                    results.Add(new PoisonWaitDelta
+                    {
+                        WaitType = reader.GetString(0),
+                        DeltaMs = Convert.ToInt64(reader.GetValue(1), System.Globalization.CultureInfo.InvariantCulture),
+                        DeltaTasks = Convert.ToInt64(reader.GetValue(2), System.Globalization.CultureInfo.InvariantCulture),
+                        AvgMsPerWait = Convert.ToDouble(reader.GetValue(3), System.Globalization.CultureInfo.InvariantCulture)
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Warning($"Failed to get poison wait deltas: {ex.Message}");
+            }
+
+            return results;
+        }
+
+        /// <summary>
+        /// Gets currently running queries that exceed the duration threshold.
+        /// Uses live DMV data (sys.dm_exec_requests) for immediate detection.
+        /// </summary>
+        private async Task<List<LongRunningQueryInfo>> GetLongRunningQueriesAsync(SqlConnection connection, int thresholdMinutes)
+        {
+            const string query = @"SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+                SELECT TOP (5)
+                    r.session_id,
+                    DB_NAME(r.database_id) AS database_name,
+                    SUBSTRING(t.text, 1, 300) AS query_text,
+                    s.program_name,
+                    r.total_elapsed_time / 1000 AS elapsed_seconds,
+                    r.cpu_time AS cpu_time_ms,
+                    r.reads,
+                    r.writes,
+                    r.wait_type,
+                    r.blocking_session_id
+                FROM sys.dm_exec_requests AS r
+                CROSS APPLY sys.dm_exec_sql_text(r.sql_handle) AS t
+                JOIN sys.dm_exec_sessions AS s ON s.session_id = r.session_id
+                WHERE r.session_id > 50
+                AND r.total_elapsed_time >= @thresholdMs
+                ORDER BY r.total_elapsed_time DESC
+                OPTION(MAXDOP 1, RECOMPILE);";
+
+            var results = new List<LongRunningQueryInfo>();
+
+            try
+            {
+                using var cmd = new SqlCommand(query, connection);
+                cmd.CommandTimeout = 10;
+                cmd.Parameters.AddWithValue("@thresholdMs", (long)thresholdMinutes * 60 * 1000);
+                using var reader = await cmd.ExecuteReaderAsync();
+
+                while (await reader.ReadAsync())
+                {
+                    results.Add(new LongRunningQueryInfo
+                    {
+                        SessionId = reader.GetInt32(0),
+                        DatabaseName = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                        QueryText = reader.IsDBNull(2) ? "" : reader.GetString(2),
+                        ProgramName = reader.IsDBNull(3) ? "" : reader.GetString(3),
+                        ElapsedSeconds = Convert.ToInt64(reader.GetValue(4), System.Globalization.CultureInfo.InvariantCulture),
+                        CpuTimeMs = Convert.ToInt64(reader.GetValue(5), System.Globalization.CultureInfo.InvariantCulture),
+                        Reads = Convert.ToInt64(reader.GetValue(6), System.Globalization.CultureInfo.InvariantCulture),
+                        Writes = Convert.ToInt64(reader.GetValue(7), System.Globalization.CultureInfo.InvariantCulture),
+                        WaitType = reader.IsDBNull(8) ? null : reader.GetString(8),
+                        BlockingSessionId = reader.IsDBNull(9) ? null : (int?)Convert.ToInt32(reader.GetValue(9), System.Globalization.CultureInfo.InvariantCulture)
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Warning($"Failed to get long-running queries: {ex.Message}");
+            }
+
+            return results;
+        }
+
+        private async Task<List<AnomalousJobInfo>> GetAnomalousJobsAsync(SqlConnection connection, int multiplier)
+        {
+            var results = new List<AnomalousJobInfo>();
+            var thresholdPercent = multiplier * 100;
+
+            var query = @"SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+                SELECT TOP (5)
+                    job_name,
+                    CAST(job_id AS VARCHAR(36)),
+                    current_duration_seconds,
+                    avg_duration_seconds,
+                    p95_duration_seconds,
+                    percent_of_average,
+                    start_time
+                FROM collect.running_jobs
+                WHERE collection_time = (SELECT MAX(collection_time) FROM collect.running_jobs)
+                AND avg_duration_seconds >= 60
+                AND percent_of_average >= @thresholdPercent
+                ORDER BY percent_of_average DESC
+                OPTION(MAXDOP 1);";
+
+            try
+            {
+                using var cmd = new SqlCommand(query, connection);
+                cmd.CommandTimeout = 10;
+                cmd.Parameters.AddWithValue("@thresholdPercent", thresholdPercent);
+                using var reader = await cmd.ExecuteReaderAsync();
+
+                while (await reader.ReadAsync())
+                {
+                    results.Add(new AnomalousJobInfo
+                    {
+                        JobName = reader.GetString(0),
+                        JobId = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                        CurrentDurationSeconds = Convert.ToInt64(reader.GetValue(2), System.Globalization.CultureInfo.InvariantCulture),
+                        AvgDurationSeconds = Convert.ToInt64(reader.GetValue(3), System.Globalization.CultureInfo.InvariantCulture),
+                        P95DurationSeconds = reader.IsDBNull(4) ? 0 : Convert.ToInt64(reader.GetValue(4), System.Globalization.CultureInfo.InvariantCulture),
+                        PercentOfAverage = reader.IsDBNull(5) ? null : Convert.ToDecimal(reader.GetValue(5), System.Globalization.CultureInfo.InvariantCulture),
+                        StartTime = reader.GetDateTime(6)
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Warning($"Failed to get anomalous jobs: {ex.Message}");
+            }
+
+            return results;
+        }
+
+        private async Task<TempDbSpaceInfo?> GetTempDbSpaceAsync(SqlConnection connection)
+        {
+            const string query = @"SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+                SELECT TOP (1)
+                    total_reserved_mb,
+                    unallocated_mb,
+                    user_object_reserved_mb,
+                    internal_object_reserved_mb,
+                    version_store_reserved_mb,
+                    top_task_total_mb,
+                    top_task_session_id
+                FROM collect.tempdb_stats
+                ORDER BY collection_time DESC
+                OPTION(MAXDOP 1);";
+
+            try
+            {
+                using var cmd = new SqlCommand(query, connection);
+                cmd.CommandTimeout = 10;
+                using var reader = await cmd.ExecuteReaderAsync();
+
+                if (await reader.ReadAsync())
+                {
+                    return new TempDbSpaceInfo
+                    {
+                        TotalReservedMb = reader.IsDBNull(0) ? 0 : Convert.ToDouble(reader.GetValue(0), System.Globalization.CultureInfo.InvariantCulture),
+                        UnallocatedMb = reader.IsDBNull(1) ? 0 : Convert.ToDouble(reader.GetValue(1), System.Globalization.CultureInfo.InvariantCulture),
+                        UserObjectReservedMb = reader.IsDBNull(2) ? 0 : Convert.ToDouble(reader.GetValue(2), System.Globalization.CultureInfo.InvariantCulture),
+                        InternalObjectReservedMb = reader.IsDBNull(3) ? 0 : Convert.ToDouble(reader.GetValue(3), System.Globalization.CultureInfo.InvariantCulture),
+                        VersionStoreReservedMb = reader.IsDBNull(4) ? 0 : Convert.ToDouble(reader.GetValue(4), System.Globalization.CultureInfo.InvariantCulture),
+                        TopConsumerMb = reader.IsDBNull(5) ? 0 : Convert.ToDouble(reader.GetValue(5), System.Globalization.CultureInfo.InvariantCulture),
+                        TopConsumerSessionId = reader.IsDBNull(6) ? 0 : Convert.ToInt32(reader.GetValue(6), System.Globalization.CultureInfo.InvariantCulture)
+                    };
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Warning($"Failed to get TempDB space: {ex.Message}");
+            }
+
+            return null;
+        }
     }
 }
diff --git a/Dashboard/Services/EmailAlertService.cs b/Dashboard/Services/EmailAlertService.cs
index 51073783..e35bde0c 100644
--- a/Dashboard/Services/EmailAlertService.cs
+++ b/Dashboard/Services/EmailAlertService.cs
@@ -13,6 +13,7 @@
 using System.Net.Mail;
 using System.Net.Mime;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 using PerformanceMonitorDashboard.Helpers;
 using PerformanceMonitorDashboard.Models;
@@ -20,7 +21,7 @@
 namespace PerformanceMonitorDashboard.Services
 {
     /// <summary>
-    /// SMTP email sending service with per-metric cooldown and in-memory alert log.
+    /// SMTP email sending service with per-metric cooldown and persistent alert log.
     /// Uses System.Net.Mail.SmtpClient (no new NuGet packages needed).
     /// </summary>
     public class EmailAlertService
@@ -28,14 +29,16 @@ public class EmailAlertService
         private const string SmtpCredentialKey = "PerformanceMonitorDashboard_SMTP";
         private const int MaxAlertLogEntries = 1000;
         private static readonly CredentialService s_credentialService = new();
+        private static readonly JsonSerializerOptions s_jsonOptions = new() { WriteIndented = true };
 
         private readonly UserPreferencesService _preferencesService;
         private readonly ConcurrentDictionary<string, DateTime> _cooldowns = new();
         private static readonly TimeSpan CooldownPeriod = TimeSpan.FromMinutes(15);
 
-        /* In-memory alert log — survives for the lifetime of the application */
+        /* Alert log — loaded from JSON on startup, saved on exit, new alerts added in-memory */
         private readonly List<AlertLogEntry> _alertLog = new();
         private readonly object _alertLogLock = new();
+        private readonly string _alertLogFilePath;
 
         /* Failure tracking for louder logging */
         private int _consecutiveFailures;
@@ -51,6 +54,14 @@ public EmailAlertService(UserPreferencesService preferencesService)
         {
             _preferencesService = preferencesService;
             Current = this;
+
+            var appDataPath = Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                "PerformanceMonitorDashboard");
+            Directory.CreateDirectory(appDataPath);
+            _alertLogFilePath = Path.Combine(appDataPath, "alert_history.json");
+
+            LoadAlertLog();
         }
 
         /// <summary>
@@ -166,7 +177,7 @@ public void RecordAlert(string serverId, string serverName, string metricName,
         }
 
         /// <summary>
-        /// Gets alert history from the in-memory log.
+        /// Gets alert history from the log (excludes hidden alerts).
         /// </summary>
         public List<AlertLogEntry> GetAlertHistory(int hoursBack = 24, int limit = 50)
         {
@@ -175,13 +186,54 @@ public List<AlertLogEntry> GetAlertHistory(int hoursBack = 24, int limit = 50)
             lock (_alertLogLock)
             {
                 return _alertLog
-                    .Where(a => a.AlertTime >= cutoff)
+                    .Where(a => a.AlertTime >= cutoff && !a.Hidden)
                     .OrderByDescending(a => a.AlertTime)
                     .Take(limit)
                     .ToList();
             }
         }
 
+        /// <summary>
+        /// Hides specific alerts matching the given keys.
+        /// Each key is (AlertTime, ServerName, MetricName).
+        /// </summary>
+        public void HideAlerts(List<(DateTime AlertTime, string ServerName, string MetricName)> keys)
+        {
+            if (keys.Count == 0) return;
+
+            var keySet = new HashSet<(DateTime, string, string)>(keys);
+
+            lock (_alertLogLock)
+            {
+                foreach (var alert in _alertLog)
+                {
+                    if (keySet.Contains((alert.AlertTime, alert.ServerName, alert.MetricName)))
+                        alert.Hidden = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Hides all non-hidden alerts matching the time/server filter.
+        /// </summary>
+        public void HideAllAlerts(int hoursBack, string? serverName = null)
+        {
+            var cutoff = DateTime.UtcNow.AddHours(-hoursBack);
+
+            lock (_alertLogLock)
+            {
+                foreach (var alert in _alertLog)
+                {
+                    if (!alert.Hidden &&
+                        alert.AlertTime >= cutoff &&
+                        (serverName == null || alert.ServerName == serverName))
+                    {
+                        alert.Hidden = true;
+                    }
+                }
+            }
+        }
+
         /// <summary>
         /// Gets email delivery health summary.
         /// </summary>
@@ -190,6 +242,55 @@ public List<AlertLogEntry> GetAlertHistory(int hoursBack = 24, int limit = 50)
             return (_consecutiveFailures, _lastFailureError);
         }
 
+        #region Alert Log Persistence
+
+        /// <summary>
+        /// Saves the alert log to a JSON file. Call on application exit.
+        /// </summary>
+        public void SaveAlertLog()
+        {
+            try
+            {
+                List<AlertLogEntry> snapshot;
+                lock (_alertLogLock)
+                {
+                    snapshot = new List<AlertLogEntry>(_alertLog);
+                }
+
+                var json = JsonSerializer.Serialize(snapshot, s_jsonOptions);
+                File.WriteAllText(_alertLogFilePath, json);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Failed to save alert log: {ex.Message}");
+            }
+        }
+
+        private void LoadAlertLog()
+        {
+            try
+            {
+                if (!File.Exists(_alertLogFilePath)) return;
+
+                var json = File.ReadAllText(_alertLogFilePath);
+                var entries = JsonSerializer.Deserialize<List<AlertLogEntry>>(json);
+
+                if (entries != null)
+                {
+                    lock (_alertLogLock)
+                    {
+                        _alertLog.AddRange(entries);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Warning($"Failed to load alert log, starting fresh: {ex.Message}");
+            }
+        }
+
+        #endregion
+
         /// <summary>
         /// Sends a test email to verify SMTP configuration.
         /// Returns null on success, or the error message on failure.
@@ -296,7 +397,7 @@ private static async Task SendEmailAsync(UserPreferences prefs, string subject,
     }
 
     /// <summary>
-    /// Represents a single alert event in the in-memory log.
+    /// Represents a single alert event in the log.
     /// </summary>
     public class AlertLogEntry
     {
@@ -309,5 +410,6 @@ public class AlertLogEntry
         public bool AlertSent { get; set; }
         public string NotificationType { get; set; } = "";
         public string? SendError { get; set; }
+        public bool Hidden { get; set; }
     }
 }
diff --git a/Dashboard/Services/EmailTemplateBuilder.cs b/Dashboard/Services/EmailTemplateBuilder.cs
index 3eb8d53d..b72fa130 100644
--- a/Dashboard/Services/EmailTemplateBuilder.cs
+++ b/Dashboard/Services/EmailTemplateBuilder.cs
@@ -69,6 +69,10 @@ private static (string AccentColor, string BadgeText) GetSeverity(string metricN
                 "Blocking Detected" => ("#D97706", "ALERT"),
                 "Deadlocks Detected" => ("#DC2626", "ALERT"),
                 "High CPU" => ("#F59E0B", "WARNING"),
+                "Poison Wait" => ("#DC2626", "CRITICAL"),
+                "Long-Running Query" => ("#D97706", "WARNING"),
+                "TempDB Space" => ("#D97706", "WARNING"),
+                "Long-Running Job" => ("#D97706", "WARNING"),
                 _ => ("#2eaef1", "INFO")
             };
         }
diff --git a/Dashboard/Services/NotificationService.cs b/Dashboard/Services/NotificationService.cs
index ffa38c2e..3a43394e 100644
--- a/Dashboard/Services/NotificationService.cs
+++ b/Dashboard/Services/NotificationService.cs
@@ -195,6 +195,51 @@ public void ShowHighCpuNotification(string serverName, int cpuPercent)
                 NotificationType.Warning);
         }
 
+        public void ShowPoisonWaitNotification(string serverName, string waitType, double avgMs)
+        {
+            var prefs = _preferencesService.GetPreferences();
+            if (!prefs.NotifyOnPoisonWaits) return;
+
+            ShowNotification(
+                "Poison Wait",
+                $"{serverName}: {waitType} avg {avgMs:F0}ms/wait",
+                NotificationType.Error);
+        }
+
+        public void ShowLongRunningQueryNotification(string serverName, int sessionId, long elapsedMinutes, string queryPreview)
+        {
+            var prefs = _preferencesService.GetPreferences();
+            if (!prefs.NotifyOnLongRunningQueries) return;
+
+            var preview = string.IsNullOrEmpty(queryPreview) ? "" : $" — {queryPreview}";
+            ShowNotification(
+                "Long-Running Query",
+                $"{serverName}: Session #{sessionId} running {elapsedMinutes}m{preview}",
+                NotificationType.Warning);
+        }
+
+        public void ShowTempDbSpaceNotification(string serverName, double usedPercent)
+        {
+            var prefs = _preferencesService.GetPreferences();
+            if (!prefs.NotifyOnTempDbSpace) return;
+
+            ShowNotification(
+                "TempDB Space",
+                $"{serverName}: TempDB {usedPercent:F0}% used",
+                NotificationType.Warning);
+        }
+
+        public void ShowLongRunningJobNotification(string serverName, string jobName, long currentMinutes, decimal percentOfAvg)
+        {
+            var prefs = _preferencesService.GetPreferences();
+            if (!prefs.NotifyOnLongRunningJobs) return;
+
+            ShowNotification(
+                "Long-Running Job",
+                $"{serverName}: {jobName} at {percentOfAvg:F0}% of avg ({currentMinutes}m)",
+                NotificationType.Warning);
+        }
+
         private void ShowMainWindow()
         {
             _mainWindow.Show();
diff --git a/Dashboard/SettingsWindow.xaml b/Dashboard/SettingsWindow.xaml
index ea208949..d44a7a4f 100644
--- a/Dashboard/SettingsWindow.xaml
+++ b/Dashboard/SettingsWindow.xaml
@@ -143,6 +143,58 @@
                                          TextAlignment="Center"/>
                                 <TextBlock Text="%" VerticalAlignment="Center"/>
                             </StackPanel>
+                            <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
+                                <CheckBox x:Name="NotifyOnPoisonWaitsCheckBox"
+                                          Content="Poison waits (THREADPOOL, etc.) avg wait &#x2265;"
+                                          VerticalAlignment="Center"
+                                          Checked="NotifyOnPoisonWaitsCheckBox_Changed"
+                                          Unchecked="NotifyOnPoisonWaitsCheckBox_Changed"/>
+                                <TextBox x:Name="PoisonWaitThresholdTextBox"
+                                         Width="50"
+                                         Margin="8,0,8,0"
+                                         VerticalAlignment="Center"
+                                         TextAlignment="Center"/>
+                                <TextBlock Text="ms" VerticalAlignment="Center"/>
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
+                                <CheckBox x:Name="NotifyOnLongRunningQueriesCheckBox"
+                                          Content="Long-running queries over"
+                                          VerticalAlignment="Center"
+                                          Checked="NotifyOnLongRunningQueriesCheckBox_Changed"
+                                          Unchecked="NotifyOnLongRunningQueriesCheckBox_Changed"/>
+                                <TextBox x:Name="LongRunningQueryThresholdTextBox"
+                                         Width="50"
+                                         Margin="8,0,8,0"
+                                         VerticalAlignment="Center"
+                                         TextAlignment="Center"/>
+                                <TextBlock Text="minutes" VerticalAlignment="Center"/>
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
+                                <CheckBox x:Name="NotifyOnTempDbSpaceCheckBox"
+                                          Content="TempDB space usage over"
+                                          VerticalAlignment="Center"
+                                          Checked="NotifyOnTempDbSpaceCheckBox_Changed"
+                                          Unchecked="NotifyOnTempDbSpaceCheckBox_Changed"/>
+                                <TextBox x:Name="TempDbSpaceThresholdTextBox"
+                                         Width="50"
+                                         Margin="8,0,8,0"
+                                         VerticalAlignment="Center"
+                                         TextAlignment="Center"/>
+                                <TextBlock Text="%" VerticalAlignment="Center"/>
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
+                                <CheckBox x:Name="NotifyOnLongRunningJobsCheckBox"
+                                          Content="Agent jobs running over"
+                                          VerticalAlignment="Center"
+                                          Checked="NotifyOnLongRunningJobsCheckBox_Changed"
+                                          Unchecked="NotifyOnLongRunningJobsCheckBox_Changed"/>
+                                <TextBox x:Name="LongRunningJobMultiplierTextBox"
+                                         Width="50"
+                                         Margin="8,0,8,0"
+                                         VerticalAlignment="Center"
+                                         TextAlignment="Center"/>
+                                <TextBlock Text="x historical average" VerticalAlignment="Center"/>
+                            </StackPanel>
                         </StackPanel>
                     </StackPanel>
                 </ScrollViewer>
diff --git a/Dashboard/SettingsWindow.xaml.cs b/Dashboard/SettingsWindow.xaml.cs
index 18c2a89e..99e4fcf0 100644
--- a/Dashboard/SettingsWindow.xaml.cs
+++ b/Dashboard/SettingsWindow.xaml.cs
@@ -114,6 +114,14 @@ private void LoadSettings()
             DeadlockThresholdTextBox.Text = prefs.DeadlockThreshold.ToString(CultureInfo.InvariantCulture);
             NotifyOnHighCpuCheckBox.IsChecked = prefs.NotifyOnHighCpu;
             CpuThresholdTextBox.Text = prefs.CpuThresholdPercent.ToString(CultureInfo.InvariantCulture);
+            NotifyOnPoisonWaitsCheckBox.IsChecked = prefs.NotifyOnPoisonWaits;
+            PoisonWaitThresholdTextBox.Text = prefs.PoisonWaitThresholdMs.ToString(CultureInfo.InvariantCulture);
+            NotifyOnLongRunningQueriesCheckBox.IsChecked = prefs.NotifyOnLongRunningQueries;
+            LongRunningQueryThresholdTextBox.Text = prefs.LongRunningQueryThresholdMinutes.ToString(CultureInfo.InvariantCulture);
+            NotifyOnTempDbSpaceCheckBox.IsChecked = prefs.NotifyOnTempDbSpace;
+            TempDbSpaceThresholdTextBox.Text = prefs.TempDbSpaceThresholdPercent.ToString(CultureInfo.InvariantCulture);
+            NotifyOnLongRunningJobsCheckBox.IsChecked = prefs.NotifyOnLongRunningJobs;
+            LongRunningJobMultiplierTextBox.Text = prefs.LongRunningJobMultiplier.ToString(CultureInfo.InvariantCulture);
 
             UpdateNotificationCheckboxStates();
 
@@ -212,6 +220,30 @@ private void NotifyOnHighCpuCheckBox_Changed(object sender, RoutedEventArgs e)
             UpdateAlertNotificationStates();
         }
 
+        private void NotifyOnPoisonWaitsCheckBox_Changed(object sender, RoutedEventArgs e)
+        {
+            if (_isLoading) return;
+            UpdateAlertNotificationStates();
+        }
+
+        private void NotifyOnLongRunningQueriesCheckBox_Changed(object sender, RoutedEventArgs e)
+        {
+            if (_isLoading) return;
+            UpdateAlertNotificationStates();
+        }
+
+        private void NotifyOnTempDbSpaceCheckBox_Changed(object sender, RoutedEventArgs e)
+        {
+            if (_isLoading) return;
+            UpdateAlertNotificationStates();
+        }
+
+        private void NotifyOnLongRunningJobsCheckBox_Changed(object sender, RoutedEventArgs e)
+        {
+            if (_isLoading) return;
+            UpdateAlertNotificationStates();
+        }
+
         private void UpdateAlertNotificationStates()
         {
             bool notificationsEnabled = NotificationsEnabledCheckBox.IsChecked == true;
@@ -221,6 +253,14 @@ private void UpdateAlertNotificationStates()
             DeadlockThresholdTextBox.IsEnabled = notificationsEnabled && NotifyOnDeadlockCheckBox.IsChecked == true;
             NotifyOnHighCpuCheckBox.IsEnabled = notificationsEnabled;
             CpuThresholdTextBox.IsEnabled = notificationsEnabled && NotifyOnHighCpuCheckBox.IsChecked == true;
+            NotifyOnPoisonWaitsCheckBox.IsEnabled = notificationsEnabled;
+            PoisonWaitThresholdTextBox.IsEnabled = notificationsEnabled && NotifyOnPoisonWaitsCheckBox.IsChecked == true;
+            NotifyOnLongRunningQueriesCheckBox.IsEnabled = notificationsEnabled;
+            LongRunningQueryThresholdTextBox.IsEnabled = notificationsEnabled && NotifyOnLongRunningQueriesCheckBox.IsChecked == true;
+            NotifyOnTempDbSpaceCheckBox.IsEnabled = notificationsEnabled;
+            TempDbSpaceThresholdTextBox.IsEnabled = notificationsEnabled && NotifyOnTempDbSpaceCheckBox.IsChecked == true;
+            NotifyOnLongRunningJobsCheckBox.IsEnabled = notificationsEnabled;
+            LongRunningJobMultiplierTextBox.IsEnabled = notificationsEnabled && NotifyOnLongRunningJobsCheckBox.IsChecked == true;
         }
 
         private void UpdateNotificationCheckboxStates()
@@ -410,6 +450,26 @@ private void OkButton_Click(object sender, RoutedEventArgs e)
             {
                 prefs.CpuThresholdPercent = cpuThreshold;
             }
+            prefs.NotifyOnPoisonWaits = NotifyOnPoisonWaitsCheckBox.IsChecked == true;
+            if (int.TryParse(PoisonWaitThresholdTextBox.Text, out int poisonWaitThreshold) && poisonWaitThreshold > 0)
+            {
+                prefs.PoisonWaitThresholdMs = poisonWaitThreshold;
+            }
+            prefs.NotifyOnLongRunningQueries = NotifyOnLongRunningQueriesCheckBox.IsChecked == true;
+            if (int.TryParse(LongRunningQueryThresholdTextBox.Text, out int lrqThreshold) && lrqThreshold > 0)
+            {
+                prefs.LongRunningQueryThresholdMinutes = lrqThreshold;
+            }
+            prefs.NotifyOnTempDbSpace = NotifyOnTempDbSpaceCheckBox.IsChecked == true;
+            if (int.TryParse(TempDbSpaceThresholdTextBox.Text, out int tempDbThreshold) && tempDbThreshold > 0 && tempDbThreshold <= 100)
+            {
+                prefs.TempDbSpaceThresholdPercent = tempDbThreshold;
+            }
+            prefs.NotifyOnLongRunningJobs = NotifyOnLongRunningJobsCheckBox.IsChecked == true;
+            if (int.TryParse(LongRunningJobMultiplierTextBox.Text, out int jobMultiplier) && jobMultiplier > 0)
+            {
+                prefs.LongRunningJobMultiplier = jobMultiplier;
+            }
 
             // Save SMTP email settings
             prefs.SmtpEnabled = SmtpEnabledCheckBox.IsChecked == true;
diff --git a/Lite/App.xaml.cs b/Lite/App.xaml.cs
index 146c45e9..47d46db6 100644
--- a/Lite/App.xaml.cs
+++ b/Lite/App.xaml.cs
@@ -55,6 +55,14 @@ public partial class App : Application
     public static int AlertBlockingThreshold { get; set; } = 1;
     public static bool AlertDeadlockEnabled { get; set; } = true;
     public static int AlertDeadlockThreshold { get; set; } = 1;
+    public static bool AlertPoisonWaitEnabled { get; set; } = true;
+    public static int AlertPoisonWaitThresholdMs { get; set; } = 500;
+    public static bool AlertLongRunningQueryEnabled { get; set; } = true;
+    public static int AlertLongRunningQueryThresholdMinutes { get; set; } = 30;
+    public static bool AlertTempDbSpaceEnabled { get; set; } = true;
+    public static int AlertTempDbSpaceThresholdPercent { get; set; } = 80;
+    public static bool AlertLongRunningJobEnabled { get; set; } = true;
+    public static int AlertLongRunningJobMultiplier { get; set; } = 3;
 
     /* System tray settings */
     public static bool MinimizeToTray { get; set; } = true;
@@ -201,6 +209,14 @@ public static void LoadAlertSettings()
             if (root.TryGetProperty("alert_blocking_threshold", out v)) AlertBlockingThreshold = v.GetInt32();
             if (root.TryGetProperty("alert_deadlock_enabled", out v)) AlertDeadlockEnabled = v.GetBoolean();
             if (root.TryGetProperty("alert_deadlock_threshold", out v)) AlertDeadlockThreshold = v.GetInt32();
+            if (root.TryGetProperty("alert_poison_wait_enabled", out v)) AlertPoisonWaitEnabled = v.GetBoolean();
+            if (root.TryGetProperty("alert_poison_wait_threshold_ms", out v)) AlertPoisonWaitThresholdMs = v.GetInt32();
+            if (root.TryGetProperty("alert_long_running_query_enabled", out v)) AlertLongRunningQueryEnabled = v.GetBoolean();
+            if (root.TryGetProperty("alert_long_running_query_threshold_minutes", out v)) AlertLongRunningQueryThresholdMinutes = v.GetInt32();
+            if (root.TryGetProperty("alert_tempdb_space_enabled", out v)) AlertTempDbSpaceEnabled = v.GetBoolean();
+            if (root.TryGetProperty("alert_tempdb_space_threshold_percent", out v)) AlertTempDbSpaceThresholdPercent = v.GetInt32();
+            if (root.TryGetProperty("alert_long_running_job_enabled", out v)) AlertLongRunningJobEnabled = v.GetBoolean();
+            if (root.TryGetProperty("alert_long_running_job_multiplier", out v)) AlertLongRunningJobMultiplier = v.GetInt32();
 
             /* System tray settings */
             if (root.TryGetProperty("minimize_to_tray", out v)) MinimizeToTray = v.GetBoolean();
diff --git a/Lite/Controls/AlertsHistoryTab.xaml b/Lite/Controls/AlertsHistoryTab.xaml
new file mode 100644
index 00000000..35d7d1cd
--- /dev/null
+++ b/Lite/Controls/AlertsHistoryTab.xaml
@@ -0,0 +1,156 @@
+<UserControl x:Class="PerformanceMonitorLite.Controls.AlertsHistoryTab"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/Themes/DarkTheme.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+
+            <ContextMenu x:Key="DataGridContextMenu">
+                <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+                <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+                <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+                <Separator/>
+                <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+            </ContextMenu>
+
+            <Style x:Key="DefaultRowStyle" TargetType="DataGridRow">
+                <Setter Property="ContextMenu" Value="{StaticResource DataGridContextMenu}"/>
+            </Style>
+
+            <Style x:Key="AlertRowStyle" TargetType="DataGridRow" BasedOn="{StaticResource DefaultRowStyle}">
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding IsCritical}" Value="True">
+                        <Setter Property="Background" Value="#33DC2626"/>
+                    </DataTrigger>
+                    <DataTrigger Binding="{Binding IsWarning}" Value="True">
+                        <Setter Property="Background" Value="#33D97706"/>
+                    </DataTrigger>
+                    <DataTrigger Binding="{Binding IsResolved}" Value="True">
+                        <Setter Property="Background" Value="#3322C55E"/>
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <!-- Header Controls -->
+        <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10,8" Height="36">
+            <TextBlock Text="Alert History" VerticalAlignment="Center" Margin="0,0,10,0" FontWeight="Bold" FontSize="14"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <TextBlock Text="Time Range:" VerticalAlignment="Center" Margin="5,0,4,0"
+                       Foreground="{DynamicResource ForegroundMutedBrush}"/>
+            <ComboBox x:Name="TimeRangeComboBox" Width="100" VerticalAlignment="Center"
+                      SelectionChanged="TimeRangeComboBox_SelectionChanged">
+                <ComboBoxItem Content="Last 1 Hour" Tag="1"/>
+                <ComboBoxItem Content="Last 4 Hours" Tag="4"/>
+                <ComboBoxItem Content="Last 24 Hours" Tag="24" IsSelected="True"/>
+                <ComboBoxItem Content="Last 7 Days" Tag="168"/>
+                <ComboBoxItem Content="All" Tag="8760"/>
+            </ComboBox>
+            <TextBlock Text="Server:" VerticalAlignment="Center" Margin="12,0,4,0"
+                       Foreground="{DynamicResource ForegroundMutedBrush}"/>
+            <ComboBox x:Name="ServerFilterComboBox" Width="160" VerticalAlignment="Center"
+                      SelectionChanged="ServerFilterComboBox_SelectionChanged">
+                <ComboBoxItem Content="All Servers" Tag="" IsSelected="True"/>
+            </ComboBox>
+            <Button Content="Refresh" Click="RefreshButton_Click" Margin="12,0,0,0" Padding="10,4" MinWidth="70"/>
+            <Button x:Name="DismissSelectedButton" Content="Dismiss Selected" Click="DismissSelected_Click"
+                    Margin="8,0,0,0" Padding="10,4" MinWidth="90" IsEnabled="False"/>
+            <Button Content="Dismiss All" Click="DismissAll_Click"
+                    Margin="4,0,0,0" Padding="10,4" MinWidth="70"/>
+            <TextBlock x:Name="AlertCountIndicator" Text="" Margin="12,0,0,0" VerticalAlignment="Center"
+                       FontStyle="Italic" Foreground="{DynamicResource AccentBrush}" FontWeight="SemiBold"/>
+        </StackPanel>
+
+        <!-- DataGrid -->
+        <Grid Grid.Row="1" Margin="10,0,10,10">
+            <DataGrid x:Name="AlertsDataGrid"
+                      AutoGenerateColumns="False"
+                      IsReadOnly="True"
+                      CanUserSortColumns="True"
+                      GridLinesVisibility="Horizontal"
+                      CanUserResizeColumns="True"
+                      HeadersVisibility="Column"
+                      SelectionMode="Extended"
+                      SelectionChanged="AlertsDataGrid_SelectionChanged"
+                      RowStyle="{StaticResource AlertRowStyle}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding TimeLocal}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TimeLocal" Click="FilterButton_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ServerName}" Width="140">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ServerName" Click="FilterButton_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Server" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding MetricName}" Width="160">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MetricName" Click="FilterButton_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Alert Type" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding CurrentValueDisplay}" Width="160">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CurrentValueDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Value" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ThresholdValueDisplay}" Width="120">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ThresholdValueDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Threshold" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding NotificationType}" Width="80">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NotificationType" Click="FilterButton_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Channel" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding StatusDisplay}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="StatusDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Status" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+
+            <!-- Empty State -->
+            <TextBlock x:Name="NoAlertsMessage"
+                       Text="No alerts recorded in the selected time range"
+                       FontSize="14" Foreground="{DynamicResource ForegroundMutedBrush}"
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       Visibility="Collapsed"/>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Lite/Controls/AlertsHistoryTab.xaml.cs b/Lite/Controls/AlertsHistoryTab.xaml.cs
new file mode 100644
index 00000000..62a59ff7
--- /dev/null
+++ b/Lite/Controls/AlertsHistoryTab.xaml.cs
@@ -0,0 +1,399 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using Microsoft.Win32;
+using PerformanceMonitorLite.Controls;
+using PerformanceMonitorLite.Models;
+using PerformanceMonitorLite.Services;
+
+namespace PerformanceMonitorLite.Controls;
+
+public partial class AlertsHistoryTab : UserControl
+{
+    private LocalDataService? _dataService;
+    private DataGridFilterManager<AlertHistoryRow>? _filterManager;
+    private Popup? _filterPopup;
+    private ColumnFilterPopup? _filterPopupContent;
+
+    public AlertsHistoryTab()
+    {
+        InitializeComponent();
+    }
+
+    /// <summary>
+    /// Initializes the control with required dependencies.
+    /// </summary>
+    public void Initialize(LocalDataService dataService)
+    {
+        _dataService = dataService;
+        _filterManager = new DataGridFilterManager<AlertHistoryRow>(AlertsDataGrid);
+    }
+
+    /// <summary>
+    /// Refreshes the alert history data.
+    /// </summary>
+    public async void RefreshAlerts()
+    {
+        await LoadAlertsAsync();
+    }
+
+    private async System.Threading.Tasks.Task LoadAlertsAsync()
+    {
+        if (_dataService == null) return;
+
+        try
+        {
+            var hoursBack = GetSelectedHoursBack();
+            int? serverId = GetSelectedServerId();
+
+            var alerts = await _dataService.GetAlertHistoryAsync(hoursBack, 500, serverId);
+
+            if (_filterManager != null)
+                _filterManager.UpdateData(alerts);
+            else
+                AlertsDataGrid.ItemsSource = alerts;
+
+            var displayCount = AlertsDataGrid.ItemsSource is ICollection<AlertHistoryRow> coll ? coll.Count : alerts.Count;
+            NoAlertsMessage.Visibility = displayCount == 0 ? Visibility.Visible : Visibility.Collapsed;
+            AlertCountIndicator.Text = displayCount > 0 ? $"{displayCount} alert(s)" : "";
+
+            PopulateServerFilter(alerts);
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Error("AlertsHistory", $"Failed to load alert history: {ex.Message}");
+        }
+    }
+
+    private void PopulateServerFilter(List<AlertHistoryRow> alerts)
+    {
+        var servers = alerts
+            .Select(a => (a.ServerId, a.ServerName))
+            .Where(s => !string.IsNullOrEmpty(s.ServerName))
+            .Distinct()
+            .OrderBy(s => s.ServerName)
+            .ToList();
+
+        var currentSelection = ServerFilterComboBox.SelectedIndex > 0
+            ? (ServerFilterComboBox.SelectedItem as ComboBoxItem)?.Tag?.ToString()
+            : null;
+
+        var existingIds = ServerFilterComboBox.Items
+            .OfType<ComboBoxItem>()
+            .Skip(1)
+            .Select(i => i.Tag?.ToString())
+            .ToList();
+
+        var newIds = servers.Select(s => s.ServerId.ToString()).ToList();
+        if (newIds.SequenceEqual(existingIds)) return;
+
+        ServerFilterComboBox.SelectionChanged -= ServerFilterComboBox_SelectionChanged;
+
+        while (ServerFilterComboBox.Items.Count > 1)
+            ServerFilterComboBox.Items.RemoveAt(1);
+
+        foreach (var (serverId, serverName) in servers)
+        {
+            ServerFilterComboBox.Items.Add(new ComboBoxItem
+            {
+                Content = serverName,
+                Tag = serverId.ToString()
+            });
+        }
+
+        if (currentSelection != null)
+        {
+            for (int i = 1; i < ServerFilterComboBox.Items.Count; i++)
+            {
+                if ((ServerFilterComboBox.Items[i] as ComboBoxItem)?.Tag?.ToString() == currentSelection)
+                {
+                    ServerFilterComboBox.SelectedIndex = i;
+                    break;
+                }
+            }
+        }
+
+        ServerFilterComboBox.SelectionChanged += ServerFilterComboBox_SelectionChanged;
+    }
+
+    private int GetSelectedHoursBack()
+    {
+        if (TimeRangeComboBox.SelectedItem is ComboBoxItem item && item.Tag is string tagStr)
+            return int.TryParse(tagStr, out var hours) ? hours : 24;
+        return 24;
+    }
+
+    private int? GetSelectedServerId()
+    {
+        if (ServerFilterComboBox.SelectedIndex > 0 &&
+            ServerFilterComboBox.SelectedItem is ComboBoxItem item &&
+            item.Tag is string tagStr &&
+            int.TryParse(tagStr, out var serverId))
+        {
+            return serverId;
+        }
+        return null;
+    }
+
+    #region Column Filter Handlers
+
+    private void FilterButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is not Button button || button.Tag is not string columnName) return;
+
+        if (_filterPopup == null)
+        {
+            _filterPopupContent = new ColumnFilterPopup();
+            _filterPopupContent.FilterApplied += FilterPopup_FilterApplied;
+            _filterPopupContent.FilterCleared += FilterPopup_FilterCleared;
+
+            _filterPopup = new Popup
+            {
+                Child = _filterPopupContent,
+                StaysOpen = false,
+                Placement = PlacementMode.Bottom,
+                AllowsTransparency = true
+            };
+        }
+
+        ColumnFilterState? existingFilter = null;
+        _filterManager?.Filters.TryGetValue(columnName, out existingFilter);
+        _filterPopupContent!.Initialize(columnName, existingFilter);
+
+        _filterPopup.PlacementTarget = button;
+        _filterPopup.IsOpen = true;
+    }
+
+    private void FilterPopup_FilterApplied(object? sender, FilterAppliedEventArgs e)
+    {
+        if (_filterPopup != null)
+            _filterPopup.IsOpen = false;
+
+        _filterManager?.SetFilter(e.FilterState);
+    }
+
+    private void FilterPopup_FilterCleared(object? sender, EventArgs e)
+    {
+        if (_filterPopup != null)
+            _filterPopup.IsOpen = false;
+    }
+
+    #endregion
+
+    #region Event Handlers
+
+    private async void TimeRangeComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (IsLoaded)
+            await LoadAlertsAsync();
+    }
+
+    private async void ServerFilterComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (IsLoaded)
+            await LoadAlertsAsync();
+    }
+
+    private async void RefreshButton_Click(object sender, RoutedEventArgs e)
+    {
+        await LoadAlertsAsync();
+    }
+
+    private void AlertsDataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        DismissSelectedButton.IsEnabled = AlertsDataGrid.SelectedItems.Count > 0;
+    }
+
+    private async void DismissSelected_Click(object sender, RoutedEventArgs e)
+    {
+        if (_dataService == null) return;
+
+        var selected = AlertsDataGrid.SelectedItems
+            .OfType<AlertHistoryRow>()
+            .ToList();
+
+        if (selected.Count == 0) return;
+
+        try
+        {
+            await _dataService.DismissAlertsAsync(selected);
+            await LoadAlertsAsync();
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Error("AlertsHistory", $"Failed to dismiss selected alerts: {ex.Message}");
+        }
+    }
+
+    private async void DismissAll_Click(object sender, RoutedEventArgs e)
+    {
+        if (_dataService == null) return;
+
+        var displayCount = AlertsDataGrid.ItemsSource is System.Collections.ICollection coll ? coll.Count : 0;
+        if (displayCount == 0) return;
+
+        var result = MessageBox.Show(
+            $"Dismiss all {displayCount} visible alert(s)?\n\nDismissed alerts are hidden from this view but remain in the database.",
+            "Dismiss All Alerts",
+            MessageBoxButton.YesNo,
+            MessageBoxImage.Question);
+
+        if (result != MessageBoxResult.Yes) return;
+
+        try
+        {
+            var hoursBack = GetSelectedHoursBack();
+            int? serverId = GetSelectedServerId();
+            await _dataService.DismissAllVisibleAlertsAsync(hoursBack, serverId);
+            await LoadAlertsAsync();
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Error("AlertsHistory", $"Failed to dismiss all alerts: {ex.Message}");
+        }
+    }
+
+    #endregion
+
+    #region Context Menu Handlers
+
+    private void CopyCell_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is not MenuItem menuItem) return;
+        var grid = FindParentDataGrid(menuItem);
+        if (grid?.CurrentCell.Column == null || grid.CurrentItem == null) return;
+
+        var value = GetCellValue(grid.CurrentCell.Column, grid.CurrentItem);
+        if (value.Length > 0) Clipboard.SetDataObject(value, false);
+    }
+
+    private void CopyRow_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is not MenuItem menuItem) return;
+        var grid = FindParentDataGrid(menuItem);
+        if (grid?.CurrentItem == null) return;
+
+        var sb = new StringBuilder();
+        foreach (var col in grid.Columns)
+        {
+            sb.Append(GetCellValue(col, grid.CurrentItem));
+            sb.Append('\t');
+        }
+        Clipboard.SetDataObject(sb.ToString().TrimEnd('\t'), false);
+    }
+
+    private void CopyAllRows_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is not MenuItem menuItem) return;
+        var grid = FindParentDataGrid(menuItem);
+        if (grid?.Items == null) return;
+
+        var sb = new StringBuilder();
+
+        foreach (var col in grid.Columns)
+        {
+            sb.Append(col.Header?.ToString() ?? "");
+            sb.Append('\t');
+        }
+        sb.AppendLine();
+
+        foreach (var item in grid.Items)
+        {
+            foreach (var col in grid.Columns)
+            {
+                sb.Append(GetCellValue(col, item));
+                sb.Append('\t');
+            }
+            sb.AppendLine();
+        }
+
+        Clipboard.SetDataObject(sb.ToString(), false);
+    }
+
+    private void ExportToCsv_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is not MenuItem menuItem) return;
+        var grid = FindParentDataGrid(menuItem);
+        if (grid?.Items == null || grid.Items.Count == 0) return;
+
+        var dialog = new SaveFileDialog
+        {
+            Filter = "CSV files (*.csv)|*.csv|All files (*.*)|*.*",
+            DefaultExt = ".csv",
+            FileName = $"alert_history_{DateTime.Now:yyyyMMdd_HHmmss}.csv"
+        };
+
+        if (dialog.ShowDialog() != true) return;
+
+        var sb = new StringBuilder();
+
+        var headers = new List<string>();
+        foreach (var col in grid.Columns)
+            headers.Add(CsvEscape(col.Header?.ToString() ?? ""));
+        sb.AppendLine(string.Join(",", headers));
+
+        foreach (var item in grid.Items)
+        {
+            var values = new List<string>();
+            foreach (var col in grid.Columns)
+                values.Add(CsvEscape(GetCellValue(col, item)));
+            sb.AppendLine(string.Join(",", values));
+        }
+
+        try
+        {
+            File.WriteAllText(dialog.FileName, sb.ToString(), Encoding.UTF8);
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show($"Failed to export: {ex.Message}", "Export Error",
+                MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+    }
+
+    #endregion
+
+    #region Helpers
+
+    private static DataGrid? FindParentDataGrid(MenuItem menuItem)
+    {
+        var contextMenu = menuItem.Parent as ContextMenu;
+        var target = contextMenu?.PlacementTarget as FrameworkElement;
+        while (target != null && target is not DataGrid)
+            target = System.Windows.Media.VisualTreeHelper.GetParent(target) as FrameworkElement;
+        return target as DataGrid;
+    }
+
+    private static string GetCellValue(DataGridColumn col, object item)
+    {
+        if (col is DataGridBoundColumn boundCol && boundCol.Binding is Binding binding)
+        {
+            var prop = item.GetType().GetProperty(binding.Path.Path);
+            return prop?.GetValue(item)?.ToString() ?? "";
+        }
+        return "";
+    }
+
+    private static string CsvEscape(string value)
+    {
+        if (value.Contains(',') || value.Contains('"') || value.Contains('\n') || value.Contains('\r'))
+            return "\"" + value.Replace("\"", "\"\"") + "\"";
+        return value;
+    }
+
+    #endregion
+}
diff --git a/Lite/Database/DuckDbInitializer.cs b/Lite/Database/DuckDbInitializer.cs
index d073d759..53b56aa3 100644
--- a/Lite/Database/DuckDbInitializer.cs
+++ b/Lite/Database/DuckDbInitializer.cs
@@ -19,7 +19,7 @@ public class DuckDbInitializer
     /// <summary>
     /// Current schema version. Increment this when schema changes require table rebuilds.
     /// </summary>
-    private const int CurrentSchemaVersion = 8;
+    private const int CurrentSchemaVersion = 9;
 
     public DuckDbInitializer(string databasePath, ILogger<DuckDbInitializer>? logger = null)
     {
@@ -312,6 +312,21 @@ Must drop/recreate because DuckDB appender writes by position. */
             _logger?.LogInformation("Running migration to v8: rebuilding procedure_stats for min/max/spills columns");
             await ExecuteNonQueryAsync(connection, "DROP TABLE IF EXISTS procedure_stats");
         }
+
+        if (fromVersion < 9)
+        {
+            /* v9: Added dismissed column to config_alert_log for hide/dismiss functionality.
+                   Safe to ALTER because this table uses INSERT (not appender). */
+            _logger?.LogInformation("Running migration to v9: adding dismissed column to config_alert_log");
+            try
+            {
+                await ExecuteNonQueryAsync(connection, "ALTER TABLE config_alert_log ADD COLUMN IF NOT EXISTS dismissed BOOLEAN NOT NULL DEFAULT false");
+            }
+            catch
+            {
+                /* Table doesn't exist yet — will be created with correct schema below */
+            }
+        }
     }
 
     /// <summary>
diff --git a/Lite/Database/Schema.cs b/Lite/Database/Schema.cs
index 474046d9..658325b3 100644
--- a/Lite/Database/Schema.cs
+++ b/Lite/Database/Schema.cs
@@ -500,7 +500,8 @@ CREATE TABLE IF NOT EXISTS config_alert_log (
     threshold_value DOUBLE NOT NULL,
     alert_sent BOOLEAN NOT NULL DEFAULT false,
     notification_type VARCHAR NOT NULL DEFAULT 'tray',
-    send_error VARCHAR
+    send_error VARCHAR,
+    dismissed BOOLEAN NOT NULL DEFAULT false
 )";
 
     /// <summary>
diff --git a/Lite/MainWindow.xaml b/Lite/MainWindow.xaml
index 975a265f..55d89105 100644
--- a/Lite/MainWindow.xaml
+++ b/Lite/MainWindow.xaml
@@ -1,6 +1,7 @@
 <Window x:Class="PerformanceMonitorLite.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:controls="clr-namespace:PerformanceMonitorLite.Controls"
         Title="Performance Monitor Lite"
         Height="700" Width="1200"
         WindowStartupLocation="CenterScreen"
@@ -246,6 +247,9 @@
                             </ItemsControl>
                         </ScrollViewer>
                     </TabItem>
+                    <TabItem Header="Alert History" x:Name="AlertsTab">
+                        <controls:AlertsHistoryTab x:Name="AlertsHistoryContent"/>
+                    </TabItem>
                 </TabControl>
             </Grid>
 
diff --git a/Lite/MainWindow.xaml.cs b/Lite/MainWindow.xaml.cs
index c0967a7a..1dd5e08b 100644
--- a/Lite/MainWindow.xaml.cs
+++ b/Lite/MainWindow.xaml.cs
@@ -38,6 +38,10 @@ public partial class MainWindow : Window
     private readonly Dictionary<string, DateTime> _lastCpuAlert = new();
     private readonly Dictionary<string, DateTime> _lastBlockingAlert = new();
     private readonly Dictionary<string, DateTime> _lastDeadlockAlert = new();
+    private readonly Dictionary<string, DateTime> _lastPoisonWaitAlert = new();
+    private readonly Dictionary<string, DateTime> _lastLongRunningQueryAlert = new();
+    private readonly Dictionary<string, DateTime> _lastTempDbSpaceAlert = new();
+    private readonly Dictionary<string, DateTime> _lastLongRunningJobAlert = new();
     private static readonly TimeSpan AlertCooldown = TimeSpan.FromMinutes(5);
     private readonly DispatcherTimer _statusTimer;
     private LocalDataService? _dataService;
@@ -49,6 +53,10 @@ public partial class MainWindow : Window
     private readonly Dictionary<string, bool> _activeCpuAlert = new();
     private readonly Dictionary<string, bool> _activeBlockingAlert = new();
     private readonly Dictionary<string, bool> _activeDeadlockAlert = new();
+    private readonly Dictionary<string, bool> _activePoisonWaitAlert = new();
+    private readonly Dictionary<string, bool> _activeLongRunningQueryAlert = new();
+    private readonly Dictionary<string, bool> _activeTempDbSpaceAlert = new();
+    private readonly Dictionary<string, bool> _activeLongRunningJobAlert = new();
 
     public MainWindow()
     {
@@ -62,7 +70,16 @@ public MainWindow()
 
         // Status bar update timer
         _statusTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(30) };
-        _statusTimer.Tick += async (s, e) => { UpdateStatusBar(); await RefreshOverviewAsync(); CheckConnectionsAndNotify(); };
+        _statusTimer.Tick += async (s, e) =>
+        {
+            UpdateStatusBar();
+            await RefreshOverviewAsync();
+            CheckConnectionsAndNotify();
+
+            /* Auto-refresh alert history if the tab is active */
+            if (ServerTabControl.SelectedItem == AlertsTab)
+                AlertsHistoryContent.RefreshAlerts();
+        };
 
         // Initialize database and UI
         Loaded += MainWindow_Loaded;
@@ -101,6 +118,9 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
             // Initialize data service for overview
             _dataService = new LocalDataService(_databaseInitializer);
 
+            // Initialize alerts history tab
+            AlertsHistoryContent.Initialize(_dataService);
+
             // Start MCP server if enabled
             var mcpSettings = McpSettings.Load(App.ConfigDirectory);
             if (mcpSettings.Enabled)
@@ -217,6 +237,12 @@ private void ServerTabControl_SelectionChanged(object sender, SelectionChangedEv
             ServerTimeHelper.UtcOffsetMinutes = serverTab.UtcOffsetMinutes;
         }
 
+        /* Refresh alerts tab when selected */
+        if (ServerTabControl.SelectedItem == AlertsTab)
+        {
+            AlertsHistoryContent.RefreshAlerts();
+        }
+
         UpdateCollectorHealth();
     }
 
@@ -1011,6 +1037,194 @@ await _emailAlertService.TrySendAlertEmailAsync(
                 $"{summary.DisplayName}: No deadlocks in the last hour",
                 Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
         }
+
+        /* Poison wait alerts */
+        if (App.AlertPoisonWaitEnabled && _dataService != null)
+        {
+            try
+            {
+                var poisonWaits = await _dataService.GetLatestPoisonWaitAvgsAsync(summary.ServerId);
+                var triggered = poisonWaits.FindAll(w => w.AvgMsPerWait >= App.AlertPoisonWaitThresholdMs);
+
+                if (triggered.Count > 0)
+                {
+                    _activePoisonWaitAlert[key] = true;
+                    if (!suppressPopups && (!_lastPoisonWaitAlert.TryGetValue(key, out var lastPoisonWait) || now - lastPoisonWait >= AlertCooldown))
+                    {
+                        var worst = triggered[0];
+                        var allWaitNames = string.Join(", ", triggered.ConvertAll(w => $"{w.WaitType} ({w.AvgMsPerWait:F0}ms)"));
+                        _trayService.ShowNotification(
+                            "Poison Wait",
+                            $"{summary.DisplayName}: {worst.WaitType} avg {worst.AvgMsPerWait:F0}ms/wait",
+                            Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Error);
+                        _lastPoisonWaitAlert[key] = now;
+
+                        var poisonContext = BuildPoisonWaitContext(triggered);
+
+                        await _emailAlertService.TrySendAlertEmailAsync(
+                            "Poison Wait",
+                            summary.DisplayName,
+                            allWaitNames,
+                            $"{App.AlertPoisonWaitThresholdMs}ms avg",
+                            summary.ServerId,
+                            poisonContext);
+                    }
+                }
+                else if (_activePoisonWaitAlert.TryGetValue(key, out var wasPoisonWait) && wasPoisonWait)
+                {
+                    _activePoisonWaitAlert[key] = false;
+                    _trayService.ShowNotification(
+                        "Poison Waits Cleared",
+                        $"{summary.DisplayName}: Poison wait avg below threshold",
+                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+                }
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("Alerts", $"Failed to check poison waits for {summary.DisplayName}: {ex.Message}");
+            }
+        }
+
+        /* Long-running query alerts */
+        if (App.AlertLongRunningQueryEnabled && _dataService != null)
+        {
+            try
+            {
+                var longRunning = await _dataService.GetLongRunningQueriesAsync(summary.ServerId, App.AlertLongRunningQueryThresholdMinutes);
+
+                if (longRunning.Count > 0)
+                {
+                    _activeLongRunningQueryAlert[key] = true;
+                    if (!suppressPopups && (!_lastLongRunningQueryAlert.TryGetValue(key, out var lastLrq) || now - lastLrq >= AlertCooldown))
+                    {
+                        var worst = longRunning[0];
+                        var elapsedMinutes = worst.ElapsedSeconds / 60;
+                        var preview = TruncateText(worst.QueryText, 80);
+                        var previewSuffix = string.IsNullOrEmpty(preview) ? "" : $" — {preview}";
+                        _trayService.ShowNotification(
+                            "Long-Running Query",
+                            $"{summary.DisplayName}: Session #{worst.SessionId} running {elapsedMinutes}m{previewSuffix}",
+                            Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
+                        _lastLongRunningQueryAlert[key] = now;
+
+                        var lrqContext = BuildLongRunningQueryContext(longRunning);
+
+                        await _emailAlertService.TrySendAlertEmailAsync(
+                            "Long-Running Query",
+                            summary.DisplayName,
+                            $"{longRunning.Count} query(s), longest {elapsedMinutes}m",
+                            $"{App.AlertLongRunningQueryThresholdMinutes}m",
+                            summary.ServerId,
+                            lrqContext);
+                    }
+                }
+                else if (_activeLongRunningQueryAlert.TryGetValue(key, out var wasLongRunning) && wasLongRunning)
+                {
+                    _activeLongRunningQueryAlert[key] = false;
+                    _trayService.ShowNotification(
+                        "Long-Running Queries Cleared",
+                        $"{summary.DisplayName}: No queries over threshold",
+                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+                }
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("Alerts", $"Failed to check long-running queries for {summary.DisplayName}: {ex.Message}");
+            }
+        }
+
+        /* TempDB space alerts */
+        if (App.AlertTempDbSpaceEnabled && _dataService != null)
+        {
+            try
+            {
+                var tempDb = await _dataService.GetLatestTempDbSpaceAsync(summary.ServerId);
+
+                if (tempDb != null && tempDb.UsedPercent >= App.AlertTempDbSpaceThresholdPercent)
+                {
+                    _activeTempDbSpaceAlert[key] = true;
+                    if (!suppressPopups && (!_lastTempDbSpaceAlert.TryGetValue(key, out var lastTempDb) || now - lastTempDb >= AlertCooldown))
+                    {
+                        _trayService.ShowNotification(
+                            "TempDB Space",
+                            $"{summary.DisplayName}: TempDB {tempDb.UsedPercent:F0}% used",
+                            Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
+                        _lastTempDbSpaceAlert[key] = now;
+
+                        var tempDbContext = BuildTempDbSpaceContext(tempDb);
+
+                        await _emailAlertService.TrySendAlertEmailAsync(
+                            "TempDB Space",
+                            summary.DisplayName,
+                            $"{tempDb.UsedPercent:F0}% used ({tempDb.TotalReservedMb:F0} MB)",
+                            $"{App.AlertTempDbSpaceThresholdPercent}%",
+                            summary.ServerId,
+                            tempDbContext);
+                    }
+                }
+                else if (_activeTempDbSpaceAlert.TryGetValue(key, out var wasTempDb) && wasTempDb)
+                {
+                    _activeTempDbSpaceAlert[key] = false;
+                    var pct = tempDb != null ? $"{tempDb.UsedPercent:F0}%" : "N/A";
+                    _trayService.ShowNotification(
+                        "TempDB Space Resolved",
+                        $"{summary.DisplayName}: TempDB usage back to {pct}",
+                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+                }
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("Alerts", $"Failed to check TempDB space for {summary.DisplayName}: {ex.Message}");
+            }
+        }
+
+        /* Anomalous Agent job alerts */
+        if (App.AlertLongRunningJobEnabled && _dataService != null)
+        {
+            try
+            {
+                var anomalousJobs = await _dataService.GetAnomalousJobsAsync(summary.ServerId, App.AlertLongRunningJobMultiplier);
+
+                if (anomalousJobs.Count > 0)
+                {
+                    _activeLongRunningJobAlert[key] = true;
+                    var worst = anomalousJobs[0];
+                    var jobKey = $"{key}:{worst.JobId}:{worst.StartTime:O}";
+
+                    if (!suppressPopups && (!_lastLongRunningJobAlert.TryGetValue(jobKey, out var lastJob) || now - lastJob >= AlertCooldown))
+                    {
+                        var currentMinutes = worst.CurrentDurationSeconds / 60;
+                        _trayService.ShowNotification(
+                            "Long-Running Job",
+                            $"{summary.DisplayName}: {worst.JobName} at {worst.PercentOfAverage:F0}% of avg ({currentMinutes}m)",
+                            Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Warning);
+                        _lastLongRunningJobAlert[jobKey] = now;
+
+                        var jobContext = BuildAnomalousJobContext(anomalousJobs);
+
+                        await _emailAlertService.TrySendAlertEmailAsync(
+                            "Long-Running Job",
+                            summary.DisplayName,
+                            $"{anomalousJobs.Count} job(s) exceeding {App.AlertLongRunningJobMultiplier}x average",
+                            $"{App.AlertLongRunningJobMultiplier}x historical avg",
+                            summary.ServerId,
+                            jobContext);
+                    }
+                }
+                else if (_activeLongRunningJobAlert.TryGetValue(key, out var wasJob) && wasJob)
+                {
+                    _activeLongRunningJobAlert[key] = false;
+                    _trayService.ShowNotification(
+                        "Long-Running Jobs Cleared",
+                        $"{summary.DisplayName}: No jobs exceeding threshold",
+                        Hardcodet.Wpf.TaskbarNotification.BalloonIcon.Info);
+                }
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Error("Alerts", $"Failed to check anomalous jobs for {summary.DisplayName}: {ex.Message}");
+            }
+        }
     }
 
         private static string TruncateText(string text, int maxLength = 300)
@@ -1114,4 +1328,106 @@ private static string TruncateText(string text, int maxLength = 300)
                 return null;
             }
         }
+
+        private static AlertContext? BuildPoisonWaitContext(List<PoisonWaitDelta> triggeredWaits)
+        {
+            if (triggeredWaits.Count == 0) return null;
+
+            var context = new AlertContext();
+            foreach (var w in triggeredWaits)
+            {
+                context.Details.Add(new AlertDetailItem
+                {
+                    Heading = w.WaitType,
+                    Fields = new()
+                    {
+                        ("Avg ms/wait", $"{w.AvgMsPerWait:F1}"),
+                        ("Delta wait ms", $"{w.DeltaMs:N0}"),
+                        ("Delta tasks", $"{w.DeltaTasks:N0}")
+                    }
+                });
+            }
+            return context;
+        }
+
+        private static AlertContext? BuildLongRunningQueryContext(List<LongRunningQueryInfo> queries)
+        {
+            if (queries.Count == 0) return null;
+
+            var context = new AlertContext();
+            foreach (var q in queries.GetRange(0, Math.Min(3, queries.Count)))
+            {
+                var item = new AlertDetailItem
+                {
+                    Heading = $"Session #{q.SessionId} — {q.ElapsedSeconds / 60}m {q.ElapsedSeconds % 60}s",
+                    Fields = new()
+                };
+
+                if (!string.IsNullOrEmpty(q.DatabaseName))
+                    item.Fields.Add(("Database", q.DatabaseName));
+                if (!string.IsNullOrEmpty(q.QueryText))
+                    item.Fields.Add(("Query", TruncateText(q.QueryText)));
+                item.Fields.Add(("CPU Time", $"{q.CpuTimeMs:N0} ms"));
+                item.Fields.Add(("Reads", $"{q.Reads:N0}"));
+                item.Fields.Add(("Writes", $"{q.Writes:N0}"));
+                if (!string.IsNullOrEmpty(q.WaitType))
+                    item.Fields.Add(("Wait Type", q.WaitType));
+                if (q.BlockingSessionId.HasValue && q.BlockingSessionId.Value > 0)
+                    item.Fields.Add(("Blocked By", $"Session #{q.BlockingSessionId.Value}"));
+
+                context.Details.Add(item);
+            }
+            return context;
+        }
+
+        private static AlertContext? BuildTempDbSpaceContext(TempDbSpaceInfo tempDb)
+        {
+            var context = new AlertContext();
+            context.Details.Add(new AlertDetailItem
+            {
+                Heading = $"TempDB — {tempDb.UsedPercent:F0}% Used",
+                Fields = new()
+                {
+                    ("Total Reserved", $"{tempDb.TotalReservedMb:F0} MB"),
+                    ("Unallocated", $"{tempDb.UnallocatedMb:F0} MB"),
+                    ("User Objects", $"{tempDb.UserObjectReservedMb:F0} MB"),
+                    ("Internal Objects", $"{tempDb.InternalObjectReservedMb:F0} MB"),
+                    ("Version Store", $"{tempDb.VersionStoreReservedMb:F0} MB"),
+                    ("Top Consumer", tempDb.TopConsumerSessionId > 0
+                        ? $"Session #{tempDb.TopConsumerSessionId} ({tempDb.TopConsumerMb:F0} MB)"
+                        : "None")
+                }
+            });
+            return context;
+        }
+
+        private static AlertContext? BuildAnomalousJobContext(List<AnomalousJobInfo> jobs)
+        {
+            if (jobs.Count == 0) return null;
+
+            var context = new AlertContext();
+            foreach (var j in jobs.GetRange(0, Math.Min(3, jobs.Count)))
+            {
+                context.Details.Add(new AlertDetailItem
+                {
+                    Heading = j.JobName,
+                    Fields = new()
+                    {
+                        ("Current Duration", FormatDuration(j.CurrentDurationSeconds)),
+                        ("Avg Duration", FormatDuration(j.AvgDurationSeconds)),
+                        ("P95 Duration", FormatDuration(j.P95DurationSeconds)),
+                        ("% of Average", j.PercentOfAverage.HasValue ? $"{j.PercentOfAverage:F0}%" : "N/A"),
+                        ("Started", j.StartTime.ToString("yyyy-MM-dd HH:mm:ss"))
+                    }
+                });
+            }
+            return context;
+        }
+
+        private static string FormatDuration(long seconds)
+        {
+            if (seconds < 60) return $"{seconds}s";
+            if (seconds < 3600) return $"{seconds / 60}m {seconds % 60}s";
+            return $"{seconds / 3600}h {(seconds % 3600) / 60}m";
+        }
     }
diff --git a/Lite/Services/EmailAlertService.cs b/Lite/Services/EmailAlertService.cs
index afed9b7e..f837221e 100644
--- a/Lite/Services/EmailAlertService.cs
+++ b/Lite/Services/EmailAlertService.cs
@@ -52,68 +52,66 @@ public async Task TrySendAlertEmailAsync(
     {
         try
         {
-            if (!App.SmtpEnabled) return;
-
-            if (string.IsNullOrWhiteSpace(App.SmtpServer) ||
-                string.IsNullOrWhiteSpace(App.SmtpFromAddress) ||
-                string.IsNullOrWhiteSpace(App.SmtpRecipients))
-            {
-                return;
-            }
-
-            /* Check cooldown */
-            var cooldownKey = $"{serverId}:{metricName}";
-            if (_cooldowns.TryGetValue(cooldownKey, out var lastSent) &&
-                DateTime.UtcNow - lastSent < CooldownPeriod)
-            {
-                return;
-            }
-
-            var subject = $"[SQL Monitor Alert] {metricName} on {serverName}";
-            var (htmlBody, plainTextBody) = EmailTemplateBuilder.BuildAlertEmail(
-                metricName, serverName, currentValue, thresholdValue, context);
-
             string? sendError = null;
             bool sent = false;
+            var notificationType = "tray";
 
-            try
+            /* Attempt email delivery if SMTP is fully configured */
+            if (App.SmtpEnabled &&
+                !string.IsNullOrWhiteSpace(App.SmtpServer) &&
+                !string.IsNullOrWhiteSpace(App.SmtpFromAddress) &&
+                !string.IsNullOrWhiteSpace(App.SmtpRecipients))
             {
-                await SendEmailAsync(subject, htmlBody, plainTextBody, context);
-                sent = true;
-                _cooldowns[cooldownKey] = DateTime.UtcNow;
+                var cooldownKey = $"{serverId}:{metricName}";
+                var withinCooldown = _cooldowns.TryGetValue(cooldownKey, out var lastSent) &&
+                    DateTime.UtcNow - lastSent < CooldownPeriod;
 
-                /* Log recovery if we had previous failures */
-                if (_consecutiveSmtpFailures > 0)
-                {
-                    AppLogger.Info("EmailAlert", $"Email delivery recovered after {_consecutiveSmtpFailures} failure(s)");
-                }
-                _consecutiveSmtpFailures = 0;
-                _lastSmtpError = null;
-
-                AppLogger.Info("EmailAlert", $"Alert email sent for {metricName} on {serverName}");
-            }
-            catch (Exception ex)
-            {
-                sendError = ex.Message;
-                _consecutiveSmtpFailures++;
-                _lastSmtpError = ex.Message;
-
-                /* Loud on first 3 failures, then periodic reminders */
-                if (_consecutiveSmtpFailures <= 3)
-                {
-                    AppLogger.Error("EmailAlert", $"ALERT EMAIL FAILED ({_consecutiveSmtpFailures}x): {ex.GetType().Name}: {ex.Message}");
-                }
-                else if (_consecutiveSmtpFailures % 50 == 0)
+                if (!withinCooldown)
                 {
-                    AppLogger.Error("EmailAlert", $"ALERT EMAIL STILL FAILING: {_consecutiveSmtpFailures} consecutive failures. Last error: {ex.Message}");
+                    notificationType = "email";
+
+                    var subject = $"[SQL Monitor Alert] {metricName} on {serverName}";
+                    var (htmlBody, plainTextBody) = EmailTemplateBuilder.BuildAlertEmail(
+                        metricName, serverName, currentValue, thresholdValue, context);
+
+                    try
+                    {
+                        await SendEmailAsync(subject, htmlBody, plainTextBody, context);
+                        sent = true;
+                        _cooldowns[cooldownKey] = DateTime.UtcNow;
+
+                        if (_consecutiveSmtpFailures > 0)
+                        {
+                            AppLogger.Info("EmailAlert", $"Email delivery recovered after {_consecutiveSmtpFailures} failure(s)");
+                        }
+                        _consecutiveSmtpFailures = 0;
+                        _lastSmtpError = null;
+
+                        AppLogger.Info("EmailAlert", $"Alert email sent for {metricName} on {serverName}");
+                    }
+                    catch (Exception ex)
+                    {
+                        sendError = ex.Message;
+                        _consecutiveSmtpFailures++;
+                        _lastSmtpError = ex.Message;
+
+                        if (_consecutiveSmtpFailures <= 3)
+                        {
+                            AppLogger.Error("EmailAlert", $"ALERT EMAIL FAILED ({_consecutiveSmtpFailures}x): {ex.GetType().Name}: {ex.Message}");
+                        }
+                        else if (_consecutiveSmtpFailures % 50 == 0)
+                        {
+                            AppLogger.Error("EmailAlert", $"ALERT EMAIL STILL FAILING: {_consecutiveSmtpFailures} consecutive failures. Last error: {ex.Message}");
+                        }
+                    }
                 }
             }
 
-            /* Log the alert attempt to DuckDB */
+            /* Always log the alert to DuckDB, regardless of email status */
             await LogAlertAsync(serverId, serverName, metricName,
                 double.TryParse(currentValue.TrimEnd('%'), out var cv) ? cv : 0,
                 double.TryParse(thresholdValue.TrimEnd('%'), out var tv) ? tv : 0,
-                sent, "email", sendError);
+                sent, notificationType, sendError);
         }
         catch (Exception ex)
         {
diff --git a/Lite/Services/EmailTemplateBuilder.cs b/Lite/Services/EmailTemplateBuilder.cs
index 90ba27f7..478f72d5 100644
--- a/Lite/Services/EmailTemplateBuilder.cs
+++ b/Lite/Services/EmailTemplateBuilder.cs
@@ -71,6 +71,10 @@ private static (string AccentColor, string BadgeText) GetSeverity(string metricN
             "Blocking Detected" => ("#D97706", "ALERT"),
             "Deadlocks Detected" => ("#DC2626", "ALERT"),
             "High CPU" => ("#F59E0B", "WARNING"),
+            "Poison Wait" => ("#DC2626", "CRITICAL"),
+            "Long-Running Query" => ("#D97706", "WARNING"),
+            "TempDB Space" => ("#D97706", "WARNING"),
+            "Long-Running Job" => ("#D97706", "WARNING"),
             _ => ("#2eaef1", "INFO")
         };
     }
diff --git a/Lite/Services/LocalDataService.AlertHistory.cs b/Lite/Services/LocalDataService.AlertHistory.cs
new file mode 100644
index 00000000..38dfc239
--- /dev/null
+++ b/Lite/Services/LocalDataService.AlertHistory.cs
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using DuckDB.NET.Data;
+
+namespace PerformanceMonitorLite.Services;
+
+public partial class LocalDataService
+{
+    /// <summary>
+    /// Gets alert history from the config_alert_log table (excludes dismissed alerts).
+    /// </summary>
+    public async Task<List<AlertHistoryRow>> GetAlertHistoryAsync(int hoursBack = 24, int limit = 500, int? serverId = null)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var cutoff = DateTime.UtcNow.AddHours(-hoursBack);
+
+        if (serverId.HasValue)
+        {
+            command.CommandText = @"
+SELECT
+    alert_time,
+    server_id,
+    server_name,
+    metric_name,
+    current_value,
+    threshold_value,
+    alert_sent,
+    notification_type,
+    send_error
+FROM config_alert_log
+WHERE alert_time >= $1
+AND   server_id = $2
+AND   dismissed = FALSE
+ORDER BY alert_time DESC
+LIMIT $3";
+            command.Parameters.Add(new DuckDBParameter { Value = cutoff });
+            command.Parameters.Add(new DuckDBParameter { Value = serverId.Value });
+            command.Parameters.Add(new DuckDBParameter { Value = limit });
+        }
+        else
+        {
+            command.CommandText = @"
+SELECT
+    alert_time,
+    server_id,
+    server_name,
+    metric_name,
+    current_value,
+    threshold_value,
+    alert_sent,
+    notification_type,
+    send_error
+FROM config_alert_log
+WHERE alert_time >= $1
+AND   dismissed = FALSE
+ORDER BY alert_time DESC
+LIMIT $2";
+            command.Parameters.Add(new DuckDBParameter { Value = cutoff });
+            command.Parameters.Add(new DuckDBParameter { Value = limit });
+        }
+
+        var items = new List<AlertHistoryRow>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new AlertHistoryRow
+            {
+                AlertTime = reader.GetDateTime(0),
+                ServerId = (int)ToInt64(reader.GetValue(1)),
+                ServerName = reader.GetString(2),
+                MetricName = reader.GetString(3),
+                CurrentValue = Convert.ToDouble(reader.GetValue(4)),
+                ThresholdValue = Convert.ToDouble(reader.GetValue(5)),
+                AlertSent = reader.GetBoolean(6),
+                NotificationType = reader.GetString(7),
+                SendError = reader.IsDBNull(8) ? null : reader.GetString(8)
+            });
+        }
+
+        return items;
+    }
+
+    /// <summary>
+    /// Dismisses specific alerts by marking them as dismissed in DuckDB.
+    /// Identifies rows by (alert_time, server_id, metric_name) composite key.
+    /// </summary>
+    public async Task DismissAlertsAsync(List<AlertHistoryRow> alerts)
+    {
+        if (alerts.Count == 0) return;
+
+        using var connection = await OpenConnectionAsync();
+
+        foreach (var alert in alerts)
+        {
+            using var command = connection.CreateCommand();
+            command.CommandText = @"
+UPDATE config_alert_log
+SET    dismissed = TRUE
+WHERE  alert_time = $1
+AND    server_id = $2
+AND    metric_name = $3";
+            command.Parameters.Add(new DuckDBParameter { Value = alert.AlertTime });
+            command.Parameters.Add(new DuckDBParameter { Value = alert.ServerId });
+            command.Parameters.Add(new DuckDBParameter { Value = alert.MetricName });
+            await command.ExecuteNonQueryAsync();
+        }
+    }
+
+    /// <summary>
+    /// Dismisses all visible (non-dismissed) alerts matching the current filter criteria.
+    /// </summary>
+    public async Task DismissAllVisibleAlertsAsync(int hoursBack, int? serverId = null)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var cutoff = DateTime.UtcNow.AddHours(-hoursBack);
+
+        if (serverId.HasValue)
+        {
+            command.CommandText = @"
+UPDATE config_alert_log
+SET    dismissed = TRUE
+WHERE  alert_time >= $1
+AND    server_id = $2
+AND    dismissed = FALSE";
+            command.Parameters.Add(new DuckDBParameter { Value = cutoff });
+            command.Parameters.Add(new DuckDBParameter { Value = serverId.Value });
+        }
+        else
+        {
+            command.CommandText = @"
+UPDATE config_alert_log
+SET    dismissed = TRUE
+WHERE  alert_time >= $1
+AND    dismissed = FALSE";
+            command.Parameters.Add(new DuckDBParameter { Value = cutoff });
+        }
+
+        await command.ExecuteNonQueryAsync();
+    }
+}
+
+public class AlertHistoryRow
+{
+    public DateTime AlertTime { get; set; }
+    public int ServerId { get; set; }
+    public string ServerName { get; set; } = "";
+    public string MetricName { get; set; } = "";
+    public double CurrentValue { get; set; }
+    public double ThresholdValue { get; set; }
+    public bool AlertSent { get; set; }
+    public string NotificationType { get; set; } = "";
+    public string? SendError { get; set; }
+
+    public string TimeLocal => AlertTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss");
+    public string CurrentValueDisplay => FormatValue(MetricName, CurrentValue);
+    public string ThresholdValueDisplay => FormatValue(MetricName, ThresholdValue);
+
+    public string StatusDisplay
+    {
+        get
+        {
+            if (NotificationType == "email")
+                return AlertSent ? "Sent" : (!string.IsNullOrEmpty(SendError) ? "Failed" : "Not sent");
+            return AlertSent ? "Delivered" : "Shown";
+        }
+    }
+
+    public bool IsResolved => MetricName.Contains("Cleared") || MetricName.Contains("Resolved");
+    public bool IsCritical => MetricName.Contains("Deadlock") || MetricName.Contains("Poison");
+    public bool IsWarning => !IsResolved && !IsCritical;
+
+    private static string FormatValue(string metricName, double value)
+    {
+        if (metricName.Contains("CPU")) return $"{value:F0}%";
+        if (metricName.Contains("TempDB")) return $"{value:F0}%";
+        return $"{value:G}";
+    }
+}
diff --git a/Lite/Services/LocalDataService.RunningJobs.cs b/Lite/Services/LocalDataService.RunningJobs.cs
index 1d58d9a9..158df4a5 100644
--- a/Lite/Services/LocalDataService.RunningJobs.cs
+++ b/Lite/Services/LocalDataService.RunningJobs.cs
@@ -69,6 +69,67 @@ FROM running_jobs
 
         return items;
     }
+
+    /// <summary>
+    /// Gets running jobs that exceed the anomaly threshold (multiplier x average duration).
+    /// Excludes jobs with avg < 60s to avoid noise from very short jobs.
+    /// </summary>
+    public async Task<List<AnomalousJobInfo>> GetAnomalousJobsAsync(int serverId, int multiplier)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var thresholdPercent = (decimal)(multiplier * 100);
+
+        command.CommandText = @"
+SELECT
+    job_name,
+    job_id,
+    current_duration_seconds,
+    avg_duration_seconds,
+    p95_duration_seconds,
+    percent_of_average,
+    start_time
+FROM running_jobs
+WHERE server_id = $1
+AND collection_time = (SELECT MAX(collection_time) FROM running_jobs WHERE server_id = $1)
+AND avg_duration_seconds >= 60
+AND percent_of_average >= $2
+ORDER BY percent_of_average DESC
+LIMIT 5";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = thresholdPercent });
+
+        var items = new List<AnomalousJobInfo>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new AnomalousJobInfo
+            {
+                JobName = reader.GetString(0),
+                JobId = reader.GetString(1),
+                CurrentDurationSeconds = ToInt64(reader.GetValue(2)),
+                AvgDurationSeconds = ToInt64(reader.GetValue(3)),
+                P95DurationSeconds = ToInt64(reader.GetValue(4)),
+                PercentOfAverage = reader.IsDBNull(5) ? null : Convert.ToDecimal(reader.GetValue(5)),
+                StartTime = reader.GetDateTime(6)
+            });
+        }
+
+        return items;
+    }
+}
+
+public class AnomalousJobInfo
+{
+    public string JobName { get; set; } = "";
+    public string JobId { get; set; } = "";
+    public long CurrentDurationSeconds { get; set; }
+    public long AvgDurationSeconds { get; set; }
+    public long P95DurationSeconds { get; set; }
+    public decimal? PercentOfAverage { get; set; }
+    public DateTime StartTime { get; set; }
 }
 
 public class RunningJobRow
diff --git a/Lite/Services/LocalDataService.TempDb.cs b/Lite/Services/LocalDataService.TempDb.cs
index 146c5259..0b4e1bba 100644
--- a/Lite/Services/LocalDataService.TempDb.cs
+++ b/Lite/Services/LocalDataService.TempDb.cs
@@ -66,6 +66,63 @@ FROM tempdb_stats
 
         return items;
     }
+
+    /// <summary>
+    /// Gets the latest TempDB space snapshot for alert checking.
+    /// </summary>
+    public async Task<TempDbSpaceInfo?> GetLatestTempDbSpaceAsync(int serverId)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        command.CommandText = @"
+SELECT
+    total_reserved_mb,
+    unallocated_mb,
+    user_object_reserved_mb,
+    internal_object_reserved_mb,
+    version_store_reserved_mb,
+    top_session_tempdb_mb,
+    top_session_id
+FROM tempdb_stats
+WHERE server_id = $1
+ORDER BY collection_time DESC
+LIMIT 1";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+
+        using var reader = await command.ExecuteReaderAsync();
+        if (await reader.ReadAsync())
+        {
+            return new TempDbSpaceInfo
+            {
+                TotalReservedMb = reader.IsDBNull(0) ? 0 : ToDouble(reader.GetValue(0)),
+                UnallocatedMb = reader.IsDBNull(1) ? 0 : ToDouble(reader.GetValue(1)),
+                UserObjectReservedMb = reader.IsDBNull(2) ? 0 : ToDouble(reader.GetValue(2)),
+                InternalObjectReservedMb = reader.IsDBNull(3) ? 0 : ToDouble(reader.GetValue(3)),
+                VersionStoreReservedMb = reader.IsDBNull(4) ? 0 : ToDouble(reader.GetValue(4)),
+                TopConsumerMb = reader.IsDBNull(5) ? 0 : ToDouble(reader.GetValue(5)),
+                TopConsumerSessionId = reader.IsDBNull(6) ? 0 : reader.GetInt32(6)
+            };
+        }
+
+        return null;
+    }
+}
+
+public class TempDbSpaceInfo
+{
+    public double TotalReservedMb { get; set; }
+    public double UnallocatedMb { get; set; }
+    public double UserObjectReservedMb { get; set; }
+    public double InternalObjectReservedMb { get; set; }
+    public double VersionStoreReservedMb { get; set; }
+    public int TopConsumerSessionId { get; set; }
+    public double TopConsumerMb { get; set; }
+
+    public double UsedPercent => TotalReservedMb + UnallocatedMb > 0
+        ? TotalReservedMb / (TotalReservedMb + UnallocatedMb) * 100
+        : 0;
 }
 
 public class TempDbRow
diff --git a/Lite/Services/LocalDataService.WaitStats.cs b/Lite/Services/LocalDataService.WaitStats.cs
index b4c73d06..406bdd57 100644
--- a/Lite/Services/LocalDataService.WaitStats.cs
+++ b/Lite/Services/LocalDataService.WaitStats.cs
@@ -148,6 +148,124 @@ FROM raw
 
         return items;
     }
+
+    /// <summary>
+    /// Gets the latest poison wait deltas for alert checking.
+    /// Returns entries where delta_waiting_tasks > 0 with computed avg ms per wait.
+    /// </summary>
+    public async Task<List<PoisonWaitDelta>> GetLatestPoisonWaitAvgsAsync(int serverId)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        command.CommandText = @"
+SELECT
+    wait_type,
+    delta_wait_time_ms AS delta_ms,
+    delta_waiting_tasks AS delta_tasks,
+    CASE WHEN delta_waiting_tasks > 0
+    THEN CAST(delta_wait_time_ms AS DOUBLE) / delta_waiting_tasks
+    ELSE 0 END AS avg_ms_per_wait
+FROM wait_stats
+WHERE server_id = $1
+AND wait_type IN ('THREADPOOL', 'RESOURCE_SEMAPHORE', 'RESOURCE_SEMAPHORE_QUERY_COMPILE')
+AND delta_waiting_tasks > 0
+ORDER BY collection_time DESC
+LIMIT 3";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+
+        var items = new List<PoisonWaitDelta>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new PoisonWaitDelta
+            {
+                WaitType = reader.GetString(0),
+                DeltaMs = reader.IsDBNull(1) ? 0 : reader.GetInt64(1),
+                DeltaTasks = reader.IsDBNull(2) ? 0 : reader.GetInt64(2),
+                AvgMsPerWait = reader.IsDBNull(3) ? 0 : reader.GetDouble(3)
+            });
+        }
+
+        return items;
+    }
+
+    /// <summary>
+    /// Gets long-running queries from the latest collection snapshot.
+    /// Returns sessions whose total elapsed time exceeds the given threshold.
+    /// </summary>
+    public async Task<List<LongRunningQueryInfo>> GetLongRunningQueriesAsync(int serverId, int thresholdMinutes)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var thresholdMs = (long)thresholdMinutes * 60 * 1000;
+
+        command.CommandText = @"
+SELECT
+    session_id,
+    database_name,
+    SUBSTRING(query_text, 1, 300) AS query_text,
+    total_elapsed_time_ms / 1000 AS elapsed_seconds,
+    cpu_time_ms,
+    reads,
+    writes,
+    wait_type,
+    blocking_session_id
+FROM query_snapshots
+WHERE server_id = $1
+AND collection_time = (SELECT MAX(collection_time) FROM query_snapshots WHERE server_id = $1)
+AND session_id > 50
+AND total_elapsed_time_ms >= $2
+ORDER BY total_elapsed_time_ms DESC
+LIMIT 5";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = thresholdMs });
+
+        var items = new List<LongRunningQueryInfo>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new LongRunningQueryInfo
+            {
+                SessionId = reader.IsDBNull(0) ? 0 : reader.GetInt32(0),
+                DatabaseName = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                QueryText = reader.IsDBNull(2) ? "" : reader.GetString(2),
+                ElapsedSeconds = reader.IsDBNull(3) ? 0 : reader.GetInt64(3),
+                CpuTimeMs = reader.IsDBNull(4) ? 0 : reader.GetInt64(4),
+                Reads = reader.IsDBNull(5) ? 0 : reader.GetInt64(5),
+                Writes = reader.IsDBNull(6) ? 0 : reader.GetInt64(6),
+                WaitType = reader.IsDBNull(7) ? null : reader.GetString(7),
+                BlockingSessionId = reader.IsDBNull(8) ? null : (int?)reader.GetInt32(8)
+            });
+        }
+
+        return items;
+    }
+}
+
+public class LongRunningQueryInfo
+{
+    public int SessionId { get; set; }
+    public string DatabaseName { get; set; } = "";
+    public string QueryText { get; set; } = "";
+    public string ProgramName { get; set; } = "";
+    public long ElapsedSeconds { get; set; }
+    public long CpuTimeMs { get; set; }
+    public long Reads { get; set; }
+    public long Writes { get; set; }
+    public string? WaitType { get; set; }
+    public int? BlockingSessionId { get; set; }
+}
+
+public class PoisonWaitDelta
+{
+    public string WaitType { get; set; } = "";
+    public long DeltaMs { get; set; }
+    public long DeltaTasks { get; set; }
+    public double AvgMsPerWait { get; set; }
 }
 
 public class WaitStatsRow
diff --git a/Lite/Windows/SettingsWindow.xaml b/Lite/Windows/SettingsWindow.xaml
index 26641c98..a9c65ec3 100644
--- a/Lite/Windows/SettingsWindow.xaml
+++ b/Lite/Windows/SettingsWindow.xaml
@@ -120,6 +120,34 @@
                               Foreground="{DynamicResource ForegroundBrush}"/>
                     <TextBox x:Name="AlertDeadlockThresholdBox" Width="45" Text="1" Margin="6,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="20,6,0,0">
+                    <CheckBox x:Name="AlertPoisonWaitCheckBox" Content="Poison waits (THREADPOOL, etc.) avg wait &#x2265;" VerticalAlignment="Center"
+                              Foreground="{DynamicResource ForegroundBrush}"/>
+                    <TextBox x:Name="AlertPoisonWaitThresholdBox" Width="45" Text="500" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                    <TextBlock Text="ms" VerticalAlignment="Center" Margin="2,0,0,0"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="20,6,0,0">
+                    <CheckBox x:Name="AlertLongRunningQueryCheckBox" Content="Long-running queries over" VerticalAlignment="Center"
+                              Foreground="{DynamicResource ForegroundBrush}"/>
+                    <TextBox x:Name="AlertLongRunningQueryThresholdBox" Width="45" Text="30" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                    <TextBlock Text="minutes" VerticalAlignment="Center" Margin="2,0,0,0"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="20,6,0,0">
+                    <CheckBox x:Name="AlertTempDbSpaceCheckBox" Content="TempDB space usage over" VerticalAlignment="Center"
+                              Foreground="{DynamicResource ForegroundBrush}"/>
+                    <TextBox x:Name="AlertTempDbSpaceThresholdBox" Width="45" Text="80" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                    <TextBlock Text="%" VerticalAlignment="Center" Margin="2,0,0,0"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="20,6,0,0">
+                    <CheckBox x:Name="AlertLongRunningJobCheckBox" Content="Agent jobs running over" VerticalAlignment="Center"
+                              Foreground="{DynamicResource ForegroundBrush}"/>
+                    <TextBox x:Name="AlertLongRunningJobMultiplierBox" Width="35" Text="3" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                    <TextBlock Text="x historical average" VerticalAlignment="Center" Margin="2,0,0,0"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                </StackPanel>
             </StackPanel>
         </Border>
 
diff --git a/Lite/Windows/SettingsWindow.xaml.cs b/Lite/Windows/SettingsWindow.xaml.cs
index db67bbeb..025fb5da 100644
--- a/Lite/Windows/SettingsWindow.xaml.cs
+++ b/Lite/Windows/SettingsWindow.xaml.cs
@@ -230,6 +230,14 @@ private void LoadAlertSettings()
         AlertBlockingThresholdBox.Text = App.AlertBlockingThreshold.ToString();
         AlertDeadlockCheckBox.IsChecked = App.AlertDeadlockEnabled;
         AlertDeadlockThresholdBox.Text = App.AlertDeadlockThreshold.ToString();
+        AlertPoisonWaitCheckBox.IsChecked = App.AlertPoisonWaitEnabled;
+        AlertPoisonWaitThresholdBox.Text = App.AlertPoisonWaitThresholdMs.ToString();
+        AlertLongRunningQueryCheckBox.IsChecked = App.AlertLongRunningQueryEnabled;
+        AlertLongRunningQueryThresholdBox.Text = App.AlertLongRunningQueryThresholdMinutes.ToString();
+        AlertTempDbSpaceCheckBox.IsChecked = App.AlertTempDbSpaceEnabled;
+        AlertTempDbSpaceThresholdBox.Text = App.AlertTempDbSpaceThresholdPercent.ToString();
+        AlertLongRunningJobCheckBox.IsChecked = App.AlertLongRunningJobEnabled;
+        AlertLongRunningJobMultiplierBox.Text = App.AlertLongRunningJobMultiplier.ToString();
         UpdateAlertControlStates();
     }
 
@@ -247,6 +255,18 @@ private void SaveAlertSettings()
         App.AlertDeadlockEnabled = AlertDeadlockCheckBox.IsChecked == true;
         if (int.TryParse(AlertDeadlockThresholdBox.Text, out var deadlock) && deadlock > 0)
             App.AlertDeadlockThreshold = deadlock;
+        App.AlertPoisonWaitEnabled = AlertPoisonWaitCheckBox.IsChecked == true;
+        if (int.TryParse(AlertPoisonWaitThresholdBox.Text, out var poisonWait) && poisonWait > 0)
+            App.AlertPoisonWaitThresholdMs = poisonWait;
+        App.AlertLongRunningQueryEnabled = AlertLongRunningQueryCheckBox.IsChecked == true;
+        if (int.TryParse(AlertLongRunningQueryThresholdBox.Text, out var lrq) && lrq > 0)
+            App.AlertLongRunningQueryThresholdMinutes = lrq;
+        App.AlertTempDbSpaceEnabled = AlertTempDbSpaceCheckBox.IsChecked == true;
+        if (int.TryParse(AlertTempDbSpaceThresholdBox.Text, out var tempDb) && tempDb > 0 && tempDb <= 100)
+            App.AlertTempDbSpaceThresholdPercent = tempDb;
+        App.AlertLongRunningJobEnabled = AlertLongRunningJobCheckBox.IsChecked == true;
+        if (int.TryParse(AlertLongRunningJobMultiplierBox.Text, out var jobMult) && jobMult >= 2 && jobMult <= 20)
+            App.AlertLongRunningJobMultiplier = jobMult;
 
         var settingsPath = Path.Combine(App.ConfigDirectory, "settings.json");
         try
@@ -271,6 +291,14 @@ private void SaveAlertSettings()
             root["alert_blocking_threshold"] = App.AlertBlockingThreshold;
             root["alert_deadlock_enabled"] = App.AlertDeadlockEnabled;
             root["alert_deadlock_threshold"] = App.AlertDeadlockThreshold;
+            root["alert_poison_wait_enabled"] = App.AlertPoisonWaitEnabled;
+            root["alert_poison_wait_threshold_ms"] = App.AlertPoisonWaitThresholdMs;
+            root["alert_long_running_query_enabled"] = App.AlertLongRunningQueryEnabled;
+            root["alert_long_running_query_threshold_minutes"] = App.AlertLongRunningQueryThresholdMinutes;
+            root["alert_tempdb_space_enabled"] = App.AlertTempDbSpaceEnabled;
+            root["alert_tempdb_space_threshold_percent"] = App.AlertTempDbSpaceThresholdPercent;
+            root["alert_long_running_job_enabled"] = App.AlertLongRunningJobEnabled;
+            root["alert_long_running_job_multiplier"] = App.AlertLongRunningJobMultiplier;
 
             var options = new JsonSerializerOptions { WriteIndented = true };
             File.WriteAllText(settingsPath, root.ToJsonString(options));
@@ -296,6 +324,14 @@ private void UpdateAlertControlStates()
         AlertBlockingThresholdBox.IsEnabled = enabled;
         AlertDeadlockCheckBox.IsEnabled = enabled;
         AlertDeadlockThresholdBox.IsEnabled = enabled;
+        AlertPoisonWaitCheckBox.IsEnabled = enabled;
+        AlertPoisonWaitThresholdBox.IsEnabled = enabled;
+        AlertLongRunningQueryCheckBox.IsEnabled = enabled;
+        AlertLongRunningQueryThresholdBox.IsEnabled = enabled;
+        AlertTempDbSpaceCheckBox.IsEnabled = enabled;
+        AlertTempDbSpaceThresholdBox.IsEnabled = enabled;
+        AlertLongRunningJobCheckBox.IsEnabled = enabled;
+        AlertLongRunningJobMultiplierBox.IsEnabled = enabled;
     }
 
     private void LoadSmtpSettings()

From 81d331669a35abd0b4e38b6b1f2720a9dcd375ce Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 11:25:29 -0500
Subject: [PATCH 12/34] Validate XML processor output before marking rows as
 processed

Deadlock and blocked process XML processors now check whether
sp_BlitzLock / sp_HumanEventsBlockViewer actually produced parsed
results. If 0 results are returned, rows stay unprocessed for
automatic retry on the next run instead of being silently marked
done. Logs NO_RESULTS status with descriptive error message.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 install/23_process_blocked_process_xml.sql | 66 ++++++++++++++++------
 install/25_process_deadlock_xml.sql        | 66 ++++++++++++++++------
 2 files changed, 98 insertions(+), 34 deletions(-)

diff --git a/install/23_process_blocked_process_xml.sql b/install/23_process_blocked_process_xml.sql
index dff182d8..c8090bd0 100644
--- a/install/23_process_blocked_process_xml.sql
+++ b/install/23_process_blocked_process_xml.sql
@@ -50,6 +50,7 @@ BEGIN
         @rows_available integer = 0,
         @rows_deleted bigint = 0,
         @rows_marked bigint = 0,
+        @rows_parsed bigint = 0,
         @start_time datetime2(7) = SYSDATETIME(),
         @error_message nvarchar(4000),
         @error_number integer,
@@ -196,27 +197,48 @@ BEGIN
                 @debug = @debug;
 
             /*
-            Mark raw XML rows as processed
-            Only mark the rows in the date range we just processed
+            Verify sp_HumanEventsBlockViewer produced parsed results before marking rows as processed
+            If no results were inserted, leave rows unprocessed so they are retried next run
             */
-            UPDATE bx
-            SET    bx.is_processed = 1
-            FROM collect.blocked_process_xml AS bx
-            WHERE bx.is_processed = 0
-            AND   (@start_date IS NULL OR bx.event_time >= @start_date)
-            AND   (@end_date IS NULL OR bx.event_time <= @end_date);
-
             SELECT
-                @rows_marked = ROWCOUNT_BIG();
+                @rows_parsed = COUNT_BIG(*)
+            FROM collect.blocking_BlockedProcessReport AS b
+            WHERE b.event_time >= @start_date
+            AND   b.event_time <= @end_date
+            OPTION(RECOMPILE);
+
+            IF @rows_parsed > 0
+            BEGIN
+                /*
+                Mark raw XML rows as processed
+                Only mark the rows in the date range we just processed
+                */
+                UPDATE bx
+                SET    bx.is_processed = 1
+                FROM collect.blocked_process_xml AS bx
+                WHERE bx.is_processed = 0
+                AND   (@start_date IS NULL OR bx.event_time >= @start_date)
+                AND   (@end_date IS NULL OR bx.event_time <= @end_date);
 
-            IF @debug = 1
+                SELECT
+                    @rows_marked = ROWCOUNT_BIG();
+
+                IF @debug = 1
+                BEGIN
+                    RAISERROR(N'Marked %I64d raw XML rows as processed (%I64d parsed blocking events)', 0, 1, @rows_marked, @rows_parsed) WITH NOWAIT;
+                END;
+            END;
+            ELSE
             BEGIN
-                RAISERROR(N'Marked %I64d raw XML rows as processed', 0, 1, @rows_marked) WITH NOWAIT;
+                IF @debug = 1
+                BEGIN
+                    RAISERROR(N'sp_HumanEventsBlockViewer produced 0 parsed results for %d XML events - rows left unprocessed for retry', 0, 1, @rows_available) WITH NOWAIT;
+                END;
             END;
         END;
 
         /*
-        Log successful processing
+        Log processing result
         */
         INSERT INTO
             config.collection_log
@@ -224,19 +246,29 @@ BEGIN
             collector_name,
             collection_status,
             rows_collected,
-            duration_ms
+            duration_ms,
+            error_message
         )
         VALUES
         (
             N'process_blocked_process_xml',
-            N'SUCCESS',
+            CASE WHEN @rows_available = 0 THEN N'SUCCESS'
+                 WHEN @rows_parsed > 0 THEN N'SUCCESS'
+                 ELSE N'NO_RESULTS'
+            END,
             @rows_available,
-            DATEDIFF(MILLISECOND, @start_time, SYSDATETIME())
+            DATEDIFF(MILLISECOND, @start_time, SYSDATETIME()),
+            CASE WHEN @rows_available > 0 AND @rows_parsed = 0
+                 THEN N'sp_HumanEventsBlockViewer returned 0 parsed results for '
+                      + CAST(@rows_available AS nvarchar(20))
+                      + N' XML events - rows left unprocessed for retry'
+                 ELSE NULL
+            END
         );
 
         IF @debug = 1
         BEGIN
-            RAISERROR(N'Processed %d blocked process XML events', 0, 1, @rows_available) WITH NOWAIT;
+            RAISERROR(N'Processed %d blocked process XML events (%I64d parsed results)', 0, 1, @rows_available, @rows_parsed) WITH NOWAIT;
         END;
 
         COMMIT TRANSACTION;
diff --git a/install/25_process_deadlock_xml.sql b/install/25_process_deadlock_xml.sql
index 91fb1974..85c713ce 100644
--- a/install/25_process_deadlock_xml.sql
+++ b/install/25_process_deadlock_xml.sql
@@ -49,6 +49,7 @@ BEGIN
         @rows_available integer = 0,
         @rows_deleted bigint = 0,
         @rows_marked bigint = 0,
+        @rows_parsed bigint = 0,
         @start_time datetime2(7) = SYSDATETIME(),
         @error_message nvarchar(4000),
         @error_number integer,
@@ -189,27 +190,48 @@ BEGIN
                 @debug = @debug;
 
             /*
-            Mark raw XML rows as processed
-            Only mark the rows in the date range we just processed
+            Verify sp_BlitzLock produced parsed results before marking rows as processed
+            If no results were inserted, leave rows unprocessed so they are retried next run
             */
-            UPDATE dx
-            SET    dx.is_processed = 1
-            FROM collect.deadlock_xml AS dx
-            WHERE dx.is_processed = 0
-            AND   (@start_date IS NULL OR dx.event_time >= @start_date)
-            AND   (@end_date IS NULL OR dx.event_time <= @end_date);
-
             SELECT
-                @rows_marked = ROWCOUNT_BIG();
+                @rows_parsed = COUNT_BIG(*)
+            FROM collect.deadlocks AS d
+            WHERE d.event_date >= @start_date
+            AND   d.event_date <= @end_date
+            OPTION(RECOMPILE);
+
+            IF @rows_parsed > 0
+            BEGIN
+                /*
+                Mark raw XML rows as processed
+                Only mark the rows in the date range we just processed
+                */
+                UPDATE dx
+                SET    dx.is_processed = 1
+                FROM collect.deadlock_xml AS dx
+                WHERE dx.is_processed = 0
+                AND   (@start_date IS NULL OR dx.event_time >= @start_date)
+                AND   (@end_date IS NULL OR dx.event_time <= @end_date);
 
-            IF @debug = 1
+                SELECT
+                    @rows_marked = ROWCOUNT_BIG();
+
+                IF @debug = 1
+                BEGIN
+                    RAISERROR(N'Marked %I64d raw XML rows as processed (%I64d parsed deadlocks)', 0, 1, @rows_marked, @rows_parsed) WITH NOWAIT;
+                END;
+            END;
+            ELSE
             BEGIN
-                RAISERROR(N'Marked %I64d raw XML rows as processed', 0, 1, @rows_marked) WITH NOWAIT;
+                IF @debug = 1
+                BEGIN
+                    RAISERROR(N'sp_BlitzLock produced 0 parsed results for %d XML events - rows left unprocessed for retry', 0, 1, @rows_available) WITH NOWAIT;
+                END;
             END;
         END;
 
         /*
-        Log successful processing
+        Log processing result
         */
         INSERT INTO
             config.collection_log
@@ -217,19 +239,29 @@ BEGIN
             collector_name,
             collection_status,
             rows_collected,
-            duration_ms
+            duration_ms,
+            error_message
         )
         VALUES
         (
             N'process_deadlock_xml',
-            N'SUCCESS',
+            CASE WHEN @rows_available = 0 THEN N'SUCCESS'
+                 WHEN @rows_parsed > 0 THEN N'SUCCESS'
+                 ELSE N'NO_RESULTS'
+            END,
             @rows_available,
-            DATEDIFF(MILLISECOND, @start_time, SYSDATETIME())
+            DATEDIFF(MILLISECOND, @start_time, SYSDATETIME()),
+            CASE WHEN @rows_available > 0 AND @rows_parsed = 0
+                 THEN N'sp_BlitzLock returned 0 parsed results for '
+                      + CAST(@rows_available AS nvarchar(20))
+                      + N' XML events - rows left unprocessed for retry'
+                 ELSE NULL
+            END
         );
 
         IF @debug = 1
         BEGIN
-            RAISERROR(N'Processed %d deadlock XML events', 0, 1, @rows_available) WITH NOWAIT;
+            RAISERROR(N'Processed %d deadlock XML events (%I64d parsed results)', 0, 1, @rows_available, @rows_parsed) WITH NOWAIT;
         END;
 
         COMMIT TRANSACTION;

From 0e97b162637a9b1ded0d246a8c0efa8b1ed6c04b Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 12:11:05 -0500
Subject: [PATCH 13/34] It sure was doing that. You know when you remove a
 WHERE clause to make sure something works, and then you get so excited about
 it working that you just sit there marveling at it working and then forget to
 put it back? It me.

Fix Lite deadlock and blocked process collectors inserting duplicate rows (#61). Both collectors query the XE ring buffer every minute but the buffer holds ~10 minutes of events, so each event was inserted ~10 times. Now each collector queries MAX(timestamp) from DuckDB before collection and passes it as a SQL Server parameter to filter out already-collected events. Falls back to a 10-minute window on first run.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 ...teCollectorService.BlockedProcessReport.cs | 29 +++++++++++++++++--
 .../RemoteCollectorService.Deadlocks.cs       | 29 +++++++++++++++++--
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs b/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
index 62f241c5..c66f5957 100644
--- a/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
+++ b/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
@@ -303,7 +303,7 @@ JOIN sys.dm_xe_database_sessions AS xes
     FROM @PerformanceMonitor_BlockedProcess AS pmd
 ) AS rb
 CROSS APPLY rb.ring_buffer.nodes('RingBufferTarget/event[@name=""blocked_process_report""]') AS q(evt)
-WHERE evt.value('(@timestamp)[1]', 'datetime2') > DATEADD(MINUTE, -10, SYSUTCDATETIME())
+WHERE evt.value('(@timestamp)[1]', 'datetime2') > @cutoff_time
 OPTION(RECOMPILE);";
         }
         else
@@ -343,7 +343,7 @@ JOIN sys.dm_xe_sessions AS xes
     FROM @PerformanceMonitor_BlockedProcess AS pmd
 ) AS rb
 CROSS APPLY rb.ring_buffer.nodes('RingBufferTarget/event[@name=""blocked_process_report""]') AS q(evt)
-WHERE evt.value('(@timestamp)[1]', 'datetime2') > DATEADD(MINUTE, -10, SYSUTCDATETIME())
+WHERE evt.value('(@timestamp)[1]', 'datetime2') > @cutoff_time
 OPTION(RECOMPILE);";
         }
 
@@ -353,11 +353,36 @@ WHERE evt.value('(@timestamp)[1]', 'datetime2') > DATEADD(MINUTE, -10, SYSUTCDAT
         _lastSqlMs = 0;
         _lastDuckDbMs = 0;
 
+        /* Query the most recent event_time we already have for this server.
+           Pass it to SQL Server so we only fetch events newer than what we've collected.
+           This prevents the same blocked process report from being inserted multiple times
+           as it lingers in the ring buffer across collection cycles. */
+        DateTime? lastCollectedTime = null;
+        try
+        {
+            using var duckConn = _duckDb.CreateConnection();
+            await duckConn.OpenAsync(cancellationToken);
+            using var cmd = duckConn.CreateCommand();
+            cmd.CommandText = "SELECT MAX(event_time) FROM blocked_process_reports WHERE server_id = $1";
+            cmd.Parameters.Add(new DuckDBParameter { Value = serverId });
+            var result = await cmd.ExecuteScalarAsync(cancellationToken);
+            if (result is DateTime dt)
+                lastCollectedTime = dt;
+        }
+        catch
+        {
+            /* If DuckDB query fails, fall back to default 10-minute window */
+        }
+
         var sqlSw = Stopwatch.StartNew();
         using var sqlConnection = await CreateConnectionAsync(server, cancellationToken);
         using var command = new SqlCommand(query, sqlConnection);
         command.CommandTimeout = CommandTimeoutSeconds;
 
+        /* Use the most recent timestamp from DuckDB as the cutoff, or fall back to 10-minute window */
+        command.Parameters.AddWithValue("@cutoff_time",
+            lastCollectedTime ?? DateTime.UtcNow.AddMinutes(-10));
+
         try
         {
             using var reader = await command.ExecuteReaderAsync(cancellationToken);
diff --git a/Lite/Services/RemoteCollectorService.Deadlocks.cs b/Lite/Services/RemoteCollectorService.Deadlocks.cs
index af40e42d..4a1e5a7e 100644
--- a/Lite/Services/RemoteCollectorService.Deadlocks.cs
+++ b/Lite/Services/RemoteCollectorService.Deadlocks.cs
@@ -302,7 +302,7 @@ JOIN sys.dm_xe_database_sessions AS xes
     FROM @PerformanceMonitor_Deadlock AS pmd
 ) AS rb
 CROSS APPLY rb.ring_buffer.nodes('RingBufferTarget/event[@name=""database_xml_deadlock_report""]') AS q(evt)
-WHERE evt.value('(@timestamp)[1]', 'datetime2') > DATEADD(MINUTE, -10, SYSUTCDATETIME())
+WHERE evt.value('(@timestamp)[1]', 'datetime2') > @cutoff_time
 OPTION(RECOMPILE);";
         }
         else
@@ -343,7 +343,7 @@ JOIN sys.dm_xe_sessions AS xes
     FROM @PerformanceMonitor_Deadlock AS pmd
 ) AS rb
 CROSS APPLY rb.ring_buffer.nodes('RingBufferTarget/event[@name=""xml_deadlock_report""]') AS q(evt)
-WHERE evt.value('(@timestamp)[1]', 'datetime2') > DATEADD(MINUTE, -10, SYSUTCDATETIME())
+WHERE evt.value('(@timestamp)[1]', 'datetime2') > @cutoff_time
 OPTION(RECOMPILE);";
         }
 
@@ -353,11 +353,36 @@ WHERE evt.value('(@timestamp)[1]', 'datetime2') > DATEADD(MINUTE, -10, SYSUTCDAT
         _lastSqlMs = 0;
         _lastDuckDbMs = 0;
 
+        /* Query the most recent deadlock_time we already have for this server.
+           Pass it to SQL Server so we only fetch events newer than what we've collected.
+           This prevents the same deadlock from being inserted multiple times as it
+           lingers in the ring buffer across collection cycles. */
+        DateTime? lastCollectedTime = null;
+        try
+        {
+            using var duckConn = _duckDb.CreateConnection();
+            await duckConn.OpenAsync(cancellationToken);
+            using var cmd = duckConn.CreateCommand();
+            cmd.CommandText = "SELECT MAX(deadlock_time) FROM deadlocks WHERE server_id = $1";
+            cmd.Parameters.Add(new DuckDBParameter { Value = serverId });
+            var result = await cmd.ExecuteScalarAsync(cancellationToken);
+            if (result is DateTime dt)
+                lastCollectedTime = dt;
+        }
+        catch
+        {
+            /* If DuckDB query fails, fall back to default 10-minute window */
+        }
+
         var sqlSw = Stopwatch.StartNew();
         using var sqlConnection = await CreateConnectionAsync(server, cancellationToken);
         using var command = new SqlCommand(query, sqlConnection);
         command.CommandTimeout = CommandTimeoutSeconds;
 
+        /* Use the most recent timestamp from DuckDB as the cutoff, or fall back to 10-minute window */
+        command.Parameters.AddWithValue("@cutoff_time",
+            lastCollectedTime ?? DateTime.UtcNow.AddMinutes(-10));
+
         try
         {
             using var reader = await command.ExecuteReaderAsync(cancellationToken);

From 5a72be797b427f8f06460a9299258dc28e6b9f84 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 12:40:30 -0500
Subject: [PATCH 14/34] Add commercial support tiers to README
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some organizations require a vendor relationship or invoice before deploying
open-source software. Added Supported ($500/yr) and Priority ($2,500/yr) tiers
with links to the blog post and purchase page. No features are gated — the
commercial tiers provide support, compatibility guarantees, and compliance
paperwork.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 README.md | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 52617a12..482460f6 100644
--- a/README.md
+++ b/README.md
@@ -25,16 +25,31 @@ Free, open-source SQL Server performance monitoring in two editions. Built for D
 
 ---
 
-### Support & Professional Services
+### Support, Licensing & Professional Services
 
-**This project is free and open source.** If you find it valuable, consider supporting continued development:
+**This project is free and open source under the MIT License.** The software is fully functional with no features withheld — every user gets the same tool, same collectors, same MCP integration.
+
+However, some organizations have procurement or compliance policies that require a formal vendor relationship, a support agreement, or an invoice on file before software can be deployed to production. If that sounds familiar, two commercial support tiers are available:
+
+| Tier | Annual Cost | What You Get |
+|------|-------------|--------------|
+| **Supported** | $500/year | Email support (2-business-day response), compatibility guarantees for new SQL Server versions, vendor agreement and invoices for compliance, unlimited instances |
+| **Priority** | $2,500/year | Next-business-day email response, quarterly live Q&A sessions, early access to new features, roadmap input, unlimited instances |
+
+Both tiers cover unlimited SQL Server instances. The software itself is identical — commercial support is about the relationship, not a feature gate.
+
+**[Read more about the free tool and commercial options](https://erikdarling.com/free-sql-server-performance-monitoring/)** | **[Purchase a support subscription](https://training.erikdarling.com/sql-monitoring)**
+
+---
+
+**Other ways to support this project:**
 
 | | |
 |---|---|
 | **Sponsor on GitHub** | [Become a sponsor](https://github.com/sponsors/erikdarlingdata) to fund new features, ongoing maintenance, and SQL Server version support. |
 | **Consulting Services** | Need help analyzing the data this tool collects? Want expert assistance fixing the issues it uncovers? [Hire me](https://training.erikdarling.com/sqlconsulting) for hands-on consulting. |
 
-Neither is required — use the tool freely. Sponsorship and consulting keep this project alive.
+None of this is required — use the tool freely. Sponsorship, support subscriptions, and consulting keep this project alive.
 
 ---
 

From 51f4a80c46c3c726cbae3230460bfe6f035b00ca Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 12:52:07 -0500
Subject: [PATCH 15/34] Fix Dashboard sub-tab badges and DuckDB migration for
 dismissed column
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Dashboard: Sub-tab badges (Locking, Memory, Resource Metrics) now update when
alerts fire from the independent alert engine. Previously only the server-level
Overview badge updated. Also fix deadlock badge race condition where
EvaluateAlertConditionsAsync consumed the previous deadlock count before the
badge delta calculation could use it.

Lite: Fix DuckDB v9 migration silently failing — ALTER TABLE ADD COLUMN does
not support NOT NULL constraint in DuckDB. Changed to nullable with DEFAULT.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Dashboard/MainWindow.xaml.cs       | 28 ++++++++++++++++++++--------
 Lite/Database/DuckDbInitializer.cs |  3 ++-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Dashboard/MainWindow.xaml.cs b/Dashboard/MainWindow.xaml.cs
index 3cd34e2f..2c093a3c 100644
--- a/Dashboard/MainWindow.xaml.cs
+++ b/Dashboard/MainWindow.xaml.cs
@@ -902,7 +902,7 @@ public void UpdateAllTabBadges(Dictionary<string, ServerHealthStatus> healthData
         /// Updates a server tab badge from AlertHealthResult (used by the alert engine).
         /// Constructs a minimal ServerHealthStatus for the badge evaluation.
         /// </summary>
-        private void UpdateTabBadgeFromAlertHealth(string serverId, AlertHealthResult health)
+        private void UpdateTabBadgeFromAlertHealth(string serverId, AlertHealthResult health, long prevDeadlockCount)
         {
             if (!_tabBadges.ContainsKey(serverId)) return;
 
@@ -920,14 +920,22 @@ private void UpdateTabBadgeFromAlertHealth(string serverId, AlertHealthResult he
             };
 
             /* Set deadlock count twice to generate a delta.
-               First set establishes baseline (delta=0), second set creates actual delta. */
-            if (_previousDeadlockCounts.TryGetValue(serverId, out var prevDlCount))
-            {
-                status.DeadlockCount = prevDlCount;
-                status.DeadlockCount = health.DeadlockCount;
-            }
+               First set establishes baseline (delta=0), second set creates actual delta.
+               Uses the previous count captured BEFORE EvaluateAlertConditionsAsync updated it. */
+            status.DeadlockCount = prevDeadlockCount;
+            status.DeadlockCount = health.DeadlockCount;
 
             UpdateTabBadge(serverId, status);
+
+            /* Also update sub-tab badges (Locking, Memory, Resource Metrics) in open ServerTab instances */
+            foreach (var tabItem in ServerTabControl.Items.OfType<TabItem>())
+            {
+                if (tabItem.Content is ServerTab serverTab && serverTab.ServerId == serverId)
+                {
+                    serverTab.UpdateBadges(status, _alertStateService);
+                    break;
+                }
+            }
         }
 
         #region Independent Alert Engine
@@ -982,11 +990,15 @@ private async Task CheckAllServerAlertsAsync()
 
                     if (health.IsOnline)
                     {
+                        /* Capture previous deadlock count BEFORE EvaluateAlertConditionsAsync updates it,
+                           so the badge delta calculation sees the correct baseline. */
+                        var prevDeadlockCount = _previousDeadlockCounts.TryGetValue(server.Id, out var pdc) ? pdc : 0;
+
                         await EvaluateAlertConditionsAsync(server.Id, server.DisplayName, health, databaseService);
 
                         /* Update tab badges from alert health data.
                            This ensures badges update even when the NOC view isn't active. */
-                        await Dispatcher.InvokeAsync(() => UpdateTabBadgeFromAlertHealth(server.Id, health));
+                        await Dispatcher.InvokeAsync(() => UpdateTabBadgeFromAlertHealth(server.Id, health, prevDeadlockCount));
                     }
                 }
                 catch (Exception ex)
diff --git a/Lite/Database/DuckDbInitializer.cs b/Lite/Database/DuckDbInitializer.cs
index 53b56aa3..809fb1ea 100644
--- a/Lite/Database/DuckDbInitializer.cs
+++ b/Lite/Database/DuckDbInitializer.cs
@@ -320,7 +320,8 @@ Safe to ALTER because this table uses INSERT (not appender). */
             _logger?.LogInformation("Running migration to v9: adding dismissed column to config_alert_log");
             try
             {
-                await ExecuteNonQueryAsync(connection, "ALTER TABLE config_alert_log ADD COLUMN IF NOT EXISTS dismissed BOOLEAN NOT NULL DEFAULT false");
+                /* DuckDB does not support ADD COLUMN with NOT NULL — use nullable with DEFAULT */
+                await ExecuteNonQueryAsync(connection, "ALTER TABLE config_alert_log ADD COLUMN IF NOT EXISTS dismissed BOOLEAN DEFAULT false");
             }
             catch
             {

From f60d65400fc5e5ad77c4893941339dcbbf28fb1d Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 15:21:05 -0500
Subject: [PATCH 16/34] Add hover tooltips to all Dashboard charts (fixes #70)

Wire ChartHoverHelper to every remaining chart in the Dashboard that
was missing mouse-over tooltips showing series name, value, and
timestamp:

- MemoryContent: 5 charts (overview, grants, clerks, plan cache, pressure)
- QueryPerformanceContent: 4 charts (query/proc/QS durations, exec counts)
- SystemEventsContent: 19 charts (corruption, contention, errors, IO,
  scheduler, memory conditions, CPU tasks, memory broker, node OOM)
- ResourceMetricsContent: 6 charts (CPU utilization, TempDB stats/latency,
  server trends CPU/TempDB/memory/perfmon)
- ServerTab: 9 charts (4 resource overview + 5 locking trends)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Dashboard/Controls/MemoryContent.xaml.cs      | 31 ++++++-
 .../Controls/QueryPerformanceContent.xaml.cs  | 23 ++++-
 .../Controls/ResourceMetricsContent.xaml.cs   | 31 +++++++
 .../Controls/SystemEventsContent.xaml.cs      | 88 ++++++++++++++++++-
 Dashboard/ServerTab.xaml.cs                   | 47 +++++++++-
 5 files changed, 212 insertions(+), 8 deletions(-)

diff --git a/Dashboard/Controls/MemoryContent.xaml.cs b/Dashboard/Controls/MemoryContent.xaml.cs
index 56ffdec8..b9c7c9e6 100644
--- a/Dashboard/Controls/MemoryContent.xaml.cs
+++ b/Dashboard/Controls/MemoryContent.xaml.cs
@@ -62,6 +62,13 @@ public partial class MemoryContent : UserControl
         // Legend panel references for edge-based legends (ScottPlot issue #4717 workaround)
         private Dictionary<ScottPlot.WPF.WpfPlot, ScottPlot.IPanel?> _legendPanels = new();
 
+        // Chart hover tooltips
+        private Helpers.ChartHoverHelper? _memoryStatsOverviewHover;
+        private Helpers.ChartHoverHelper? _memoryGrantsHover;
+        private Helpers.ChartHoverHelper? _memoryClerksHover;
+        private Helpers.ChartHoverHelper? _planCacheHover;
+        private Helpers.ChartHoverHelper? _memoryPressureEventsHover;
+
         // No DataGrids with filters - all tabs are chart-only
 
         public MemoryContent()
@@ -69,6 +76,12 @@ public MemoryContent()
             InitializeComponent();
             SetupChartContextMenus();
             Loaded += OnLoaded;
+
+            _memoryStatsOverviewHover = new Helpers.ChartHoverHelper(MemoryStatsOverviewChart, "MB");
+            _memoryGrantsHover = new Helpers.ChartHoverHelper(MemoryGrantsChart, "MB");
+            _memoryClerksHover = new Helpers.ChartHoverHelper(MemoryClerksChart, "MB");
+            _planCacheHover = new Helpers.ChartHoverHelper(PlanCacheChart, "MB");
+            _memoryPressureEventsHover = new Helpers.ChartHoverHelper(MemoryPressureEventsChart, "events");
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
@@ -183,6 +196,7 @@ private void LoadMemoryStatsOverviewChart(List<MemoryStatsItem> memoryData, int
                 _legendPanels[MemoryStatsOverviewChart] = null;
             }
             MemoryStatsOverviewChart.Plot.Clear();
+            _memoryStatsOverviewHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(MemoryStatsOverviewChart);
 
             var dataList = memoryData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<MemoryStatsItem>();
@@ -216,24 +230,28 @@ private void LoadMemoryStatsOverviewChart(List<MemoryStatsItem> memoryData, int
                 totalScatter.MarkerSize = 5;
                 totalScatter.Color = TabHelpers.ChartColors[9];
                 totalScatter.LegendText = "Total Memory";
+                _memoryStatsOverviewHover?.Add(totalScatter, "Total Memory");
 
                 var bufferScatter = MemoryStatsOverviewChart.Plot.Add.Scatter(bufferXs, bufferYs);
                 bufferScatter.LineWidth = 2;
                 bufferScatter.MarkerSize = 5;
                 bufferScatter.Color = TabHelpers.ChartColors[0];
                 bufferScatter.LegendText = "Buffer Pool";
+                _memoryStatsOverviewHover?.Add(bufferScatter, "Buffer Pool");
 
                 var cacheScatter = MemoryStatsOverviewChart.Plot.Add.Scatter(cacheXs, cacheYs);
                 cacheScatter.LineWidth = 2;
                 cacheScatter.MarkerSize = 5;
                 cacheScatter.Color = TabHelpers.ChartColors[1];
                 cacheScatter.LegendText = "Plan Cache";
+                _memoryStatsOverviewHover?.Add(cacheScatter, "Plan Cache");
 
                 var availScatter = MemoryStatsOverviewChart.Plot.Add.Scatter(availXs, availYs);
                 availScatter.LineWidth = 2;
                 availScatter.MarkerSize = 5;
                 availScatter.Color = TabHelpers.ChartColors[2];
                 availScatter.LegendText = "Available Physical";
+                _memoryStatsOverviewHover?.Add(availScatter, "Available Physical");
 
                 _legendPanels[MemoryStatsOverviewChart] = MemoryStatsOverviewChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                 MemoryStatsOverviewChart.Plot.Legend.FontSize = 12;
@@ -389,6 +407,7 @@ private void LoadMemoryGrantsChart(IEnumerable<MemoryGrantStatsItem> data, int h
                 _legendPanels[MemoryGrantsChart] = null;
             }
             MemoryGrantsChart.Plot.Clear();
+            _memoryGrantsHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(MemoryGrantsChart);
 
             var dataList = data?.OrderBy(d => d.CollectionTime).ToList() ?? new List<MemoryGrantStatsItem>();
@@ -422,12 +441,14 @@ private void LoadMemoryGrantsChart(IEnumerable<MemoryGrantStatsItem> data, int h
                 grantedScatter.MarkerSize = 5;
                 grantedScatter.Color = TabHelpers.ChartColors[0];
                 grantedScatter.LegendText = "Granted MB";
+                _memoryGrantsHover?.Add(grantedScatter, "Granted MB");
 
                 var targetScatter = MemoryGrantsChart.Plot.Add.Scatter(targetXs, targetYs);
                 targetScatter.LineWidth = 2;
                 targetScatter.MarkerSize = 5;
                 targetScatter.Color = TabHelpers.ChartColors[2];
                 targetScatter.LegendText = "Target MB";
+                _memoryGrantsHover?.Add(targetScatter, "Target MB");
 
                 _legendPanels[MemoryGrantsChart] = MemoryGrantsChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                 MemoryGrantsChart.Plot.Legend.FontSize = 12;
@@ -488,6 +509,7 @@ private void LoadMemoryClerksChart(List<MemoryClerksItem> data, int hoursBack, D
                 _legendPanels[MemoryClerksChart] = null;
             }
             MemoryClerksChart.Plot.Clear();
+            _memoryClerksHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(MemoryClerksChart);
 
             var dataList = data ?? new List<MemoryClerksItem>();
@@ -521,7 +543,9 @@ private void LoadMemoryClerksChart(List<MemoryClerksItem> data, int hoursBack, D
                         scatter.LineWidth = 2;
                         scatter.MarkerSize = 5;
                         scatter.Color = colors[colorIndex % colors.Length];
-                        scatter.LegendText = clerkType.Length > 20 ? clerkType.Substring(0, 20) + "..." : clerkType;
+                        var label = clerkType.Length > 20 ? clerkType.Substring(0, 20) + "..." : clerkType;
+                        scatter.LegendText = label;
+                        _memoryClerksHover?.Add(scatter, label);
                         colorIndex++;
                     }
                 }
@@ -623,6 +647,7 @@ private void LoadPlanCacheChart(IEnumerable<PlanCacheStatsItem> data, int hoursB
                 _legendPanels[PlanCacheChart] = null;
             }
             PlanCacheChart.Plot.Clear();
+            _planCacheHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(PlanCacheChart);
 
             var dataList = data?.ToList() ?? new List<PlanCacheStatsItem>();
@@ -650,6 +675,7 @@ private void LoadPlanCacheChart(IEnumerable<PlanCacheStatsItem> data, int hoursB
                     singleScatter.MarkerSize = 5;
                     singleScatter.Color = TabHelpers.ChartColors[3];
                     singleScatter.LegendText = "Single-Use";
+                    _planCacheHover?.Add(singleScatter, "Single-Use");
 
                     // Multi-Use series with gap filling
                     var (multiXs, multiYs) = TabHelpers.FillTimeSeriesGaps(
@@ -661,6 +687,7 @@ private void LoadPlanCacheChart(IEnumerable<PlanCacheStatsItem> data, int hoursB
                     multiScatter.MarkerSize = 5;
                     multiScatter.Color = TabHelpers.ChartColors[1];
                     multiScatter.LegendText = "Multi-Use";
+                    _planCacheHover?.Add(multiScatter, "Multi-Use");
 
                     _legendPanels[PlanCacheChart] = PlanCacheChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                     PlanCacheChart.Plot.Legend.FontSize = 12;
@@ -762,6 +789,7 @@ private void LoadMemoryPressureEventsChart(IEnumerable<MemoryPressureEventItem>
                 _legendPanels[MemoryPressureEventsChart] = null;
             }
             MemoryPressureEventsChart.Plot.Clear();
+            _memoryPressureEventsHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(MemoryPressureEventsChart);
 
             // Only chart HIGH severity events
@@ -788,6 +816,7 @@ private void LoadMemoryPressureEventsChart(IEnumerable<MemoryPressureEventItem>
                     highScatter.MarkerSize = 5;
                     highScatter.Color = TabHelpers.ChartColors[3];
                     highScatter.LegendText = "High Pressure Events";
+                    _memoryPressureEventsHover?.Add(highScatter, "High Pressure Events");
 
                     _legendPanels[MemoryPressureEventsChart] = MemoryPressureEventsChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                     MemoryPressureEventsChart.Plot.Legend.FontSize = 12;
diff --git a/Dashboard/Controls/QueryPerformanceContent.xaml.cs b/Dashboard/Controls/QueryPerformanceContent.xaml.cs
index 34509c4e..e903040d 100644
--- a/Dashboard/Controls/QueryPerformanceContent.xaml.cs
+++ b/Dashboard/Controls/QueryPerformanceContent.xaml.cs
@@ -93,12 +93,23 @@ public partial class QueryPerformanceContent : UserControl
         // Legend panel references for edge-based legends (ScottPlot issue #4717 workaround)
         private Dictionary<ScottPlot.WPF.WpfPlot, ScottPlot.IPanel?> _legendPanels = new();
 
+        // Chart hover tooltips
+        private Helpers.ChartHoverHelper? _queryDurationHover;
+        private Helpers.ChartHoverHelper? _procDurationHover;
+        private Helpers.ChartHoverHelper? _qsDurationHover;
+        private Helpers.ChartHoverHelper? _execTrendsHover;
+
         public QueryPerformanceContent()
         {
             InitializeComponent();
             SetupChartSaveMenus();
             Loaded += OnLoaded;
             Unloaded += OnUnloaded;
+
+            _queryDurationHover = new Helpers.ChartHoverHelper(QueryPerfTrendsQueryChart, "ms/sec");
+            _procDurationHover = new Helpers.ChartHoverHelper(QueryPerfTrendsProcChart, "ms/sec");
+            _qsDurationHover = new Helpers.ChartHoverHelper(QueryPerfTrendsQsChart, "ms/sec");
+            _execTrendsHover = new Helpers.ChartHoverHelper(QueryPerfTrendsExecChart, "/sec");
         }
 
         private void OnUnloaded(object sender, RoutedEventArgs e)
@@ -243,9 +254,9 @@ await Task.WhenAll(
                 QueryStoreNoDataMessage.Visibility = queryStore.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
 
                 // Populate charts from time-series data
-                LoadDurationChart(QueryPerfTrendsQueryChart, await queryDurationTrendsTask, _perfTrendsHoursBack, _perfTrendsFromDate, _perfTrendsToDate, "Duration (ms/sec)", TabHelpers.ChartColors[0]);
-                LoadDurationChart(QueryPerfTrendsProcChart, await procDurationTrendsTask, _perfTrendsHoursBack, _perfTrendsFromDate, _perfTrendsToDate, "Duration (ms/sec)", TabHelpers.ChartColors[1]);
-                LoadDurationChart(QueryPerfTrendsQsChart, await qsDurationTrendsTask, _perfTrendsHoursBack, _perfTrendsFromDate, _perfTrendsToDate, "Duration (ms/sec)", TabHelpers.ChartColors[4]);
+                LoadDurationChart(QueryPerfTrendsQueryChart, await queryDurationTrendsTask, _perfTrendsHoursBack, _perfTrendsFromDate, _perfTrendsToDate, "Duration (ms/sec)", TabHelpers.ChartColors[0], _queryDurationHover);
+                LoadDurationChart(QueryPerfTrendsProcChart, await procDurationTrendsTask, _perfTrendsHoursBack, _perfTrendsFromDate, _perfTrendsToDate, "Duration (ms/sec)", TabHelpers.ChartColors[1], _procDurationHover);
+                LoadDurationChart(QueryPerfTrendsQsChart, await qsDurationTrendsTask, _perfTrendsHoursBack, _perfTrendsFromDate, _perfTrendsToDate, "Duration (ms/sec)", TabHelpers.ChartColors[4], _qsDurationHover);
                 LoadExecChart(await execTrendsTask, _perfTrendsHoursBack, _perfTrendsFromDate, _perfTrendsToDate);
             }
             catch (Exception ex)
@@ -890,7 +901,7 @@ private void LongRunningQueryPatternsNumericFilterTextBox_TextChanged(object sen
         /// Renders a duration trend chart from time-series data (per-collection_time aggregation).
         /// Replaces the old per-query-summary approach that produced too few data points.
         /// </summary>
-        private void LoadDurationChart(WpfPlot chart, IEnumerable<DurationTrendItem> trendData, int hoursBack, DateTime? fromDate, DateTime? toDate, string legendText, ScottPlot.Color color)
+        private void LoadDurationChart(WpfPlot chart, IEnumerable<DurationTrendItem> trendData, int hoursBack, DateTime? fromDate, DateTime? toDate, string legendText, ScottPlot.Color color, Helpers.ChartHoverHelper? hover = null)
         {
             try
             {
@@ -905,6 +916,7 @@ private void LoadDurationChart(WpfPlot chart, IEnumerable<DurationTrendItem> tre
                     _legendPanels[chart] = null;
                 }
                 chart.Plot.Clear();
+                hover?.Clear();
                 TabHelpers.ApplyDarkModeToChart(chart);
 
                 var dataList = (trendData ?? Enumerable.Empty<DurationTrendItem>())
@@ -920,6 +932,7 @@ private void LoadDurationChart(WpfPlot chart, IEnumerable<DurationTrendItem> tre
                 scatter.MarkerSize = 5;
                 scatter.Color = color;
                 scatter.LegendText = legendText;
+                hover?.Add(scatter, legendText);
 
                 if (xs.Length == 0)
                 {
@@ -959,6 +972,7 @@ private void LoadExecChart(IEnumerable<ExecutionTrendItem> execTrends, int hours
                 _legendPanels[QueryPerfTrendsExecChart] = null;
             }
             QueryPerfTrendsExecChart.Plot.Clear();
+            _execTrendsHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(QueryPerfTrendsExecChart);
 
             var dataList = (execTrends ?? Enumerable.Empty<ExecutionTrendItem>())
@@ -974,6 +988,7 @@ private void LoadExecChart(IEnumerable<ExecutionTrendItem> execTrends, int hours
             scatter.MarkerSize = 5;
             scatter.Color = TabHelpers.ChartColors[0];
             scatter.LegendText = "Executions/sec";
+            _execTrendsHover?.Add(scatter, "Executions/sec");
 
             if (xs.Length == 0)
             {
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml.cs b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
index 8d986440..08e9bcde 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml.cs
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
@@ -99,6 +99,12 @@ public partial class ResourceMetricsContent : UserControl
         private Helpers.ChartHoverHelper? _fileIoWriteHover;
         private Helpers.ChartHoverHelper? _perfmonHover;
         private Helpers.ChartHoverHelper? _waitStatsHover;
+        private Helpers.ChartHoverHelper? _tempdbStatsHover;
+        private Helpers.ChartHoverHelper? _tempDbLatencyHover;
+        private Helpers.ChartHoverHelper? _serverTrendsCpuHover;
+        private Helpers.ChartHoverHelper? _serverTrendsTempdbHover;
+        private Helpers.ChartHoverHelper? _serverTrendsMemoryHover;
+        private Helpers.ChartHoverHelper? _serverTrendsPerfmonHover;
         // Column filter popup and state
         private Popup? _filterPopup;
         private ColumnFilterPopup? _filterPopupContent;
@@ -130,6 +136,12 @@ public ResourceMetricsContent()
             _fileIoWriteHover = new Helpers.ChartHoverHelper(UserDbWriteLatencyChart, "ms");
             _perfmonHover = new Helpers.ChartHoverHelper(PerfmonCountersChart, "");
             _waitStatsHover = new Helpers.ChartHoverHelper(WaitStatsDetailChart, "ms/sec");
+            _tempdbStatsHover = new Helpers.ChartHoverHelper(TempdbStatsChart, "MB");
+            _tempDbLatencyHover = new Helpers.ChartHoverHelper(TempDbLatencyChart, "ms");
+            _serverTrendsCpuHover = new Helpers.ChartHoverHelper(ServerUtilTrendsCpuChart, "%");
+            _serverTrendsTempdbHover = new Helpers.ChartHoverHelper(ServerUtilTrendsTempdbChart, "MB");
+            _serverTrendsMemoryHover = new Helpers.ChartHoverHelper(ServerUtilTrendsMemoryChart, "MB");
+            _serverTrendsPerfmonHover = new Helpers.ChartHoverHelper(ServerUtilTrendsPerfmonChart, "/sec");
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
@@ -491,6 +503,7 @@ private void LoadCombinedTempDbLatencyChart(List<FileIoLatencyTimeSeriesItem> da
                 _legendPanels[TempDbLatencyChart] = null;
             }
             TempDbLatencyChart.Plot.Clear();
+            _tempDbLatencyHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(TempDbLatencyChart);
 
             if (data != null && data.Count > 0)
@@ -516,6 +529,7 @@ private void LoadCombinedTempDbLatencyChart(List<FileIoLatencyTimeSeriesItem> da
                 readScatter.MarkerSize = 5;
                 readScatter.Color = TabHelpers.ChartColors[0];
                 readScatter.LegendText = "Read Latency";
+                _tempDbLatencyHover?.Add(readScatter, "Read Latency");
 
                 // Write Latency series
                 var (writeXs, writeYs) = TabHelpers.FillTimeSeriesGaps(
@@ -526,6 +540,7 @@ private void LoadCombinedTempDbLatencyChart(List<FileIoLatencyTimeSeriesItem> da
                 writeScatter.MarkerSize = 5;
                 writeScatter.Color = TabHelpers.ChartColors[2];
                 writeScatter.LegendText = "Write Latency";
+                _tempDbLatencyHover?.Add(writeScatter, "Write Latency");
 
                 // Store legend panel reference for removal on refresh (ScottPlot issue #4717)
                 _legendPanels[TempDbLatencyChart] = TempDbLatencyChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
@@ -562,6 +577,7 @@ private void LoadTempdbStatsChart(IEnumerable<TempdbStatsItem> data, int hoursBa
                 _legendPanels[TempdbStatsChart] = null;
             }
             TempdbStatsChart.Plot.Clear();
+            _tempdbStatsHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(TempdbStatsChart);
 
             var dataList = data?.OrderBy(d => d.CollectionTime).ToList() ?? new List<TempdbStatsItem>();
@@ -576,6 +592,7 @@ private void LoadTempdbStatsChart(IEnumerable<TempdbStatsItem> data, int hoursBa
                 userScatter.MarkerSize = 5;
                 userScatter.Color = TabHelpers.ChartColors[0];
                 userScatter.LegendText = "User Objects";
+                _tempdbStatsHover?.Add(userScatter, "User Objects");
 
                 // Version Store series
                 var (versionXs, versionYs) = TabHelpers.FillTimeSeriesGaps(
@@ -586,6 +603,7 @@ private void LoadTempdbStatsChart(IEnumerable<TempdbStatsItem> data, int hoursBa
                 versionScatter.MarkerSize = 5;
                 versionScatter.Color = TabHelpers.ChartColors[1];
                 versionScatter.LegendText = "Version Store";
+                _tempdbStatsHover?.Add(versionScatter, "Version Store");
 
                 // Internal Objects series
                 var (internalXs, internalYs) = TabHelpers.FillTimeSeriesGaps(
@@ -596,6 +614,7 @@ private void LoadTempdbStatsChart(IEnumerable<TempdbStatsItem> data, int hoursBa
                 internalScatter.MarkerSize = 5;
                 internalScatter.Color = TabHelpers.ChartColors[2];
                 internalScatter.LegendText = "Internal Objects";
+                _tempdbStatsHover?.Add(internalScatter, "Internal Objects");
 
                 // Unallocated (free space) series
                 var (unallocXs, unallocYs) = TabHelpers.FillTimeSeriesGaps(
@@ -608,6 +627,7 @@ private void LoadTempdbStatsChart(IEnumerable<TempdbStatsItem> data, int hoursBa
                     unallocScatter.MarkerSize = 5;
                     unallocScatter.Color = TabHelpers.ChartColors[9];
                     unallocScatter.LegendText = "Unallocated";
+                    _tempdbStatsHover?.Add(unallocScatter, "Unallocated");
                 }
 
                 // Top Task Total MB series (worst session's usage)
@@ -979,6 +999,7 @@ private void LoadServerTrendsCpuChart(IEnumerable<CpuSpikeItem> cpuData, int hou
                 _legendPanels[ServerUtilTrendsCpuChart] = null;
             }
             ServerUtilTrendsCpuChart.Plot.Clear();
+            _serverTrendsCpuHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(ServerUtilTrendsCpuChart);
 
             var dataList = cpuData?.OrderBy(d => d.EventTime).ToList() ?? new List<CpuSpikeItem>();
@@ -993,6 +1014,7 @@ private void LoadServerTrendsCpuChart(IEnumerable<CpuSpikeItem> cpuData, int hou
                 sqlScatter.MarkerSize = 5;
                 sqlScatter.Color = TabHelpers.ChartColors[0];
                 sqlScatter.LegendText = "SQL CPU";
+                _serverTrendsCpuHover?.Add(sqlScatter, "SQL CPU");
 
                 // Other CPU series
                 var (otherXs, otherYs) = TabHelpers.FillTimeSeriesGaps(
@@ -1003,6 +1025,7 @@ private void LoadServerTrendsCpuChart(IEnumerable<CpuSpikeItem> cpuData, int hou
                 otherScatter.MarkerSize = 5;
                 otherScatter.Color = TabHelpers.ChartColors[2];
                 otherScatter.LegendText = "Other CPU";
+                _serverTrendsCpuHover?.Add(otherScatter, "Other CPU");
 
                 _legendPanels[ServerUtilTrendsCpuChart] = ServerUtilTrendsCpuChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                 ServerUtilTrendsCpuChart.Plot.Legend.FontSize = 12;
@@ -1038,6 +1061,7 @@ private void LoadServerTrendsTempdbChart(IEnumerable<TempdbStatsItem> tempdbData
                 _legendPanels[ServerUtilTrendsTempdbChart] = null;
             }
             ServerUtilTrendsTempdbChart.Plot.Clear();
+            _serverTrendsTempdbHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(ServerUtilTrendsTempdbChart);
 
             var dataList = tempdbData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<TempdbStatsItem>();
@@ -1056,12 +1080,14 @@ private void LoadServerTrendsTempdbChart(IEnumerable<TempdbStatsItem> tempdbData
                 userScatter.MarkerSize = 5;
                 userScatter.Color = TabHelpers.ChartColors[1];
                 userScatter.LegendText = "User Objects";
+                _serverTrendsTempdbHover?.Add(userScatter, "User Objects");
 
                 var versionScatter = ServerUtilTrendsTempdbChart.Plot.Add.Scatter(versionXs, versionYs);
                 versionScatter.LineWidth = 2;
                 versionScatter.MarkerSize = 5;
                 versionScatter.Color = TabHelpers.ChartColors[2];
                 versionScatter.LegendText = "Version Store";
+                _serverTrendsTempdbHover?.Add(versionScatter, "Version Store");
 
                 _legendPanels[ServerUtilTrendsTempdbChart] = ServerUtilTrendsTempdbChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                 ServerUtilTrendsTempdbChart.Plot.Legend.FontSize = 12;
@@ -1097,6 +1123,7 @@ private void LoadServerTrendsMemoryChart(IEnumerable<MemoryStatsItem> memoryData
                 _legendPanels[ServerUtilTrendsMemoryChart] = null;
             }
             ServerUtilTrendsMemoryChart.Plot.Clear();
+            _serverTrendsMemoryHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(ServerUtilTrendsMemoryChart);
 
             var dataList = memoryData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<MemoryStatsItem>();
@@ -1151,12 +1178,14 @@ private void LoadServerTrendsMemoryChart(IEnumerable<MemoryStatsItem> memoryData
                 bufferScatter.MarkerSize = 5;
                 bufferScatter.Color = TabHelpers.ChartColors[4];
                 bufferScatter.LegendText = "Buffer Pool";
+                _serverTrendsMemoryHover?.Add(bufferScatter, "Buffer Pool");
 
                 var cacheScatter = ServerUtilTrendsMemoryChart.Plot.Add.Scatter(cacheXs, cacheYs);
                 cacheScatter.LineWidth = 2;
                 cacheScatter.MarkerSize = 5;
                 cacheScatter.Color = TabHelpers.ChartColors[5];
                 cacheScatter.LegendText = "Plan Cache";
+                _serverTrendsMemoryHover?.Add(cacheScatter, "Plan Cache");
 
                 _legendPanels[ServerUtilTrendsMemoryChart] = ServerUtilTrendsMemoryChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                 ServerUtilTrendsMemoryChart.Plot.Legend.FontSize = 12;
@@ -1200,6 +1229,7 @@ private void LoadServerTrendsPerfmonChart(IEnumerable<PerfmonStatsItem> perfmonD
                 _legendPanels[ServerUtilTrendsPerfmonChart] = null;
             }
             ServerUtilTrendsPerfmonChart.Plot.Clear();
+            _serverTrendsPerfmonHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(ServerUtilTrendsPerfmonChart);
 
             var allData = (perfmonData ?? Enumerable.Empty<PerfmonStatsItem>()).ToList();
@@ -1234,6 +1264,7 @@ private void LoadServerTrendsPerfmonChart(IEnumerable<PerfmonStatsItem> perfmonD
                     scatter.MarkerSize = 5;
                     scatter.Color = color;
                     scatter.LegendText = counterName.Replace("/sec", "", StringComparison.Ordinal);
+                    _serverTrendsPerfmonHover?.Add(scatter, counterName);
                     linesAdded++;
                 }
             }
diff --git a/Dashboard/Controls/SystemEventsContent.xaml.cs b/Dashboard/Controls/SystemEventsContent.xaml.cs
index f9070bd9..5773c094 100644
--- a/Dashboard/Controls/SystemEventsContent.xaml.cs
+++ b/Dashboard/Controls/SystemEventsContent.xaml.cs
@@ -102,12 +102,53 @@ public partial class SystemEventsContent : UserControl
         // Legend panel references for edge-based legends (ScottPlot issue #4717 workaround)
         private Dictionary<ScottPlot.WPF.WpfPlot, ScottPlot.IPanel?> _legendPanels = new();
 
+        // Chart hover tooltips
+        private Helpers.ChartHoverHelper? _badPagesHover;
+        private Helpers.ChartHoverHelper? _dumpRequestsHover;
+        private Helpers.ChartHoverHelper? _accessViolationsHover;
+        private Helpers.ChartHoverHelper? _writeAccessViolationsHover;
+        private Helpers.ChartHoverHelper? _nonYieldingTasksHover;
+        private Helpers.ChartHoverHelper? _latchWarningsHover;
+        private Helpers.ChartHoverHelper? _sickSpinlocksHover;
+        private Helpers.ChartHoverHelper? _cpuComparisonHover;
+        private Helpers.ChartHoverHelper? _severeErrorsHover;
+        private Helpers.ChartHoverHelper? _ioIssuesHover;
+        private Helpers.ChartHoverHelper? _longestPendingIoHover;
+        private Helpers.ChartHoverHelper? _schedulerIssuesHover;
+        private Helpers.ChartHoverHelper? _memoryConditionsHover;
+        private Helpers.ChartHoverHelper? _cpuTasksHover;
+        private Helpers.ChartHoverHelper? _memoryBrokerHover;
+        private Helpers.ChartHoverHelper? _memoryBrokerRatioHover;
+        private Helpers.ChartHoverHelper? _memoryNodeOomHover;
+        private Helpers.ChartHoverHelper? _memoryNodeOomUtilHover;
+        private Helpers.ChartHoverHelper? _memoryNodeOomMemoryHover;
+
         public SystemEventsContent()
         {
             InitializeComponent();
             SetupChartContextMenus();
             Loaded += OnLoaded;
             Unloaded += OnUnloaded;
+
+            _badPagesHover = new Helpers.ChartHoverHelper(BadPagesChart, "events");
+            _dumpRequestsHover = new Helpers.ChartHoverHelper(DumpRequestsChart, "events");
+            _accessViolationsHover = new Helpers.ChartHoverHelper(AccessViolationsChart, "events");
+            _writeAccessViolationsHover = new Helpers.ChartHoverHelper(WriteAccessViolationsChart, "events");
+            _nonYieldingTasksHover = new Helpers.ChartHoverHelper(NonYieldingTasksChart, "events");
+            _latchWarningsHover = new Helpers.ChartHoverHelper(LatchWarningsChart, "events");
+            _sickSpinlocksHover = new Helpers.ChartHoverHelper(SickSpinlocksChart, "backoffs");
+            _cpuComparisonHover = new Helpers.ChartHoverHelper(CpuComparisonChart, "%");
+            _severeErrorsHover = new Helpers.ChartHoverHelper(SevereErrorsChart, "events");
+            _ioIssuesHover = new Helpers.ChartHoverHelper(IOIssuesChart, "events");
+            _longestPendingIoHover = new Helpers.ChartHoverHelper(LongestPendingIOChart, "ms");
+            _schedulerIssuesHover = new Helpers.ChartHoverHelper(SchedulerIssuesChart, "ms");
+            _memoryConditionsHover = new Helpers.ChartHoverHelper(MemoryConditionsChart, "events");
+            _cpuTasksHover = new Helpers.ChartHoverHelper(CPUTasksChart, "workers");
+            _memoryBrokerHover = new Helpers.ChartHoverHelper(MemoryBrokerChart, "");
+            _memoryBrokerRatioHover = new Helpers.ChartHoverHelper(MemoryBrokerRatioChart, "");
+            _memoryNodeOomHover = new Helpers.ChartHoverHelper(MemoryNodeOOMChart, "events");
+            _memoryNodeOomUtilHover = new Helpers.ChartHoverHelper(MemoryNodeOOMUtilChart, "%");
+            _memoryNodeOomMemoryHover = new Helpers.ChartHoverHelper(MemoryNodeOOMMemoryChart, "MB");
         }
 
         private void OnUnloaded(object sender, RoutedEventArgs e)
@@ -409,6 +450,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
             bool hasData = orderedData.Count > 0;
             // Bad Pages Detected Chart
             BadPagesChart.Plot.Clear();
+            _badPagesHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(BadPagesChart);
             if (hasData)
             {
@@ -419,6 +461,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
                 scatter.LineWidth = 2;
                 scatter.MarkerSize = 5;
                 scatter.Color = TabHelpers.ChartColors[3];
+                _badPagesHover?.Add(scatter, "Bad Pages");
             }
             else
             {
@@ -437,6 +480,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
 
             // Interval Dump Requests Chart
             DumpRequestsChart.Plot.Clear();
+            _dumpRequestsHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(DumpRequestsChart);
             if (hasData)
             {
@@ -447,6 +491,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
                 scatter.LineWidth = 2;
                 scatter.MarkerSize = 5;
                 scatter.Color = TabHelpers.ChartColors[2];
+                _dumpRequestsHover?.Add(scatter, "Dump Requests");
             }
             else
             {
@@ -465,6 +510,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
 
             // Access Violations Chart
             AccessViolationsChart.Plot.Clear();
+            _accessViolationsHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(AccessViolationsChart);
             if (hasData)
             {
@@ -475,6 +521,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
                 scatter.LineWidth = 2;
                 scatter.MarkerSize = 5;
                 scatter.Color = TabHelpers.ChartColors[4];
+                _accessViolationsHover?.Add(scatter, "Access Violations");
             }
             else
             {
@@ -493,6 +540,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
 
             // Write Access Violations Chart
             WriteAccessViolationsChart.Plot.Clear();
+            _writeAccessViolationsHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(WriteAccessViolationsChart);
             if (hasData)
             {
@@ -503,6 +551,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
                 scatter.LineWidth = 2;
                 scatter.MarkerSize = 5;
                 scatter.Color = TabHelpers.ChartColors[0];
+                _writeAccessViolationsHover?.Add(scatter, "Write Access Violations");
             }
             else
             {
@@ -533,6 +582,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
             bool hasData = orderedData.Count > 0;
             // Non-Yielding Tasks Chart
             NonYieldingTasksChart.Plot.Clear();
+            _nonYieldingTasksHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(NonYieldingTasksChart);
             if (hasData)
             {
@@ -543,6 +593,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
                 scatter.LineWidth = 2;
                 scatter.MarkerSize = 5;
                 scatter.Color = TabHelpers.ChartColors[3];
+                _nonYieldingTasksHover?.Add(scatter, "Non-Yielding Tasks");
             }
             else
             {
@@ -561,6 +612,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
 
             // Latch Warnings Chart
             LatchWarningsChart.Plot.Clear();
+            _latchWarningsHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(LatchWarningsChart);
             if (hasData)
             {
@@ -571,6 +623,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
                 scatter.LineWidth = 2;
                 scatter.MarkerSize = 5;
                 scatter.Color = TabHelpers.ChartColors[2];
+                _latchWarningsHover?.Add(scatter, "Latch Warnings");
             }
             else
             {
@@ -594,6 +647,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
                 _legendPanels[SickSpinlocksChart] = null;
             }
             SickSpinlocksChart.Plot.Clear();
+            _sickSpinlocksHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(SickSpinlocksChart);
             if (hasData)
             {
@@ -624,6 +678,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
                         scatter.MarkerSize = 5;
                         scatter.Color = colors[colorIndex % colors.Length];
                         scatter.LegendText = spinlockType ?? "Unknown";
+                        _sickSpinlocksHover?.Add(scatter, spinlockType ?? "Unknown");
                         colorIndex++;
                     }
                 }
@@ -656,6 +711,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
                 _legendPanels[CpuComparisonChart] = null;
             }
             CpuComparisonChart.Plot.Clear();
+            _cpuComparisonHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(CpuComparisonChart);
             if (hasData)
             {
@@ -668,6 +724,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
                 sysScatter.MarkerSize = 5;
                 sysScatter.Color = TabHelpers.ChartColors[0];
                 sysScatter.LegendText = "System CPU %";
+                _cpuComparisonHover?.Add(sysScatter, "System CPU %");
 
                 // SQL CPU series
                 var (sqlXs, sqlYs) = TabHelpers.FillTimeSeriesGaps(
@@ -678,6 +735,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
                 sqlScatter.MarkerSize = 5;
                 sqlScatter.Color = TabHelpers.ChartColors[1];
                 sqlScatter.LegendText = "SQL CPU %";
+                _cpuComparisonHover?.Add(sqlScatter, "SQL CPU %");
 
                 _legendPanels[CpuComparisonChart] = CpuComparisonChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                 CpuComparisonChart.Plot.Legend.FontSize = 12;
@@ -750,6 +808,7 @@ private void LoadSevereErrorsChart(IEnumerable<HealthParserSevereErrorItem> data
                 _legendPanels[SevereErrorsChart] = null;
             }
             SevereErrorsChart.Plot.Clear();
+            _severeErrorsHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(SevereErrorsChart);
 
             var dataList = data?.ToList() ?? new List<HealthParserSevereErrorItem>();
@@ -775,6 +834,7 @@ private void LoadSevereErrorsChart(IEnumerable<HealthParserSevereErrorItem> data
                     scatter.MarkerSize = 5;
                     scatter.Color = TabHelpers.ChartColors[3];
                     scatter.LegendText = "Error Count";
+                    _severeErrorsHover?.Add(scatter, "Error Count");
 
                     _legendPanels[SevereErrorsChart] = SevereErrorsChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                     SevereErrorsChart.Plot.Legend.FontSize = 12;
@@ -894,6 +954,7 @@ private void LoadIOIssuesChart(IEnumerable<HealthParserIOIssueItem> data, int ho
                 _legendPanels[IOIssuesChart] = null;
             }
             IOIssuesChart.Plot.Clear();
+            _ioIssuesHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(IOIssuesChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).OrderBy(d => d.EventTime).ToList() ?? new List<HealthParserIOIssueItem>();
@@ -921,6 +982,7 @@ private void LoadIOIssuesChart(IEnumerable<HealthParserIOIssueItem> data, int ho
                         scatter.MarkerSize = 5;
                         scatter.Color = TabHelpers.ChartColors[3];
                         scatter.LegendText = "Latch Timeouts";
+                        _ioIssuesHover?.Add(scatter, "Latch Timeouts");
                     }
 
                     if (longIos.Any(c => c > 0))
@@ -931,6 +993,7 @@ private void LoadIOIssuesChart(IEnumerable<HealthParserIOIssueItem> data, int ho
                         scatter.MarkerSize = 5;
                         scatter.Color = TabHelpers.ChartColors[2];
                         scatter.LegendText = "Long IOs";
+                        _ioIssuesHover?.Add(scatter, "Long IOs");
                     }
 
                     _legendPanels[IOIssuesChart] = IOIssuesChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
@@ -969,6 +1032,7 @@ private void LoadLongestPendingIOChart(IEnumerable<HealthParserIOIssueItem> data
                 _legendPanels[LongestPendingIOChart] = null;
             }
             LongestPendingIOChart.Plot.Clear();
+            _longestPendingIoHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(LongestPendingIOChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue && !string.IsNullOrEmpty(d.LongestPendingRequestsFilePath)).ToList() ?? new List<HealthParserIOIssueItem>();
@@ -1022,6 +1086,7 @@ private void LoadLongestPendingIOChart(IEnumerable<HealthParserIOIssueItem> data
                             scatter.MarkerSize = 5;
                             scatter.Color = colors[colorIndex % colors.Length];
                             scatter.LegendText = fileName;
+                            _longestPendingIoHover?.Add(scatter, fileName);
                             colorIndex++;
                         }
                     }
@@ -1091,6 +1156,7 @@ private void LoadSchedulerIssuesChart(IEnumerable<HealthParserSchedulerIssueItem
                 _legendPanels[SchedulerIssuesChart] = null;
             }
             SchedulerIssuesChart.Plot.Clear();
+            _schedulerIssuesHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(SchedulerIssuesChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).ToList() ?? new List<HealthParserSchedulerIssueItem>();
@@ -1123,6 +1189,7 @@ long ParseNonYield(string? value)
                     scatter.MarkerSize = 5;
                     scatter.Color = TabHelpers.ChartColors[2];
                     scatter.LegendText = "Total Non-Yield Time";
+                    _schedulerIssuesHover?.Add(scatter, "Total Non-Yield Time");
 
                     _legendPanels[SchedulerIssuesChart] = SchedulerIssuesChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                     SchedulerIssuesChart.Plot.Legend.FontSize = 12;
@@ -1244,6 +1311,7 @@ private void LoadMemoryConditionsChart(IEnumerable<HealthParserMemoryConditionIt
                 _legendPanels[MemoryConditionsChart] = null;
             }
             MemoryConditionsChart.Plot.Clear();
+            _memoryConditionsHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(MemoryConditionsChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).ToList() ?? new List<HealthParserMemoryConditionItem>();
@@ -1270,6 +1338,7 @@ private void LoadMemoryConditionsChart(IEnumerable<HealthParserMemoryConditionIt
                         scatter.MarkerSize = 5;
                         scatter.Color = TabHelpers.ChartColors[3];
                         scatter.LegendText = "OOM Exceptions";
+                        _memoryConditionsHover?.Add(scatter, "OOM Exceptions");
                         hasData = true;
 
                         _legendPanels[MemoryConditionsChart] = MemoryConditionsChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
@@ -1343,6 +1412,7 @@ private void LoadCPUTasksChart(IEnumerable<HealthParserCPUTasksItem> data, int h
                 _legendPanels[CPUTasksChart] = null;
             }
             CPUTasksChart.Plot.Clear();
+            _cpuTasksHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(CPUTasksChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).ToList() ?? new List<HealthParserCPUTasksItem>();
@@ -1368,6 +1438,7 @@ private void LoadCPUTasksChart(IEnumerable<HealthParserCPUTasksItem> data, int h
                     scatter.MarkerSize = 5;
                     scatter.Color = TabHelpers.ChartColors[0];
                     scatter.LegendText = "Workers Created";
+                    _cpuTasksHover?.Add(scatter, "Workers Created");
 
                     // Max Workers threshold line (horizontal)
                     var maxWorkersValue = dataList.Max(d => d.MaxWorkers ?? 0);
@@ -1549,6 +1620,8 @@ private void LoadMemoryBrokerChart(IEnumerable<HealthParserMemoryBrokerItem> dat
             double xMax = rangeEnd.ToOADate();
 
             /* Clear both charts */
+            _memoryBrokerHover?.Clear();
+            _memoryBrokerRatioHover?.Clear();
             foreach (var chart in new[] { MemoryBrokerChart, MemoryBrokerRatioChart })
             {
                 if (_legendPanels.TryGetValue(chart, out var existingPanel) && existingPanel != null)
@@ -1589,7 +1662,9 @@ private void LoadMemoryBrokerChart(IEnumerable<HealthParserMemoryBrokerItem> dat
                         scatter.LineWidth = 2;
                         scatter.MarkerSize = 5;
                         scatter.Color = colors[colorIndex % colors.Length];
-                        scatter.LegendText = brokerGroup.Key.Length > 25 ? brokerGroup.Key.Substring(0, 25) + "..." : brokerGroup.Key;
+                        var brokerLabel = brokerGroup.Key.Length > 25 ? brokerGroup.Key.Substring(0, 25) + "..." : brokerGroup.Key;
+                        scatter.LegendText = brokerLabel;
+                        _memoryBrokerHover?.Add(scatter, brokerLabel);
                         colorIndex++;
                     }
                 }
@@ -1616,6 +1691,7 @@ private void LoadMemoryBrokerChart(IEnumerable<HealthParserMemoryBrokerItem> dat
                     scatter.MarkerSize = 5;
                     scatter.Color = TabHelpers.ChartColors[0];
                     scatter.LegendText = "Memory Ratio";
+                    _memoryBrokerRatioHover?.Add(scatter, "Memory Ratio");
                 }
 
                 if (overallData.Count >= 1)
@@ -1630,6 +1706,7 @@ private void LoadMemoryBrokerChart(IEnumerable<HealthParserMemoryBrokerItem> dat
                     scatter.MarkerSize = 5;
                     scatter.Color = TabHelpers.ChartColors[2];
                     scatter.LegendText = "Overall";
+                    _memoryBrokerRatioHover?.Add(scatter, "Overall");
                 }
 
                 if (hasRatioData)
@@ -1773,6 +1850,7 @@ private void LoadMemoryNodeOOMChart(IEnumerable<HealthParserMemoryNodeOOMItem> d
                 _legendPanels[MemoryNodeOOMChart] = null;
             }
             MemoryNodeOOMChart.Plot.Clear();
+            _memoryNodeOomHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(MemoryNodeOOMChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).ToList() ?? new List<HealthParserMemoryNodeOOMItem>();
@@ -1797,6 +1875,7 @@ private void LoadMemoryNodeOOMChart(IEnumerable<HealthParserMemoryNodeOOMItem> d
                     scatter.MarkerSize = 5;
                     scatter.Color = TabHelpers.ChartColors[3];
                     scatter.LegendText = "OOM Event Count";
+                    _memoryNodeOomHover?.Add(scatter, "OOM Event Count");
 
                     _legendPanels[MemoryNodeOOMChart] = MemoryNodeOOMChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                     MemoryNodeOOMChart.Plot.Legend.FontSize = 12;
@@ -1833,6 +1912,7 @@ private void LoadMemoryNodeOOMUtilChart(IEnumerable<HealthParserMemoryNodeOOMIte
                 _legendPanels[MemoryNodeOOMUtilChart] = null;
             }
             MemoryNodeOOMUtilChart.Plot.Clear();
+            _memoryNodeOomUtilHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(MemoryNodeOOMUtilChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue && d.MemoryUtilizationPct.HasValue).ToList() ?? new List<HealthParserMemoryNodeOOMItem>();
@@ -1849,6 +1929,7 @@ private void LoadMemoryNodeOOMUtilChart(IEnumerable<HealthParserMemoryNodeOOMIte
                     scatter.LineWidth = 2;
                     scatter.MarkerSize = 5;
                     scatter.Color = TabHelpers.ChartColors[0];
+                    _memoryNodeOomUtilHover?.Add(scatter, "Memory Utilization %");
                 }
             }
 
@@ -1881,6 +1962,7 @@ private void LoadMemoryNodeOOMMemoryChart(IEnumerable<HealthParserMemoryNodeOOMI
                 _legendPanels[MemoryNodeOOMMemoryChart] = null;
             }
             MemoryNodeOOMMemoryChart.Plot.Clear();
+            _memoryNodeOomMemoryHover?.Clear();
             TabHelpers.ApplyDarkModeToChart(MemoryNodeOOMMemoryChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).ToList() ?? new List<HealthParserMemoryNodeOOMItem>();
@@ -1900,6 +1982,7 @@ private void LoadMemoryNodeOOMMemoryChart(IEnumerable<HealthParserMemoryNodeOOMI
                     scatter.MarkerSize = 5;
                     scatter.Color = TabHelpers.ChartColors[1];
                     scatter.LegendText = "Target";
+                    _memoryNodeOomMemoryHover?.Add(scatter, "Target");
                 }
 
                 // Committed Memory (Orange)
@@ -1914,6 +1997,7 @@ private void LoadMemoryNodeOOMMemoryChart(IEnumerable<HealthParserMemoryNodeOOMI
                     scatter.MarkerSize = 5;
                     scatter.Color = TabHelpers.ChartColors[2];
                     scatter.LegendText = "Committed";
+                    _memoryNodeOomMemoryHover?.Add(scatter, "Committed");
                 }
 
                 // Total Page File (Purple)
@@ -1928,6 +2012,7 @@ private void LoadMemoryNodeOOMMemoryChart(IEnumerable<HealthParserMemoryNodeOOMI
                     scatter.MarkerSize = 5;
                     scatter.Color = TabHelpers.ChartColors[4];
                     scatter.LegendText = "Total Page File";
+                    _memoryNodeOomMemoryHover?.Add(scatter, "Total Page File");
                 }
 
                 // Available Page File (Cyan)
@@ -1942,6 +2027,7 @@ private void LoadMemoryNodeOOMMemoryChart(IEnumerable<HealthParserMemoryNodeOOMI
                     scatter.MarkerSize = 5;
                     scatter.Color = TabHelpers.ChartColors[5];
                     scatter.LegendText = "Avail Page File";
+                    _memoryNodeOomMemoryHover?.Add(scatter, "Avail Page File");
                 }
 
                 if (hasData)
diff --git a/Dashboard/ServerTab.xaml.cs b/Dashboard/ServerTab.xaml.cs
index 3bff0a9d..821509ed 100644
--- a/Dashboard/ServerTab.xaml.cs
+++ b/Dashboard/ServerTab.xaml.cs
@@ -99,10 +99,31 @@ private string GetLoadingMessage()
         // Legend panel references for edge-based legends (ScottPlot issue #4717 workaround)
         private Dictionary<ScottPlot.WPF.WpfPlot, ScottPlot.IPanel?> _legendPanels = new();
 
+        // Chart hover tooltips
+        private Helpers.ChartHoverHelper? _resourceOverviewCpuHover;
+        private Helpers.ChartHoverHelper? _resourceOverviewMemoryHover;
+        private Helpers.ChartHoverHelper? _resourceOverviewIoHover;
+        private Helpers.ChartHoverHelper? _resourceOverviewWaitHover;
+        private Helpers.ChartHoverHelper? _lockWaitStatsHover;
+        private Helpers.ChartHoverHelper? _blockingEventsHover;
+        private Helpers.ChartHoverHelper? _blockingDurationHover;
+        private Helpers.ChartHoverHelper? _deadlocksHover;
+        private Helpers.ChartHoverHelper? _deadlockWaitTimeHover;
+
         public ServerTab(ServerConnection serverConnection, int utcOffsetMinutes = 0)
         {
             InitializeComponent();
 
+            _resourceOverviewCpuHover = new Helpers.ChartHoverHelper(ResourceOverviewCpuChart, "%");
+            _resourceOverviewMemoryHover = new Helpers.ChartHoverHelper(ResourceOverviewMemoryChart, "MB");
+            _resourceOverviewIoHover = new Helpers.ChartHoverHelper(ResourceOverviewIoChart, "ms");
+            _resourceOverviewWaitHover = new Helpers.ChartHoverHelper(ResourceOverviewWaitChart, "ms/sec");
+            _lockWaitStatsHover = new Helpers.ChartHoverHelper(LockWaitStatsChart, "ms/sec");
+            _blockingEventsHover = new Helpers.ChartHoverHelper(BlockingStatsBlockingEventsChart, "events");
+            _blockingDurationHover = new Helpers.ChartHoverHelper(BlockingStatsDurationChart, "ms");
+            _deadlocksHover = new Helpers.ChartHoverHelper(BlockingStatsDeadlocksChart, "events");
+            _deadlockWaitTimeHover = new Helpers.ChartHoverHelper(BlockingStatsDeadlockWaitTimeChart, "ms");
+
             _serverConnection = serverConnection;
             UtcOffsetMinutes = utcOffsetMinutes;
             _credentialService = new CredentialService();
@@ -1642,6 +1663,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
             // Get all unique time points for consistent X-axis across all charts
             // Blocking Events Delta Chart
             BlockingStatsBlockingEventsChart.Plot.Clear();
+            _blockingEventsHover?.Clear();
             ApplyDarkModeToChart(BlockingStatsBlockingEventsChart);
             var (blockingXs, blockingYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
@@ -1652,6 +1674,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
                 scatter.LineWidth = 2;
                 scatter.MarkerSize = 5;
                 scatter.Color = TabHelpers.ChartColors[0];
+                _blockingEventsHover?.Add(scatter, "Blocking Events");
             }
             else
             {
@@ -1670,6 +1693,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
 
             // Blocking Duration Delta Chart
             BlockingStatsDurationChart.Plot.Clear();
+            _blockingDurationHover?.Clear();
             ApplyDarkModeToChart(BlockingStatsDurationChart);
             var (durationXs, durationYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
@@ -1680,6 +1704,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
                 scatter.LineWidth = 2;
                 scatter.MarkerSize = 5;
                 scatter.Color = TabHelpers.ChartColors[2];
+                _blockingDurationHover?.Add(scatter, "Blocking Duration");
             }
             else
             {
@@ -1698,6 +1723,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
 
             // Deadlock Count Delta Chart
             BlockingStatsDeadlocksChart.Plot.Clear();
+            _deadlocksHover?.Clear();
             ApplyDarkModeToChart(BlockingStatsDeadlocksChart);
             var (deadlockXs, deadlockYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
@@ -1708,6 +1734,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
                 scatter.LineWidth = 2;
                 scatter.MarkerSize = 5;
                 scatter.Color = TabHelpers.ChartColors[3];
+                _deadlocksHover?.Add(scatter, "Deadlocks");
             }
             else
             {
@@ -1726,6 +1753,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
 
             // Deadlock Wait Time Chart
             BlockingStatsDeadlockWaitTimeChart.Plot.Clear();
+            _deadlockWaitTimeHover?.Clear();
             ApplyDarkModeToChart(BlockingStatsDeadlockWaitTimeChart);
             var (deadlockWaitXs, deadlockWaitYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
@@ -1736,6 +1764,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
                 scatter.LineWidth = 2;
                 scatter.MarkerSize = 5;
                 scatter.Color = TabHelpers.ChartColors[4];
+                _deadlockWaitTimeHover?.Add(scatter, "Deadlock Wait Time");
             }
             else
             {
@@ -1767,6 +1796,7 @@ private void LoadLockWaitStatsChart(List<LockWaitStatsItem> data, int hoursBack,
                 _legendPanels[LockWaitStatsChart] = null;
             }
             LockWaitStatsChart.Plot.Clear();
+            _lockWaitStatsHover?.Clear();
             ApplyDarkModeToChart(LockWaitStatsChart);
 
             // Get all unique time points across all wait types for gap filling
@@ -1789,7 +1819,9 @@ private void LoadLockWaitStatsChart(List<LockWaitStatsItem> data, int hoursBack,
                     scatter.LineWidth = 2;
                     scatter.MarkerSize = 5;
                     scatter.Color = colors[colorIndex % colors.Length];
-                    scatter.LegendText = waitType.Replace("LCK_M_", "").Replace("LCK_", "");
+                    var lockLabel = waitType.Replace("LCK_M_", "").Replace("LCK_", "");
+                    scatter.LegendText = lockLabel;
+                    _lockWaitStatsHover?.Add(scatter, lockLabel);
                     colorIndex++;
                 }
             }
@@ -2201,6 +2233,7 @@ private void LoadResourceOverviewCpuChart(IEnumerable<CpuDataPoint> cpuData, int
                 _legendPanels[ResourceOverviewCpuChart] = null;
             }
             ResourceOverviewCpuChart.Plot.Clear();
+            _resourceOverviewCpuHover?.Clear();
             ApplyDarkModeToChart(ResourceOverviewCpuChart);
 
             var dataList = cpuData?.OrderBy(d => d.SampleTime).ToList() ?? new List<CpuDataPoint>();
@@ -2217,6 +2250,7 @@ private void LoadResourceOverviewCpuChart(IEnumerable<CpuDataPoint> cpuData, int
                 scatter.MarkerSize = 5;
                 scatter.Color = TabHelpers.ChartColors[0];
                 scatter.LegendText = "SQL CPU %";
+                _resourceOverviewCpuHover?.Add(scatter, "SQL CPU %");
 
                 _legendPanels[ResourceOverviewCpuChart] = ResourceOverviewCpuChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                 ResourceOverviewCpuChart.Plot.Legend.FontSize = 12;
@@ -2252,6 +2286,7 @@ private void LoadResourceOverviewMemoryChart(IEnumerable<MemoryDataPoint> memory
                 _legendPanels[ResourceOverviewMemoryChart] = null;
             }
             ResourceOverviewMemoryChart.Plot.Clear();
+            _resourceOverviewMemoryHover?.Clear();
             ApplyDarkModeToChart(ResourceOverviewMemoryChart);
 
             var dataList = memoryData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<MemoryDataPoint>();
@@ -2272,12 +2307,14 @@ private void LoadResourceOverviewMemoryChart(IEnumerable<MemoryDataPoint> memory
                 bufferScatter.MarkerSize = 5;
                 bufferScatter.Color = TabHelpers.ChartColors[4];
                 bufferScatter.LegendText = "Buffer Pool";
+                _resourceOverviewMemoryHover?.Add(bufferScatter, "Buffer Pool");
 
                 var grantsScatter = ResourceOverviewMemoryChart.Plot.Add.Scatter(grantsXs, grantsYs);
                 grantsScatter.LineWidth = 2;
                 grantsScatter.MarkerSize = 5;
                 grantsScatter.Color = TabHelpers.ChartColors[2];
                 grantsScatter.LegendText = "Memory Grants";
+                _resourceOverviewMemoryHover?.Add(grantsScatter, "Memory Grants");
 
                 _legendPanels[ResourceOverviewMemoryChart] = ResourceOverviewMemoryChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                 ResourceOverviewMemoryChart.Plot.Legend.FontSize = 12;
@@ -2313,6 +2350,7 @@ private void LoadResourceOverviewIoChart(IEnumerable<FileIoDataPoint> ioData, in
                 _legendPanels[ResourceOverviewIoChart] = null;
             }
             ResourceOverviewIoChart.Plot.Clear();
+            _resourceOverviewIoHover?.Clear();
             ApplyDarkModeToChart(ResourceOverviewIoChart);
 
             var dataList = ioData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<FileIoDataPoint>();
@@ -2348,12 +2386,14 @@ private void LoadResourceOverviewIoChart(IEnumerable<FileIoDataPoint> ioData, in
                 readScatter.MarkerSize = 5;
                 readScatter.Color = TabHelpers.ChartColors[1];
                 readScatter.LegendText = "Read ms";
+                _resourceOverviewIoHover?.Add(readScatter, "Read ms");
 
                 var writeScatter = ResourceOverviewIoChart.Plot.Add.Scatter(writeXs, writeYs);
                 writeScatter.LineWidth = 2;
                 writeScatter.MarkerSize = 5;
                 writeScatter.Color = TabHelpers.ChartColors[2];
                 writeScatter.LegendText = "Write ms";
+                _resourceOverviewIoHover?.Add(writeScatter, "Write ms");
 
                 _legendPanels[ResourceOverviewIoChart] = ResourceOverviewIoChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
                 ResourceOverviewIoChart.Plot.Legend.FontSize = 12;
@@ -2390,6 +2430,7 @@ private void LoadResourceOverviewWaitChart(IEnumerable<WaitStatsDataPoint> waitD
                 _legendPanels[ResourceOverviewWaitChart] = null;
             }
             ResourceOverviewWaitChart.Plot.Clear();
+            _resourceOverviewWaitHover?.Clear();
             ApplyDarkModeToChart(ResourceOverviewWaitChart);
 
             var dataList = waitData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<WaitStatsDataPoint>();
@@ -2422,7 +2463,9 @@ private void LoadResourceOverviewWaitChart(IEnumerable<WaitStatsDataPoint> waitD
                     scatter.LineWidth = 2;
                     scatter.MarkerSize = 5;
                     scatter.Color = colors[colorIndex % colors.Length];
-                    scatter.LegendText = waitType.Length > 15 ? waitType.Substring(0, 15) + "..." : waitType;
+                    var waitLabel = waitType.Length > 15 ? waitType.Substring(0, 15) + "..." : waitType;
+                    scatter.LegendText = waitLabel;
+                    _resourceOverviewWaitHover?.Add(scatter, waitLabel);
                     colorIndex++;
                 }
 

From c0ed5fbac9c9f2b34df4f56fd80877cb494b41ef Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 15:45:42 -0500
Subject: [PATCH 17/34] Add CI pipelines for build validation, SQL install
 testing, and DuckDB schema tests

- ci.yml: Build all 5 projects + run Lite.Tests on PR/push to dev
- sql-validation.yml: Install all SQL scripts on 2017/2019/2022/2025 matrix, validate 93 objects exist
- ci_validate_installation.sql: OBJECT_ID checks for all schemas, tables, procedures, views
- Lite.Tests: 6 xUnit tests for DuckDB schema init, version, idempotency, indexes

All tests verified locally against sql2022 and DuckDB.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/sql/ci_validate_installation.sql | 207 +++++++++++++++++++++++
 .github/workflows/ci.yml                 |  38 +++++
 .github/workflows/sql-validation.yml     |  80 +++++++++
 Lite.Tests/DuckDbSchemaTests.cs          | 160 ++++++++++++++++++
 Lite.Tests/Lite.Tests.csproj             |  20 +++
 5 files changed, 505 insertions(+)
 create mode 100644 .github/sql/ci_validate_installation.sql
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 .github/workflows/sql-validation.yml
 create mode 100644 Lite.Tests/DuckDbSchemaTests.cs
 create mode 100644 Lite.Tests/Lite.Tests.csproj

diff --git a/.github/sql/ci_validate_installation.sql b/.github/sql/ci_validate_installation.sql
new file mode 100644
index 00000000..77187200
--- /dev/null
+++ b/.github/sql/ci_validate_installation.sql
@@ -0,0 +1,207 @@
+/*
+CI Validation: Verify all expected objects exist after installation.
+Run with sqlcmd -b to fail on RAISERROR.
+*/
+
+SET NOCOUNT ON;
+
+USE PerformanceMonitor;
+GO
+
+PRINT '========================================';
+PRINT 'CI Installation Validation';
+PRINT '========================================';
+PRINT '';
+
+DECLARE
+    @missing int = 0,
+    @checked int = 0;
+
+/*
+Schemas (4)
+*/
+PRINT 'Checking schemas...';
+
+IF SCHEMA_ID(N'collect') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: schema collect'; END; SET @checked += 1;
+IF SCHEMA_ID(N'analyze') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: schema analyze'; END; SET @checked += 1;
+IF SCHEMA_ID(N'config')  IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: schema config'; END;  SET @checked += 1;
+IF SCHEMA_ID(N'report')  IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: schema report'; END;  SET @checked += 1;
+
+PRINT '';
+
+/*
+Procedures in collect schema (37)
+*/
+PRINT 'Checking collect procedures...';
+
+IF OBJECT_ID(N'collect.calculate_deltas', N'P')                IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.calculate_deltas'; END;                SET @checked += 1;
+IF OBJECT_ID(N'collect.wait_stats_collector', N'P')             IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.wait_stats_collector'; END;             SET @checked += 1;
+IF OBJECT_ID(N'collect.query_stats_collector', N'P')            IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.query_stats_collector'; END;            SET @checked += 1;
+IF OBJECT_ID(N'collect.query_store_collector', N'P')            IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.query_store_collector'; END;            SET @checked += 1;
+IF OBJECT_ID(N'collect.procedure_stats_collector', N'P')        IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.procedure_stats_collector'; END;        SET @checked += 1;
+IF OBJECT_ID(N'collect.query_snapshots_collector', N'P')        IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.query_snapshots_collector'; END;        SET @checked += 1;
+IF OBJECT_ID(N'collect.query_snapshots_create_views', N'P')     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.query_snapshots_create_views'; END;     SET @checked += 1;
+IF OBJECT_ID(N'collect.query_snapshots_retention', N'P')        IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.query_snapshots_retention'; END;        SET @checked += 1;
+IF OBJECT_ID(N'collect.memory_stats_collector', N'P')           IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.memory_stats_collector'; END;           SET @checked += 1;
+IF OBJECT_ID(N'collect.memory_grant_stats_collector', N'P')     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.memory_grant_stats_collector'; END;     SET @checked += 1;
+IF OBJECT_ID(N'collect.memory_clerks_stats_collector', N'P')    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.memory_clerks_stats_collector'; END;    SET @checked += 1;
+IF OBJECT_ID(N'collect.cpu_scheduler_stats_collector', N'P')    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.cpu_scheduler_stats_collector'; END;    SET @checked += 1;
+IF OBJECT_ID(N'collect.cpu_utilization_stats_collector', N'P')  IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.cpu_utilization_stats_collector'; END;  SET @checked += 1;
+IF OBJECT_ID(N'collect.perfmon_stats_collector', N'P')          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.perfmon_stats_collector'; END;          SET @checked += 1;
+IF OBJECT_ID(N'collect.file_io_stats_collector', N'P')          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.file_io_stats_collector'; END;          SET @checked += 1;
+IF OBJECT_ID(N'collect.blocked_process_xml_collector', N'P')    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.blocked_process_xml_collector'; END;    SET @checked += 1;
+IF OBJECT_ID(N'collect.process_blocked_process_xml', N'P')      IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.process_blocked_process_xml'; END;      SET @checked += 1;
+IF OBJECT_ID(N'collect.deadlock_xml_collector', N'P')           IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.deadlock_xml_collector'; END;           SET @checked += 1;
+IF OBJECT_ID(N'collect.process_deadlock_xml', N'P')             IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.process_deadlock_xml'; END;             SET @checked += 1;
+IF OBJECT_ID(N'collect.blocking_deadlock_analyzer', N'P')       IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.blocking_deadlock_analyzer'; END;       SET @checked += 1;
+IF OBJECT_ID(N'collect.memory_pressure_events_collector', N'P') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.memory_pressure_events_collector'; END; SET @checked += 1;
+IF OBJECT_ID(N'collect.system_health_collector', N'P')          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.system_health_collector'; END;          SET @checked += 1;
+IF OBJECT_ID(N'collect.default_trace_collector', N'P')          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.default_trace_collector'; END;          SET @checked += 1;
+IF OBJECT_ID(N'collect.trace_management_collector', N'P')       IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.trace_management_collector'; END;       SET @checked += 1;
+IF OBJECT_ID(N'collect.trace_analysis_collector', N'P')         IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.trace_analysis_collector'; END;         SET @checked += 1;
+IF OBJECT_ID(N'collect.latch_stats_collector', N'P')            IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.latch_stats_collector'; END;            SET @checked += 1;
+IF OBJECT_ID(N'collect.spinlock_stats_collector', N'P')         IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.spinlock_stats_collector'; END;         SET @checked += 1;
+IF OBJECT_ID(N'collect.tempdb_stats_collector', N'P')           IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.tempdb_stats_collector'; END;           SET @checked += 1;
+IF OBJECT_ID(N'collect.plan_cache_stats_collector', N'P')       IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.plan_cache_stats_collector'; END;       SET @checked += 1;
+IF OBJECT_ID(N'collect.session_stats_collector', N'P')          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.session_stats_collector'; END;          SET @checked += 1;
+IF OBJECT_ID(N'collect.waiting_tasks_collector', N'P')          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.waiting_tasks_collector'; END;          SET @checked += 1;
+IF OBJECT_ID(N'collect.session_wait_stats_collector', N'P')     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.session_wait_stats_collector'; END;     SET @checked += 1;
+IF OBJECT_ID(N'collect.server_configuration_collector', N'P')   IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.server_configuration_collector'; END;   SET @checked += 1;
+IF OBJECT_ID(N'collect.database_configuration_collector', N'P') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.database_configuration_collector'; END; SET @checked += 1;
+IF OBJECT_ID(N'collect.configuration_issues_analyzer', N'P')    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.configuration_issues_analyzer'; END;    SET @checked += 1;
+IF OBJECT_ID(N'collect.scheduled_master_collector', N'P')       IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.scheduled_master_collector'; END;       SET @checked += 1;
+IF OBJECT_ID(N'collect.running_jobs_collector', N'P')           IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.running_jobs_collector'; END;           SET @checked += 1;
+
+PRINT '';
+
+/*
+Procedures in config schema (10)
+*/
+PRINT 'Checking config procedures...';
+
+IF OBJECT_ID(N'config.ensure_config_tables', N'P')       IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.ensure_config_tables'; END;       SET @checked += 1;
+IF OBJECT_ID(N'config.ensure_collection_table', N'P')    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.ensure_collection_table'; END;    SET @checked += 1;
+IF OBJECT_ID(N'config.update_collector_frequency', N'P') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.update_collector_frequency'; END; SET @checked += 1;
+IF OBJECT_ID(N'config.set_collector_enabled', N'P')      IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.set_collector_enabled'; END;      SET @checked += 1;
+IF OBJECT_ID(N'config.enable_realtime_monitoring', N'P') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.enable_realtime_monitoring'; END; SET @checked += 1;
+IF OBJECT_ID(N'config.enable_consulting_analysis', N'P') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.enable_consulting_analysis'; END; SET @checked += 1;
+IF OBJECT_ID(N'config.enable_baseline_monitoring', N'P') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.enable_baseline_monitoring'; END; SET @checked += 1;
+IF OBJECT_ID(N'config.show_collection_schedule', N'P')   IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.show_collection_schedule'; END;   SET @checked += 1;
+IF OBJECT_ID(N'config.data_retention', N'P')             IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.data_retention'; END;             SET @checked += 1;
+IF OBJECT_ID(N'config.check_hung_collector_job', N'P')   IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.check_hung_collector_job'; END;   SET @checked += 1;
+
+PRINT '';
+
+/*
+Views in config schema (2)
+*/
+PRINT 'Checking config views...';
+
+IF OBJECT_ID(N'config.current_version', N'V') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.current_version'; END; SET @checked += 1;
+IF OBJECT_ID(N'config.server_info', N'V')     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.server_info'; END;     SET @checked += 1;
+
+PRINT '';
+
+/*
+Views in report schema (37)
+Note: report.query_snapshots and report.query_snapshots_blocking are created
+dynamically by collect.query_snapshots_create_views, so they are not checked here.
+*/
+PRINT 'Checking report views...';
+
+IF OBJECT_ID(N'report.query_stats_with_formatted_plans', N'V')    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.query_stats_with_formatted_plans'; END;    SET @checked += 1;
+IF OBJECT_ID(N'report.procedure_stats_with_formatted_plans', N'V') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.procedure_stats_with_formatted_plans'; END; SET @checked += 1;
+IF OBJECT_ID(N'report.query_store_stats_with_formatted_plans', N'V') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.query_store_stats_with_formatted_plans'; END; SET @checked += 1;
+IF OBJECT_ID(N'report.expensive_queries_today', N'V')             IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.expensive_queries_today'; END;             SET @checked += 1;
+IF OBJECT_ID(N'report.query_stats_summary', N'V')                 IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.query_stats_summary'; END;                 SET @checked += 1;
+IF OBJECT_ID(N'report.procedure_stats_summary', N'V')             IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.procedure_stats_summary'; END;             SET @checked += 1;
+IF OBJECT_ID(N'report.query_store_summary', N'V')                 IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.query_store_summary'; END;                 SET @checked += 1;
+IF OBJECT_ID(N'report.collection_health', N'V')                   IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.collection_health'; END;                   SET @checked += 1;
+IF OBJECT_ID(N'report.top_waits_last_hour', N'V')                 IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.top_waits_last_hour'; END;                 SET @checked += 1;
+IF OBJECT_ID(N'report.memory_pressure_events', N'V')              IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.memory_pressure_events'; END;              SET @checked += 1;
+IF OBJECT_ID(N'report.cpu_spikes', N'V')                          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.cpu_spikes'; END;                          SET @checked += 1;
+IF OBJECT_ID(N'report.blocking_summary', N'V')                    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.blocking_summary'; END;                    SET @checked += 1;
+IF OBJECT_ID(N'report.deadlock_summary', N'V')                    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.deadlock_summary'; END;                    SET @checked += 1;
+IF OBJECT_ID(N'report.daily_summary', N'V')                       IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.daily_summary'; END;                       SET @checked += 1;
+IF OBJECT_ID(N'report.daily_summary_v2', N'V')                    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.daily_summary_v2'; END;                    SET @checked += 1;
+IF OBJECT_ID(N'report.server_configuration_changes', N'V')        IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.server_configuration_changes'; END;        SET @checked += 1;
+IF OBJECT_ID(N'report.database_configuration_changes', N'V')      IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.database_configuration_changes'; END;      SET @checked += 1;
+IF OBJECT_ID(N'report.trace_flag_changes', N'V')                  IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.trace_flag_changes'; END;                  SET @checked += 1;
+IF OBJECT_ID(N'report.top_latch_contention', N'V')                IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.top_latch_contention'; END;                SET @checked += 1;
+IF OBJECT_ID(N'report.top_spinlock_contention', N'V')             IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.top_spinlock_contention'; END;             SET @checked += 1;
+IF OBJECT_ID(N'report.tempdb_pressure', N'V')                     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.tempdb_pressure'; END;                     SET @checked += 1;
+IF OBJECT_ID(N'report.plan_cache_bloat', N'V')                    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.plan_cache_bloat'; END;                    SET @checked += 1;
+IF OBJECT_ID(N'report.top_memory_consumers', N'V')                IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.top_memory_consumers'; END;                SET @checked += 1;
+IF OBJECT_ID(N'report.memory_grant_pressure', N'V')               IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.memory_grant_pressure'; END;               SET @checked += 1;
+IF OBJECT_ID(N'report.file_io_latency', N'V')                     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.file_io_latency'; END;                     SET @checked += 1;
+IF OBJECT_ID(N'report.cpu_scheduler_pressure', N'V')              IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.cpu_scheduler_pressure'; END;              SET @checked += 1;
+IF OBJECT_ID(N'report.long_running_query_patterns', N'V')         IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.long_running_query_patterns'; END;         SET @checked += 1;
+IF OBJECT_ID(N'report.memory_pressure_indicators', N'V')          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.memory_pressure_indicators'; END;          SET @checked += 1;
+IF OBJECT_ID(N'report.file_io_wait_correlation', N'V')            IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.file_io_wait_correlation'; END;            SET @checked += 1;
+IF OBJECT_ID(N'report.blocking_chain_analysis', N'V')             IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.blocking_chain_analysis'; END;             SET @checked += 1;
+IF OBJECT_ID(N'report.tempdb_contention_analysis', N'V')          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.tempdb_contention_analysis'; END;          SET @checked += 1;
+IF OBJECT_ID(N'report.parameter_sensitivity_detection', N'V')     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.parameter_sensitivity_detection'; END;     SET @checked += 1;
+IF OBJECT_ID(N'report.scheduler_cpu_analysis', N'V')              IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.scheduler_cpu_analysis'; END;              SET @checked += 1;
+IF OBJECT_ID(N'report.session_wait_analysis', N'V')               IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.session_wait_analysis'; END;               SET @checked += 1;
+IF OBJECT_ID(N'report.critical_issues', N'V')                     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.critical_issues'; END;                     SET @checked += 1;
+IF OBJECT_ID(N'report.memory_usage_trends', N'V')                 IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.memory_usage_trends'; END;                 SET @checked += 1;
+IF OBJECT_ID(N'report.running_jobs', N'V')                        IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.running_jobs'; END;                        SET @checked += 1;
+
+PRINT '';
+
+/*
+Functions in report schema (1)
+*/
+PRINT 'Checking report functions...';
+
+IF OBJECT_ID(N'report.query_store_regressions', N'IF') IS NULL
+AND OBJECT_ID(N'report.query_store_regressions', N'TF') IS NULL
+AND OBJECT_ID(N'report.query_store_regressions', N'FN') IS NULL
+BEGIN SET @missing += 1; PRINT '  MISSING: report.query_store_regressions'; END;
+SET @checked += 1;
+
+PRINT '';
+
+/*
+Table count checks (minimum expected per schema)
+*/
+PRINT 'Checking table counts...';
+
+DECLARE
+    @collect_tables int,
+    @config_tables int;
+
+SELECT @collect_tables = COUNT_BIG(*)
+FROM sys.tables AS t
+WHERE OBJECT_SCHEMA_NAME(t.object_id) = N'collect';
+
+SELECT @config_tables = COUNT_BIG(*)
+FROM sys.tables AS t
+WHERE OBJECT_SCHEMA_NAME(t.object_id) = N'config';
+
+PRINT '  collect schema tables: ' + CONVERT(varchar(10), @collect_tables);
+PRINT '  config schema tables: ' + CONVERT(varchar(10), @config_tables);
+
+IF @collect_tables < 20 BEGIN SET @missing += 1; PRINT '  MISSING: expected >= 20 collect tables, found ' + CONVERT(varchar(10), @collect_tables); END; SET @checked += 1;
+IF @config_tables < 5  BEGIN SET @missing += 1; PRINT '  MISSING: expected >= 5 config tables, found ' + CONVERT(varchar(10), @config_tables); END;  SET @checked += 1;
+
+PRINT '';
+
+/*
+Summary
+*/
+PRINT '========================================';
+PRINT 'Checked ' + CONVERT(varchar(10), @checked) + ' objects';
+
+IF @missing > 0
+BEGIN
+    PRINT 'FAILED: ' + CONVERT(varchar(10), @missing) + ' object(s) missing';
+    RAISERROR('CI validation failed: %d object(s) missing', 16, 1, @missing);
+END;
+ELSE
+BEGIN
+    PRINT 'PASSED: All objects present';
+END;
+
+PRINT '========================================';
+GO
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..a92afdd1
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,38 @@
+name: CI
+
+on:
+  push:
+    branches: [dev]
+  pull_request:
+    branches: [dev]
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup .NET 8.0
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Restore dependencies
+        run: |
+          dotnet restore Dashboard/Dashboard.csproj
+          dotnet restore Lite/PerformanceMonitorLite.csproj
+          dotnet restore Installer/PerformanceMonitorInstaller.csproj
+          dotnet restore InstallerGui/InstallerGui.csproj
+          dotnet restore Lite.Tests/Lite.Tests.csproj
+
+      - name: Build all projects
+        run: |
+          dotnet build Dashboard/Dashboard.csproj -c Release --no-restore
+          dotnet build Lite/PerformanceMonitorLite.csproj -c Release --no-restore
+          dotnet build Installer/PerformanceMonitorInstaller.csproj -c Release --no-restore
+          dotnet build InstallerGui/InstallerGui.csproj -c Release --no-restore
+          dotnet build Lite.Tests/Lite.Tests.csproj -c Release --no-restore
+
+      - name: Run tests
+        run: dotnet test Lite.Tests/Lite.Tests.csproj -c Release --no-build --verbosity normal
diff --git a/.github/workflows/sql-validation.yml b/.github/workflows/sql-validation.yml
new file mode 100644
index 00000000..cd3691fb
--- /dev/null
+++ b/.github/workflows/sql-validation.yml
@@ -0,0 +1,80 @@
+name: SQL Validation
+
+on:
+  push:
+    branches: [dev]
+    paths: ['install/**']
+  pull_request:
+    branches: [dev]
+    paths: ['install/**']
+
+jobs:
+  validate-sql:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - version: '2017'
+            image: mcr.microsoft.com/mssql/server:2017-latest
+            health_cmd: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'CI_Test#2026!' -Q 'SELECT 1' -b
+          - version: '2019'
+            image: mcr.microsoft.com/mssql/server:2019-latest
+            health_cmd: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'CI_Test#2026!' -Q 'SELECT 1' -b
+          - version: '2022'
+            image: mcr.microsoft.com/mssql/server:2022-latest
+            health_cmd: /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P 'CI_Test#2026!' -C -No -Q 'SELECT 1' -b
+          - version: '2025'
+            image: mcr.microsoft.com/mssql/server:2025-latest
+            health_cmd: /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P 'CI_Test#2026!' -C -No -Q 'SELECT 1' -b
+
+    name: SQL Server ${{ matrix.version }}
+
+    services:
+      sqlserver:
+        image: ${{ matrix.image }}
+        env:
+          ACCEPT_EULA: Y
+          MSSQL_SA_PASSWORD: CI_Test#2026!
+        ports:
+          - 1433:1433
+        options: >-
+          --health-cmd "${{ matrix.health_cmd }}"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install sqlcmd
+        run: |
+          curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc > /dev/null
+          source /etc/os-release
+          echo "deb [arch=amd64] https://packages.microsoft.com/ubuntu/${VERSION_ID}/prod ${VERSION_CODENAME} main" | sudo tee /etc/apt/sources.list.d/mssql-release.list
+          sudo apt-get update
+          sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18
+
+      - name: Run install scripts
+        env:
+          SA_PASSWORD: CI_Test#2026!
+        run: |
+          for script in $(ls install/[0-9]*.sql | sort); do
+            filename=$(basename "$script")
+
+            # Skip scripts that require SQL Agent or are test/troubleshooting
+            case "$filename" in
+              45_*) echo "Skipping $filename (requires SQL Agent)"; continue;;
+              97_*|98_*|99_*) echo "Skipping $filename (test/troubleshooting)"; continue;;
+            esac
+
+            echo "Running $filename..."
+            /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P "$SA_PASSWORD" -C -No -b -i "$script"
+            echo "  OK"
+          done
+
+      - name: Validate installation
+        env:
+          SA_PASSWORD: CI_Test#2026!
+        run: |
+          /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P "$SA_PASSWORD" -C -No -b -i .github/sql/ci_validate_installation.sql
diff --git a/Lite.Tests/DuckDbSchemaTests.cs b/Lite.Tests/DuckDbSchemaTests.cs
new file mode 100644
index 00000000..9df7deb9
--- /dev/null
+++ b/Lite.Tests/DuckDbSchemaTests.cs
@@ -0,0 +1,160 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using DuckDB.NET.Data;
+using PerformanceMonitorLite.Database;
+using Xunit;
+
+namespace PerformanceMonitorLite.Tests;
+
+/// <summary>
+/// Tests that DuckDbInitializer creates all expected tables and indexes.
+/// No SQL Server required — these run purely against a temp DuckDB file.
+/// </summary>
+public class DuckDbSchemaTests : IDisposable
+{
+    private readonly string _tempDir;
+    private readonly string _dbPath;
+
+    public DuckDbSchemaTests()
+    {
+        _tempDir = Path.Combine(Path.GetTempPath(), "LiteTests_" + Guid.NewGuid().ToString("N")[..8]);
+        Directory.CreateDirectory(_tempDir);
+        _dbPath = Path.Combine(_tempDir, "test.duckdb");
+    }
+
+    public void Dispose()
+    {
+        try
+        {
+            if (Directory.Exists(_tempDir))
+                Directory.Delete(_tempDir, recursive: true);
+        }
+        catch
+        {
+            /* Best-effort cleanup */
+        }
+    }
+
+    [Fact]
+    public async Task InitializeAsync_CreatesAllTables()
+    {
+        var initializer = new DuckDbInitializer(_dbPath);
+        await initializer.InitializeAsync();
+
+        var expectedTables = new[]
+        {
+            "schema_version",
+            "servers",
+            "collection_schedule",
+            "collection_log",
+            "wait_stats",
+            "query_stats",
+            "cpu_utilization_stats",
+            "file_io_stats",
+            "memory_stats",
+            "memory_clerks",
+            "deadlocks",
+            "procedure_stats",
+            "query_store_stats",
+            "query_snapshots",
+            "tempdb_stats",
+            "perfmon_stats",
+            "server_config",
+            "database_config",
+            "memory_grant_stats",
+            "waiting_tasks",
+            "blocked_process_reports",
+            "database_scoped_config",
+            "trace_flags",
+            "running_jobs",
+            "config_alert_log"
+        };
+
+        using var connection = new DuckDBConnection($"Data Source={_dbPath}");
+        await connection.OpenAsync();
+
+        foreach (var table in expectedTables)
+        {
+            using var cmd = connection.CreateCommand();
+            cmd.CommandText = $"SELECT COUNT(*) FROM information_schema.tables WHERE table_name = '{table}'";
+            var count = Convert.ToInt32(await cmd.ExecuteScalarAsync());
+            Assert.True(count == 1, $"Table '{table}' should exist but was not found");
+        }
+    }
+
+    [Fact]
+    public async Task InitializeAsync_SetsCorrectSchemaVersion()
+    {
+        var initializer = new DuckDbInitializer(_dbPath);
+        await initializer.InitializeAsync();
+
+        using var connection = new DuckDBConnection($"Data Source={_dbPath}");
+        await connection.OpenAsync();
+
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = "SELECT MAX(version) FROM schema_version";
+        var version = Convert.ToInt32(await cmd.ExecuteScalarAsync());
+
+        Assert.Equal(9, version);
+    }
+
+    [Fact]
+    public async Task InitializeAsync_IsIdempotent()
+    {
+        var initializer = new DuckDbInitializer(_dbPath);
+
+        /* Run twice — should not throw */
+        await initializer.InitializeAsync();
+        await initializer.InitializeAsync();
+
+        using var connection = new DuckDBConnection($"Data Source={_dbPath}");
+        await connection.OpenAsync();
+
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = "SELECT MAX(version) FROM schema_version";
+        var version = Convert.ToInt32(await cmd.ExecuteScalarAsync());
+
+        Assert.Equal(9, version);
+    }
+
+    [Fact]
+    public async Task InitializeAsync_CreatesArchiveDirectory()
+    {
+        var initializer = new DuckDbInitializer(_dbPath);
+        await initializer.InitializeAsync();
+
+        var archivePath = Path.Combine(_tempDir, "archive");
+        Assert.True(Directory.Exists(archivePath), "Archive directory should be created");
+    }
+
+    [Fact]
+    public void SchemaStatements_MatchTableCount()
+    {
+        /* Verify GetAllTableStatements returns the expected number of tables */
+        var tableCount = 0;
+        foreach (var _ in Schema.GetAllTableStatements())
+            tableCount++;
+
+        /* 24 tables from Schema (schema_version is created separately by DuckDbInitializer) */
+        Assert.Equal(24, tableCount);
+    }
+
+    [Fact]
+    public async Task InitializeAsync_CreatesIndexes()
+    {
+        var initializer = new DuckDbInitializer(_dbPath);
+        await initializer.InitializeAsync();
+
+        using var connection = new DuckDBConnection($"Data Source={_dbPath}");
+        await connection.OpenAsync();
+
+        /* Verify at least some indexes exist by checking duckdb_indexes */
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = "SELECT COUNT(*) FROM duckdb_indexes()";
+        var indexCount = Convert.ToInt32(await cmd.ExecuteScalarAsync());
+
+        /* We create 18 indexes */
+        Assert.True(indexCount >= 18, $"Expected >= 18 indexes, found {indexCount}");
+    }
+}
diff --git a/Lite.Tests/Lite.Tests.csproj b/Lite.Tests/Lite.Tests.csproj
new file mode 100644
index 00000000..65bf423b
--- /dev/null
+++ b/Lite.Tests/Lite.Tests.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <NoWarn>CA1849;CA2007;CA1508;CA1822;CA1805;CA1510;CA1816;CA1861;CA1845;CA2201;CS4014;NU1701;CA1001;CA1848;CA1852;CA1305;CA1860;CA1707;CA1507;CA1806</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Lite\PerformanceMonitorLite.csproj" />
+  </ItemGroup>
+</Project>

From 65cbb28a5a047e010c04a1b5f07c5b7520787519 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 15:54:07 -0500
Subject: [PATCH 18/34] Fix SQL validation CI: use log-based health check and
 handle pre-configured Microsoft apt repo

- Health check: grep errorlog instead of sqlcmd (works across all container versions)
- Install sqlcmd: skip repo setup if Microsoft repo already configured (Ubuntu 24.04)
- Increase health retries from 10 to 15 for slower container starts

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/workflows/sql-validation.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/sql-validation.yml b/.github/workflows/sql-validation.yml
index cd3691fb..fe06470f 100644
--- a/.github/workflows/sql-validation.yml
+++ b/.github/workflows/sql-validation.yml
@@ -17,16 +17,12 @@ jobs:
         include:
           - version: '2017'
             image: mcr.microsoft.com/mssql/server:2017-latest
-            health_cmd: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'CI_Test#2026!' -Q 'SELECT 1' -b
           - version: '2019'
             image: mcr.microsoft.com/mssql/server:2019-latest
-            health_cmd: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'CI_Test#2026!' -Q 'SELECT 1' -b
           - version: '2022'
             image: mcr.microsoft.com/mssql/server:2022-latest
-            health_cmd: /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P 'CI_Test#2026!' -C -No -Q 'SELECT 1' -b
           - version: '2025'
             image: mcr.microsoft.com/mssql/server:2025-latest
-            health_cmd: /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P 'CI_Test#2026!' -C -No -Q 'SELECT 1' -b
 
     name: SQL Server ${{ matrix.version }}
 
@@ -39,19 +35,22 @@ jobs:
         ports:
           - 1433:1433
         options: >-
-          --health-cmd "${{ matrix.health_cmd }}"
+          --health-cmd "grep -q 'SQL Server is now ready for client connections' /var/opt/mssql/log/errorlog || exit 1"
           --health-interval 10s
           --health-timeout 5s
-          --health-retries 10
+          --health-retries 15
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Install sqlcmd
         run: |
-          curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc > /dev/null
-          source /etc/os-release
-          echo "deb [arch=amd64] https://packages.microsoft.com/ubuntu/${VERSION_ID}/prod ${VERSION_CODENAME} main" | sudo tee /etc/apt/sources.list.d/mssql-release.list
+          # Ubuntu 24.04 runners have Microsoft repo pre-configured; avoid Signed-By conflicts
+          if ! grep -rql 'packages.microsoft.com' /etc/apt/sources.list.d/ 2>/dev/null; then
+            curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg
+            source /etc/os-release
+            echo "deb [arch=amd64,signed-by=/usr/share/keyrings/microsoft-prod.gpg] https://packages.microsoft.com/ubuntu/${VERSION_ID}/prod ${VERSION_CODENAME} main" | sudo tee /etc/apt/sources.list.d/mssql-release.list
+          fi
           sudo apt-get update
           sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18
 

From 3452f4d0955d9a8389197e26bcf951cb55a971bc Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 15:57:29 -0500
Subject: [PATCH 19/34] Fix procedure_stats_collector truncation on DDL
 triggers (fixes #69)

The trigger name fallback parser searched for ' ON ' with spaces, but
database-level DDL triggers have a newline before ON DATABASE, causing
the parser to grab the entire trigger body text and exceed sysname length.

Rewrote the CASE expression to find the first delimiter after the trigger
name (CR, LF, or ' ON ') and also handle CREATE OR ALTER TRIGGER syntax.
Wrapped in CONVERT(sysname, ...) as a safety net. Tested against 7 trigger
format variations and verified on sql2022 with a real DDL trigger.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 install/10_collect_procedure_stats.sql | 1032 +++++++++++++-----------
 1 file changed, 561 insertions(+), 471 deletions(-)

diff --git a/install/10_collect_procedure_stats.sql b/install/10_collect_procedure_stats.sql
index fdc86ac4..e2dd1068 100644
--- a/install/10_collect_procedure_stats.sql
+++ b/install/10_collect_procedure_stats.sql
@@ -1,471 +1,561 @@
-/*
-Copyright 2026 Darling Data, LLC
-https://www.erikdarling.com/
-
-*/
-
-SET ANSI_NULLS ON;
-SET ANSI_PADDING ON;
-SET ANSI_WARNINGS ON;
-SET ARITHABORT ON;
-SET CONCAT_NULL_YIELDS_NULL ON;
-SET QUOTED_IDENTIFIER ON;
-SET NUMERIC_ROUNDABORT OFF;
-SET IMPLICIT_TRANSACTIONS OFF;
-SET STATISTICS TIME, IO OFF;
-GO
-
-USE PerformanceMonitor;
-GO
-
-/*
-Procedure, trigger, and function stats collector
-Collects execution statistics from sys.dm_exec_procedure_stats, 
-sys.dm_exec_trigger_stats, and sys.dm_exec_function_stats
-Includes execution plans for performance analysis
-*/
-
-IF OBJECT_ID(N'collect.procedure_stats_collector', N'P') IS NULL
-BEGIN
-    EXECUTE(N'CREATE PROCEDURE collect.procedure_stats_collector AS RETURN 138;');
-END;
-GO
-
-ALTER PROCEDURE
-    collect.procedure_stats_collector
-(
-    @debug bit = 0 /*Print debugging information*/
-)
-WITH RECOMPILE
-AS
-BEGIN
-    SET NOCOUNT ON;
-    SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-
-    DECLARE
-        @rows_collected bigint = 0,
-        @start_time datetime2(7) = SYSDATETIME(),
-        @server_start_time datetime2(7),
-        @last_collection_time datetime2(7) = NULL,
-        @frequency_minutes integer = NULL,
-        @cutoff_time datetime2(7) = NULL;
-
-    BEGIN TRY
-        BEGIN TRANSACTION;
-
-        /*
-        Get server start time for restart detection
-        */
-        SELECT
-            @server_start_time = osi.sqlserver_start_time
-        FROM sys.dm_os_sys_info AS osi;
-
-        /*
-        Ensure target table exists
-        */
-        IF OBJECT_ID(N'collect.procedure_stats', N'U') IS NULL
-        BEGIN
-            /*
-            Log missing table before attempting to create
-            */
-            INSERT INTO
-                config.collection_log
-            (
-                collection_time,
-                collector_name,
-                collection_status,
-                rows_collected,
-                duration_ms,
-                error_message
-            )
-            VALUES
-            (
-                @start_time,
-                N'procedure_stats_collector',
-                N'TABLE_MISSING',
-                0,
-                0,
-                N'Table collect.procedure_stats does not exist, calling ensure procedure'
-            );
-
-            /*
-            Call procedure to create table
-            */
-            EXECUTE config.ensure_collection_table
-                @table_name = N'procedure_stats',
-                @debug = @debug;
-
-            /*
-            Verify table now exists
-            */
-            IF OBJECT_ID(N'collect.procedure_stats', N'U') IS NULL
-            BEGIN
-                ROLLBACK TRANSACTION;
-                RAISERROR(N'Table collect.procedure_stats still missing after ensure procedure', 16, 1);
-                RETURN;
-            END;
-        END;
-
-        /*
-        First run detection - collect all procedures if this is the first execution
-        */
-        IF NOT EXISTS (SELECT 1/0 FROM collect.procedure_stats)
-        AND NOT EXISTS (SELECT 1/0 FROM config.collection_log WHERE collector_name = N'procedure_stats_collector')
-        BEGIN
-            SET @cutoff_time = CONVERT(datetime2(7), '19000101');
-
-            IF @debug = 1
-            BEGIN
-                RAISERROR(N'First run detected - collecting all procedures from sys.dm_exec_procedure_stats', 0, 1) WITH NOWAIT;
-            END;
-        END;
-        ELSE
-        BEGIN
-            /*
-            Get last collection time for this collector
-            */
-            SELECT
-                @last_collection_time = MAX(ps.collection_time)
-            FROM collect.procedure_stats AS ps;
-
-            /*
-            Get collection interval from schedule table
-            */
-            SELECT
-                @frequency_minutes = cs.frequency_minutes
-            FROM config.collection_schedule AS cs
-            WHERE cs.collector_name = N'procedure_stats_collector'
-            AND   cs.enabled = 1;
-
-            /*
-            Calculate cutoff time
-            If we have a previous collection, use that time
-            Otherwise use the configured interval (or default to 15 minutes)
-            */
-            SELECT
-                @cutoff_time = ISNULL(@last_collection_time,
-                    DATEADD(MINUTE, -ISNULL(@frequency_minutes, 15), SYSDATETIME()));
-        END;
-
-        IF @debug = 1
-        BEGIN
-            DECLARE @cutoff_time_string nvarchar(30) = CONVERT(nvarchar(30), @cutoff_time, 120);
-            RAISERROR(N'Collecting procedure stats with cutoff time: %s', 0, 1, @cutoff_time_string) WITH NOWAIT;
-        END;
-
-        /*
-        Collect procedure, trigger, and function statistics
-        Single query with UNION ALL to collect from all three DMVs
-        */
-        INSERT INTO
-            collect.procedure_stats
-        (
-            server_start_time,
-            object_type,
-            database_name,
-            object_id,
-            object_name,
-            schema_name,
-            type_desc,
-            sql_handle,
-            plan_handle,
-            cached_time,
-            last_execution_time,
-            execution_count,
-            total_worker_time,
-            min_worker_time,
-            max_worker_time,
-            total_elapsed_time,
-            min_elapsed_time,
-            max_elapsed_time,
-            total_logical_reads,
-            min_logical_reads,
-            max_logical_reads,
-            total_physical_reads,
-            min_physical_reads,
-            max_physical_reads,
-            total_logical_writes,
-            min_logical_writes,
-            max_logical_writes,
-            total_spills,
-            min_spills,
-            max_spills,
-            query_plan_text
-        )
-        SELECT
-            server_start_time = @server_start_time,
-            object_type = N'PROCEDURE',
-            database_name = d.name,
-            object_id = ps.object_id,
-            object_name = OBJECT_NAME(ps.object_id, ps.database_id),
-            schema_name = OBJECT_SCHEMA_NAME(ps.object_id, ps.database_id),
-            type_desc = N'PROCEDURE',
-            sql_handle = ps.sql_handle,
-            plan_handle = ps.plan_handle,
-            cached_time = ps.cached_time,
-            last_execution_time = ps.last_execution_time,
-            execution_count = ps.execution_count,
-            total_worker_time = ps.total_worker_time,
-            min_worker_time = ps.min_worker_time,
-            max_worker_time = ps.max_worker_time,
-            total_elapsed_time = ps.total_elapsed_time,
-            min_elapsed_time = ps.min_elapsed_time,
-            max_elapsed_time = ps.max_elapsed_time,
-            total_logical_reads = ps.total_logical_reads,
-            min_logical_reads = ps.min_logical_reads,
-            max_logical_reads = ps.max_logical_reads,
-            total_physical_reads = ps.total_physical_reads,
-            min_physical_reads = ps.min_physical_reads,
-            max_physical_reads = ps.max_physical_reads,
-            total_logical_writes = ps.total_logical_writes,
-            min_logical_writes = ps.min_logical_writes,
-            max_logical_writes = ps.max_logical_writes,
-            total_spills = ps.total_spills,
-            min_spills = ps.min_spills,
-            max_spills = ps.max_spills,
-            query_plan_text = CONVERT(nvarchar(max), tqp.query_plan)
-        FROM sys.dm_exec_procedure_stats AS ps
-        OUTER APPLY
-            sys.dm_exec_text_query_plan
-            (
-                ps.plan_handle,
-                0,
-                -1
-            ) AS tqp
-        OUTER APPLY
-        (
-            SELECT 
-                dbid = CONVERT(integer, pa.value)
-            FROM sys.dm_exec_plan_attributes(ps.plan_handle) AS pa
-            WHERE pa.attribute = N'dbid'
-        ) AS pa
-        LEFT JOIN sys.databases AS d
-          ON pa.dbid = d.database_id
-        WHERE ps.last_execution_time >= @cutoff_time
-        AND   pa.dbid NOT IN
-        (
-            1, 3, 4, 32761, 32767,
-            DB_ID(N'PerformanceMonitor')
-        )
-        AND   pa.dbid < 32761 /*exclude contained AG system databases*/
-
-        UNION ALL
-
-        SELECT
-            server_start_time = @server_start_time,
-            object_type = N'TRIGGER',
-            database_name = d.name,
-            object_id = ts.object_id,
-            object_name = COALESCE(
-                OBJECT_NAME(ts.object_id, ts.database_id),
-                /*Parse trigger name from CREATE TRIGGER [name] or CREATE TRIGGER name*/
-                CASE
-                    WHEN CHARINDEX(N'CREATE TRIGGER', st.text) > 0
-                    THEN LTRIM(RTRIM(REPLACE(REPLACE(
-                        SUBSTRING(
-                            st.text,
-                            CHARINDEX(N'CREATE TRIGGER', st.text) + 15,
-                            CHARINDEX(N' ON ', st.text + N' ON ') - CHARINDEX(N'CREATE TRIGGER', st.text) - 15
-                        ), N'[', N''), N']', N'')))
-                    ELSE N'trigger_' + CONVERT(nvarchar(20), ts.object_id)
-                END
-            ),
-            schema_name = ISNULL(OBJECT_SCHEMA_NAME(ts.object_id, ts.database_id), N'dbo'),
-            type_desc = N'TRIGGER',
-            sql_handle = ts.sql_handle,
-            plan_handle = ts.plan_handle,
-            cached_time = ts.cached_time,
-            last_execution_time = ts.last_execution_time,
-            execution_count = ts.execution_count,
-            total_worker_time = ts.total_worker_time,
-            min_worker_time = ts.min_worker_time,
-            max_worker_time = ts.max_worker_time,
-            total_elapsed_time = ts.total_elapsed_time,
-            min_elapsed_time = ts.min_elapsed_time,
-            max_elapsed_time = ts.max_elapsed_time,
-            total_logical_reads = ts.total_logical_reads,
-            min_logical_reads = ts.min_logical_reads,
-            max_logical_reads = ts.max_logical_reads,
-            total_physical_reads = ts.total_physical_reads,
-            min_physical_reads = ts.min_physical_reads,
-            max_physical_reads = ts.max_physical_reads,
-            total_logical_writes = ts.total_logical_writes,
-            min_logical_writes = ts.min_logical_writes,
-            max_logical_writes = ts.max_logical_writes,
-            total_spills = ts.total_spills,
-            min_spills = ts.min_spills,
-            max_spills = ts.max_spills,
-            query_plan_text = CONVERT(nvarchar(max), tqp.query_plan)
-        FROM sys.dm_exec_trigger_stats AS ts
-        CROSS APPLY sys.dm_exec_sql_text(ts.sql_handle) AS st
-        OUTER APPLY
-            sys.dm_exec_text_query_plan
-            (
-                ts.plan_handle,
-                0,
-                -1
-            ) AS tqp
-        OUTER APPLY
-        (
-            SELECT
-                dbid = CONVERT(integer, pa.value)
-            FROM sys.dm_exec_plan_attributes(ts.plan_handle) AS pa
-            WHERE pa.attribute = N'dbid'
-        ) AS pa
-        LEFT JOIN sys.databases AS d
-          ON pa.dbid = d.database_id
-        WHERE ts.last_execution_time >= @cutoff_time
-        AND   pa.dbid NOT IN
-        (
-            1, 3, 4, 32761, 32767,
-            DB_ID(N'PerformanceMonitor')
-        )
-        AND   pa.dbid < 32761 /*exclude contained AG system databases*/
-        UNION ALL
-
-        SELECT
-            server_start_time = @server_start_time,
-            object_type = N'FUNCTION',
-            database_name = d.name,
-            object_id = fs.object_id,
-            object_name = OBJECT_NAME(fs.object_id, fs.database_id),
-            schema_name = OBJECT_SCHEMA_NAME(fs.object_id, fs.database_id),
-            type_desc = N'FUNCTION',
-            sql_handle = fs.sql_handle,
-            plan_handle = fs.plan_handle,
-            cached_time = fs.cached_time,
-            last_execution_time = fs.last_execution_time,
-            execution_count = fs.execution_count,
-            total_worker_time = fs.total_worker_time,
-            min_worker_time = fs.min_worker_time,
-            max_worker_time = fs.max_worker_time,
-            total_elapsed_time = fs.total_elapsed_time,
-            min_elapsed_time = fs.min_elapsed_time,
-            max_elapsed_time = fs.max_elapsed_time,
-            total_logical_reads = fs.total_logical_reads,
-            min_logical_reads = fs.min_logical_reads,
-            max_logical_reads = fs.max_logical_reads,
-            total_physical_reads = fs.total_physical_reads,
-            min_physical_reads = fs.min_physical_reads,
-            max_physical_reads = fs.max_physical_reads,
-            total_logical_writes = fs.total_logical_writes,
-            min_logical_writes = fs.min_logical_writes,
-            max_logical_writes = fs.max_logical_writes,
-            total_spills = NULL,
-            min_spills = NULL,
-            max_spills = NULL,
-            query_plan_text = CONVERT(nvarchar(max), tqp.query_plan)
-        FROM sys.dm_exec_function_stats AS fs
-        OUTER APPLY
-            sys.dm_exec_text_query_plan
-            (
-                fs.plan_handle,
-                0,
-                -1
-            ) AS tqp
-        OUTER APPLY
-        (
-            SELECT 
-                dbid = CONVERT(integer, pa.value)
-            FROM sys.dm_exec_plan_attributes(fs.plan_handle) AS pa
-            WHERE pa.attribute = N'dbid'
-        ) AS pa
-        LEFT JOIN sys.databases AS d
-          ON pa.dbid = d.database_id
-        WHERE fs.last_execution_time >= @cutoff_time
-        AND   pa.dbid NOT IN
-        (
-            1, 3, 4, 32761, 32767,
-            DB_ID(N'PerformanceMonitor')
-        )
-        AND   pa.dbid < 32761 /*exclude contained AG system databases*/
-        OPTION(RECOMPILE);
-        
-        SET @rows_collected = ROWCOUNT_BIG();
-        
-        /*
-        Calculate deltas for the newly inserted data
-        */
-        EXECUTE collect.calculate_deltas
-            @table_name = N'procedure_stats',
-            @debug = @debug;
-
-        /*Tie statement sto procedures when possible*/
-        UPDATE
-            qs
-        SET
-            qs.object_type = ISNULL(ps.object_type,'STATEMENT'),
-            qs.schema_name = ISNULL(ps.schema_name, N'N/A'),
-            qs.object_name = ISNULL(ps.object_name, N'N/A')
-        FROM collect.query_stats AS qs
-        LEFT JOIN collect.procedure_stats AS ps
-          ON  ps.sql_handle = qs.sql_handle
-          AND ps.collection_time >= DATEADD(MINUTE, -1, @cutoff_time)
-        WHERE qs.object_type = 'STATEMENT'
-        AND   qs.schema_name IS NULL
-        AND   qs.object_name IS NULL
-        OPTION(RECOMPILE);
-
-        
-        /*
-        Log successful collection
-        */
-        INSERT INTO
-            config.collection_log
-        (
-            collector_name,
-            collection_status,
-            rows_collected,
-            duration_ms
-        )
-        VALUES
-        (
-            N'procedure_stats_collector',
-            N'SUCCESS',
-            @rows_collected,
-            DATEDIFF(MILLISECOND, @start_time, SYSDATETIME())
-        );
-        
-        IF @debug = 1
-        BEGIN
-            RAISERROR(N'Collected %d procedure/trigger/function stats rows', 0, 1, @rows_collected) WITH NOWAIT;
-        END;
-        
-        COMMIT TRANSACTION;
-        
-    END TRY
-    BEGIN CATCH
-        IF @@TRANCOUNT > 0
-        BEGIN
-            ROLLBACK TRANSACTION;
-        END;
-        
-        DECLARE
-            @error_message nvarchar(4000) = ERROR_MESSAGE();
-        
-        /*
-        Log the error
-        */
-        INSERT INTO
-            config.collection_log
-        (
-            collector_name,
-            collection_status,
-            duration_ms,
-            error_message
-        )
-        VALUES
-        (
-            N'procedure_stats_collector',
-            N'ERROR',
-            DATEDIFF(MILLISECOND, @start_time, SYSDATETIME()),
-            @error_message
-        );
-        
-        RAISERROR(N'Error in procedure stats collector: %s', 16, 1, @error_message);
-    END CATCH;
-END;
-GO
-
-PRINT 'Procedure stats collector created successfully';
-GO
+/*
+Copyright 2026 Darling Data, LLC
+https://www.erikdarling.com/
+
+*/
+
+SET ANSI_NULLS ON;
+SET ANSI_PADDING ON;
+SET ANSI_WARNINGS ON;
+SET ARITHABORT ON;
+SET CONCAT_NULL_YIELDS_NULL ON;
+SET QUOTED_IDENTIFIER ON;
+SET NUMERIC_ROUNDABORT OFF;
+SET IMPLICIT_TRANSACTIONS OFF;
+SET STATISTICS TIME, IO OFF;
+GO
+
+USE PerformanceMonitor;
+GO
+
+/*
+Procedure, trigger, and function stats collector
+Collects execution statistics from sys.dm_exec_procedure_stats, 
+sys.dm_exec_trigger_stats, and sys.dm_exec_function_stats
+Includes execution plans for performance analysis
+*/
+
+IF OBJECT_ID(N'collect.procedure_stats_collector', N'P') IS NULL
+BEGIN
+    EXECUTE(N'CREATE PROCEDURE collect.procedure_stats_collector AS RETURN 138;');
+END;
+GO
+
+ALTER PROCEDURE
+    collect.procedure_stats_collector
+(
+    @debug bit = 0 /*Print debugging information*/
+)
+WITH RECOMPILE
+AS
+BEGIN
+    SET NOCOUNT ON;
+    SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+    DECLARE
+        @rows_collected bigint = 0,
+        @start_time datetime2(7) = SYSDATETIME(),
+        @server_start_time datetime2(7),
+        @last_collection_time datetime2(7) = NULL,
+        @frequency_minutes integer = NULL,
+        @cutoff_time datetime2(7) = NULL;
+
+    BEGIN TRY
+        BEGIN TRANSACTION;
+
+        /*
+        Get server start time for restart detection
+        */
+        SELECT
+            @server_start_time = osi.sqlserver_start_time
+        FROM sys.dm_os_sys_info AS osi;
+
+        /*
+        Ensure target table exists
+        */
+        IF OBJECT_ID(N'collect.procedure_stats', N'U') IS NULL
+        BEGIN
+            /*
+            Log missing table before attempting to create
+            */
+            INSERT INTO
+                config.collection_log
+            (
+                collection_time,
+                collector_name,
+                collection_status,
+                rows_collected,
+                duration_ms,
+                error_message
+            )
+            VALUES
+            (
+                @start_time,
+                N'procedure_stats_collector',
+                N'TABLE_MISSING',
+                0,
+                0,
+                N'Table collect.procedure_stats does not exist, calling ensure procedure'
+            );
+
+            /*
+            Call procedure to create table
+            */
+            EXECUTE config.ensure_collection_table
+                @table_name = N'procedure_stats',
+                @debug = @debug;
+
+            /*
+            Verify table now exists
+            */
+            IF OBJECT_ID(N'collect.procedure_stats', N'U') IS NULL
+            BEGIN
+                ROLLBACK TRANSACTION;
+                RAISERROR(N'Table collect.procedure_stats still missing after ensure procedure', 16, 1);
+                RETURN;
+            END;
+        END;
+
+        /*
+        First run detection - collect all procedures if this is the first execution
+        */
+        IF NOT EXISTS (SELECT 1/0 FROM collect.procedure_stats)
+        AND NOT EXISTS (SELECT 1/0 FROM config.collection_log WHERE collector_name = N'procedure_stats_collector')
+        BEGIN
+            SET @cutoff_time = CONVERT(datetime2(7), '19000101');
+
+            IF @debug = 1
+            BEGIN
+                RAISERROR(N'First run detected - collecting all procedures from sys.dm_exec_procedure_stats', 0, 1) WITH NOWAIT;
+            END;
+        END;
+        ELSE
+        BEGIN
+            /*
+            Get last collection time for this collector
+            */
+            SELECT
+                @last_collection_time = MAX(ps.collection_time)
+            FROM collect.procedure_stats AS ps;
+
+            /*
+            Get collection interval from schedule table
+            */
+            SELECT
+                @frequency_minutes = cs.frequency_minutes
+            FROM config.collection_schedule AS cs
+            WHERE cs.collector_name = N'procedure_stats_collector'
+            AND   cs.enabled = 1;
+
+            /*
+            Calculate cutoff time
+            If we have a previous collection, use that time
+            Otherwise use the configured interval (or default to 15 minutes)
+            */
+            SELECT
+                @cutoff_time = ISNULL(@last_collection_time,
+                    DATEADD(MINUTE, -ISNULL(@frequency_minutes, 15), SYSDATETIME()));
+        END;
+
+        IF @debug = 1
+        BEGIN
+            DECLARE @cutoff_time_string nvarchar(30) = CONVERT(nvarchar(30), @cutoff_time, 120);
+            RAISERROR(N'Collecting procedure stats with cutoff time: %s', 0, 1, @cutoff_time_string) WITH NOWAIT;
+        END;
+
+        /*
+        Collect procedure, trigger, and function statistics
+        Single query with UNION ALL to collect from all three DMVs
+        */
+        INSERT INTO
+            collect.procedure_stats
+        (
+            server_start_time,
+            object_type,
+            database_name,
+            object_id,
+            object_name,
+            schema_name,
+            type_desc,
+            sql_handle,
+            plan_handle,
+            cached_time,
+            last_execution_time,
+            execution_count,
+            total_worker_time,
+            min_worker_time,
+            max_worker_time,
+            total_elapsed_time,
+            min_elapsed_time,
+            max_elapsed_time,
+            total_logical_reads,
+            min_logical_reads,
+            max_logical_reads,
+            total_physical_reads,
+            min_physical_reads,
+            max_physical_reads,
+            total_logical_writes,
+            min_logical_writes,
+            max_logical_writes,
+            total_spills,
+            min_spills,
+            max_spills,
+            query_plan_text
+        )
+        SELECT
+            server_start_time = @server_start_time,
+            object_type = N'PROCEDURE',
+            database_name = d.name,
+            object_id = ps.object_id,
+            object_name = OBJECT_NAME(ps.object_id, ps.database_id),
+            schema_name = OBJECT_SCHEMA_NAME(ps.object_id, ps.database_id),
+            type_desc = N'PROCEDURE',
+            sql_handle = ps.sql_handle,
+            plan_handle = ps.plan_handle,
+            cached_time = ps.cached_time,
+            last_execution_time = ps.last_execution_time,
+            execution_count = ps.execution_count,
+            total_worker_time = ps.total_worker_time,
+            min_worker_time = ps.min_worker_time,
+            max_worker_time = ps.max_worker_time,
+            total_elapsed_time = ps.total_elapsed_time,
+            min_elapsed_time = ps.min_elapsed_time,
+            max_elapsed_time = ps.max_elapsed_time,
+            total_logical_reads = ps.total_logical_reads,
+            min_logical_reads = ps.min_logical_reads,
+            max_logical_reads = ps.max_logical_reads,
+            total_physical_reads = ps.total_physical_reads,
+            min_physical_reads = ps.min_physical_reads,
+            max_physical_reads = ps.max_physical_reads,
+            total_logical_writes = ps.total_logical_writes,
+            min_logical_writes = ps.min_logical_writes,
+            max_logical_writes = ps.max_logical_writes,
+            total_spills = ps.total_spills,
+            min_spills = ps.min_spills,
+            max_spills = ps.max_spills,
+            query_plan_text = CONVERT(nvarchar(max), tqp.query_plan)
+        FROM sys.dm_exec_procedure_stats AS ps
+        OUTER APPLY
+            sys.dm_exec_text_query_plan
+            (
+                ps.plan_handle,
+                0,
+                -1
+            ) AS tqp
+        OUTER APPLY
+        (
+            SELECT 
+                dbid = CONVERT(integer, pa.value)
+            FROM sys.dm_exec_plan_attributes(ps.plan_handle) AS pa
+            WHERE pa.attribute = N'dbid'
+        ) AS pa
+        LEFT JOIN sys.databases AS d
+          ON pa.dbid = d.database_id
+        WHERE ps.last_execution_time >= @cutoff_time
+        AND   pa.dbid NOT IN
+        (
+            1, 3, 4, 32761, 32767,
+            DB_ID(N'PerformanceMonitor')
+        )
+        AND   pa.dbid < 32761 /*exclude contained AG system databases*/
+
+        UNION ALL
+
+        SELECT
+            server_start_time = @server_start_time,
+            object_type = N'TRIGGER',
+            database_name = d.name,
+            object_id = ts.object_id,
+            object_name = COALESCE(
+                OBJECT_NAME(ts.object_id, ts.database_id),
+                /*Parse trigger name from trigger definition text.
+                  Handles: CREATE TRIGGER, CREATE OR ALTER TRIGGER,
+                  DML triggers (ON table), DDL triggers (ON DATABASE/ALL SERVER),
+                  and newlines between trigger name and ON clause.*/
+                CONVERT
+                (
+                    sysname,
+                    CASE
+                        WHEN st.text LIKE N'%CREATE OR ALTER TRIGGER%'
+                        THEN LTRIM(RTRIM(REPLACE(REPLACE(
+                            SUBSTRING
+                            (
+                                st.text,
+                                CHARINDEX(N'CREATE OR ALTER TRIGGER', st.text) + 23,
+                                /*Find the earliest delimiter after the trigger name:
+                                  newline (CR/LF) or ON keyword on same line*/
+                                ISNULL
+                                (
+                                    NULLIF
+                                    (
+                                        CHARINDEX
+                                        (
+                                            CHAR(13),
+                                            SUBSTRING(st.text, CHARINDEX(N'CREATE OR ALTER TRIGGER', st.text) + 23, 256)
+                                        ),
+                                        0
+                                    ),
+                                    ISNULL
+                                    (
+                                        NULLIF
+                                        (
+                                            CHARINDEX
+                                            (
+                                                CHAR(10),
+                                                SUBSTRING(st.text, CHARINDEX(N'CREATE OR ALTER TRIGGER', st.text) + 23, 256)
+                                            ),
+                                            0
+                                        ),
+                                        ISNULL
+                                        (
+                                            NULLIF
+                                            (
+                                                CHARINDEX
+                                                (
+                                                    N' ON ',
+                                                    SUBSTRING(st.text, CHARINDEX(N'CREATE OR ALTER TRIGGER', st.text) + 23, 256)
+                                                ),
+                                                0
+                                            ),
+                                            128
+                                        )
+                                    )
+                                ) - 1
+                            ), N'[', N''), N']', N'')))
+                        WHEN st.text LIKE N'%CREATE TRIGGER%'
+                        THEN LTRIM(RTRIM(REPLACE(REPLACE(
+                            SUBSTRING
+                            (
+                                st.text,
+                                CHARINDEX(N'CREATE TRIGGER', st.text) + 15,
+                                ISNULL
+                                (
+                                    NULLIF
+                                    (
+                                        CHARINDEX
+                                        (
+                                            CHAR(13),
+                                            SUBSTRING(st.text, CHARINDEX(N'CREATE TRIGGER', st.text) + 15, 256)
+                                        ),
+                                        0
+                                    ),
+                                    ISNULL
+                                    (
+                                        NULLIF
+                                        (
+                                            CHARINDEX
+                                            (
+                                                CHAR(10),
+                                                SUBSTRING(st.text, CHARINDEX(N'CREATE TRIGGER', st.text) + 15, 256)
+                                            ),
+                                            0
+                                        ),
+                                        ISNULL
+                                        (
+                                            NULLIF
+                                            (
+                                                CHARINDEX
+                                                (
+                                                    N' ON ',
+                                                    SUBSTRING(st.text, CHARINDEX(N'CREATE TRIGGER', st.text) + 15, 256)
+                                                ),
+                                                0
+                                            ),
+                                            128
+                                        )
+                                    )
+                                ) - 1
+                            ), N'[', N''), N']', N'')))
+                        ELSE N'trigger_' + CONVERT(nvarchar(20), ts.object_id)
+                    END
+                )
+            ),
+            schema_name = ISNULL(OBJECT_SCHEMA_NAME(ts.object_id, ts.database_id), N'dbo'),
+            type_desc = N'TRIGGER',
+            sql_handle = ts.sql_handle,
+            plan_handle = ts.plan_handle,
+            cached_time = ts.cached_time,
+            last_execution_time = ts.last_execution_time,
+            execution_count = ts.execution_count,
+            total_worker_time = ts.total_worker_time,
+            min_worker_time = ts.min_worker_time,
+            max_worker_time = ts.max_worker_time,
+            total_elapsed_time = ts.total_elapsed_time,
+            min_elapsed_time = ts.min_elapsed_time,
+            max_elapsed_time = ts.max_elapsed_time,
+            total_logical_reads = ts.total_logical_reads,
+            min_logical_reads = ts.min_logical_reads,
+            max_logical_reads = ts.max_logical_reads,
+            total_physical_reads = ts.total_physical_reads,
+            min_physical_reads = ts.min_physical_reads,
+            max_physical_reads = ts.max_physical_reads,
+            total_logical_writes = ts.total_logical_writes,
+            min_logical_writes = ts.min_logical_writes,
+            max_logical_writes = ts.max_logical_writes,
+            total_spills = ts.total_spills,
+            min_spills = ts.min_spills,
+            max_spills = ts.max_spills,
+            query_plan_text = CONVERT(nvarchar(max), tqp.query_plan)
+        FROM sys.dm_exec_trigger_stats AS ts
+        CROSS APPLY sys.dm_exec_sql_text(ts.sql_handle) AS st
+        OUTER APPLY
+            sys.dm_exec_text_query_plan
+            (
+                ts.plan_handle,
+                0,
+                -1
+            ) AS tqp
+        OUTER APPLY
+        (
+            SELECT
+                dbid = CONVERT(integer, pa.value)
+            FROM sys.dm_exec_plan_attributes(ts.plan_handle) AS pa
+            WHERE pa.attribute = N'dbid'
+        ) AS pa
+        LEFT JOIN sys.databases AS d
+          ON pa.dbid = d.database_id
+        WHERE ts.last_execution_time >= @cutoff_time
+        AND   pa.dbid NOT IN
+        (
+            1, 3, 4, 32761, 32767,
+            DB_ID(N'PerformanceMonitor')
+        )
+        AND   pa.dbid < 32761 /*exclude contained AG system databases*/
+        UNION ALL
+
+        SELECT
+            server_start_time = @server_start_time,
+            object_type = N'FUNCTION',
+            database_name = d.name,
+            object_id = fs.object_id,
+            object_name = OBJECT_NAME(fs.object_id, fs.database_id),
+            schema_name = OBJECT_SCHEMA_NAME(fs.object_id, fs.database_id),
+            type_desc = N'FUNCTION',
+            sql_handle = fs.sql_handle,
+            plan_handle = fs.plan_handle,
+            cached_time = fs.cached_time,
+            last_execution_time = fs.last_execution_time,
+            execution_count = fs.execution_count,
+            total_worker_time = fs.total_worker_time,
+            min_worker_time = fs.min_worker_time,
+            max_worker_time = fs.max_worker_time,
+            total_elapsed_time = fs.total_elapsed_time,
+            min_elapsed_time = fs.min_elapsed_time,
+            max_elapsed_time = fs.max_elapsed_time,
+            total_logical_reads = fs.total_logical_reads,
+            min_logical_reads = fs.min_logical_reads,
+            max_logical_reads = fs.max_logical_reads,
+            total_physical_reads = fs.total_physical_reads,
+            min_physical_reads = fs.min_physical_reads,
+            max_physical_reads = fs.max_physical_reads,
+            total_logical_writes = fs.total_logical_writes,
+            min_logical_writes = fs.min_logical_writes,
+            max_logical_writes = fs.max_logical_writes,
+            total_spills = NULL,
+            min_spills = NULL,
+            max_spills = NULL,
+            query_plan_text = CONVERT(nvarchar(max), tqp.query_plan)
+        FROM sys.dm_exec_function_stats AS fs
+        OUTER APPLY
+            sys.dm_exec_text_query_plan
+            (
+                fs.plan_handle,
+                0,
+                -1
+            ) AS tqp
+        OUTER APPLY
+        (
+            SELECT 
+                dbid = CONVERT(integer, pa.value)
+            FROM sys.dm_exec_plan_attributes(fs.plan_handle) AS pa
+            WHERE pa.attribute = N'dbid'
+        ) AS pa
+        LEFT JOIN sys.databases AS d
+          ON pa.dbid = d.database_id
+        WHERE fs.last_execution_time >= @cutoff_time
+        AND   pa.dbid NOT IN
+        (
+            1, 3, 4, 32761, 32767,
+            DB_ID(N'PerformanceMonitor')
+        )
+        AND   pa.dbid < 32761 /*exclude contained AG system databases*/
+        OPTION(RECOMPILE);
+        
+        SET @rows_collected = ROWCOUNT_BIG();
+        
+        /*
+        Calculate deltas for the newly inserted data
+        */
+        EXECUTE collect.calculate_deltas
+            @table_name = N'procedure_stats',
+            @debug = @debug;
+
+        /*Tie statement sto procedures when possible*/
+        UPDATE
+            qs
+        SET
+            qs.object_type = ISNULL(ps.object_type,'STATEMENT'),
+            qs.schema_name = ISNULL(ps.schema_name, N'N/A'),
+            qs.object_name = ISNULL(ps.object_name, N'N/A')
+        FROM collect.query_stats AS qs
+        LEFT JOIN collect.procedure_stats AS ps
+          ON  ps.sql_handle = qs.sql_handle
+          AND ps.collection_time >= DATEADD(MINUTE, -1, @cutoff_time)
+        WHERE qs.object_type = 'STATEMENT'
+        AND   qs.schema_name IS NULL
+        AND   qs.object_name IS NULL
+        OPTION(RECOMPILE);
+
+        
+        /*
+        Log successful collection
+        */
+        INSERT INTO
+            config.collection_log
+        (
+            collector_name,
+            collection_status,
+            rows_collected,
+            duration_ms
+        )
+        VALUES
+        (
+            N'procedure_stats_collector',
+            N'SUCCESS',
+            @rows_collected,
+            DATEDIFF(MILLISECOND, @start_time, SYSDATETIME())
+        );
+        
+        IF @debug = 1
+        BEGIN
+            RAISERROR(N'Collected %d procedure/trigger/function stats rows', 0, 1, @rows_collected) WITH NOWAIT;
+        END;
+        
+        COMMIT TRANSACTION;
+        
+    END TRY
+    BEGIN CATCH
+        IF @@TRANCOUNT > 0
+        BEGIN
+            ROLLBACK TRANSACTION;
+        END;
+        
+        DECLARE
+            @error_message nvarchar(4000) = ERROR_MESSAGE();
+        
+        /*
+        Log the error
+        */
+        INSERT INTO
+            config.collection_log
+        (
+            collector_name,
+            collection_status,
+            duration_ms,
+            error_message
+        )
+        VALUES
+        (
+            N'procedure_stats_collector',
+            N'ERROR',
+            DATEDIFF(MILLISECOND, @start_time, SYSDATETIME()),
+            @error_message
+        );
+        
+        RAISERROR(N'Error in procedure stats collector: %s', 16, 1, @error_message);
+    END CATCH;
+END;
+GO
+
+PRINT 'Procedure stats collector created successfully';
+GO

From 95755f0f322e60a7da6eaca28eaeabab7358f3c4 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 17:09:41 -0500
Subject: [PATCH 20/34] Increase DataGrid row height from 25 to 28 to fix text
 clipping

All 6 DataGrids in ServerTab used RowHeight="25" which caused text
overlap on systems with certain DPI/font settings (reported on
Windows Server 2019). Bumped to 28 for consistent spacing.

Closes #72

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Dashboard/ServerTab.xaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dashboard/ServerTab.xaml b/Dashboard/ServerTab.xaml
index 2467781f..7371fea2 100644
--- a/Dashboard/ServerTab.xaml
+++ b/Dashboard/ServerTab.xaml
@@ -228,7 +228,7 @@
                     <TabItem Header="Server Config Changes">
                         <Grid>
                         <DataGrid x:Name="ServerConfigChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                                       RowStyle="{StaticResource DefaultRowStyle}"
                                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                                 <DataGrid.Columns>
@@ -345,7 +345,7 @@
                     <TabItem Header="Database Config Changes">
                         <Grid>
                         <DataGrid x:Name="DatabaseConfigChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                                       RowStyle="{StaticResource DefaultRowStyle}"
                                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                                 <DataGrid.Columns>
@@ -415,7 +415,7 @@
                     <TabItem Header="Trace Flag Changes">
                         <Grid>
                         <DataGrid x:Name="TraceFlagChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                                       RowStyle="{StaticResource DefaultRowStyle}"
                                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                                 <DataGrid.Columns>
@@ -593,7 +593,7 @@
                     <TabItem Header="Running Jobs">
                         <Grid>
                             <DataGrid x:Name="RunningJobsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                                 <DataGrid.Resources>
                                     <Style TargetType="DataGridRow">
@@ -705,7 +705,7 @@
                     <TabItem Header="Blocking">
                         <Grid>
                         <DataGrid x:Name="BlockingEventsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                                       RowStyle="{StaticResource DefaultRowStyle}"
                                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                                 <DataGrid.Columns>
@@ -889,7 +889,7 @@
                     <TabItem Header="Deadlocks">
                         <Grid>
                         <DataGrid x:Name="DeadlocksDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                                       RowStyle="{StaticResource DefaultRowStyle}"
                                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                                 <DataGrid.Columns>

From 47010a9212a8db168cb3c964375cc801122ab31f Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 17:14:24 -0500
Subject: [PATCH 21/34] Add FocusServerTabOnClick user setting for server tab
 navigation

When disabled, clicking a server card in Overview creates the tab
without switching away from the current view. Existing-tab clicks
always focus regardless of setting. Default is true (current behavior).

Closes #71

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Dashboard/MainWindow.xaml.cs        | 7 ++++++-
 Dashboard/Models/UserPreferences.cs | 3 +++
 Dashboard/SettingsWindow.xaml       | 8 +++++++-
 Dashboard/SettingsWindow.xaml.cs    | 6 ++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Dashboard/MainWindow.xaml.cs b/Dashboard/MainWindow.xaml.cs
index 2c093a3c..9640386e 100644
--- a/Dashboard/MainWindow.xaml.cs
+++ b/Dashboard/MainWindow.xaml.cs
@@ -533,7 +533,12 @@ private void OpenServerTab(ServerConnection server)
 
             ServerTabControl.Items.Add(tabItem);
             _openTabs[server.Id] = tabItem;
-            ServerTabControl.SelectedItem = tabItem;
+
+            var prefs = _preferencesService.GetPreferences();
+            if (prefs.FocusServerTabOnClick)
+            {
+                ServerTabControl.SelectedItem = tabItem;
+            }
 
             _serverManager.UpdateLastConnected(server.Id);
         }
diff --git a/Dashboard/Models/UserPreferences.cs b/Dashboard/Models/UserPreferences.cs
index 07f874fe..24ea603d 100644
--- a/Dashboard/Models/UserPreferences.cs
+++ b/Dashboard/Models/UserPreferences.cs
@@ -100,6 +100,9 @@ public class UserPreferences
         public bool McpEnabled { get; set; } = false;
         public int McpPort { get; set; } = 5150;
 
+        // Navigation settings
+        public bool FocusServerTabOnClick { get; set; } = true;
+
         // Update check settings
         public bool CheckForUpdatesOnStartup { get; set; } = true;
 
diff --git a/Dashboard/SettingsWindow.xaml b/Dashboard/SettingsWindow.xaml
index d44a7a4f..b86ae316 100644
--- a/Dashboard/SettingsWindow.xaml
+++ b/Dashboard/SettingsWindow.xaml
@@ -54,7 +54,7 @@
 
                         <!-- Default Time Range Section -->
                         <TextBlock Text="Default Time Range" FontWeight="Bold" FontSize="13" Margin="0,0,0,10"/>
-                        <StackPanel Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,20">
                             <TextBlock Text="Show data from last:" VerticalAlignment="Center" Margin="0,0,10,0"/>
                             <ComboBox x:Name="DefaultTimeRangeComboBox" Width="120" SelectionChanged="DefaultTimeRangeComboBox_Changed">
                                 <ComboBoxItem Content="1 hour" Tag="1"/>
@@ -63,6 +63,12 @@
                                 <ComboBoxItem Content="7 days" Tag="168"/>
                             </ComboBox>
                         </StackPanel>
+
+                        <!-- Navigation Section -->
+                        <TextBlock Text="Navigation" FontWeight="Bold" FontSize="13" Margin="0,0,0,10"/>
+                        <CheckBox x:Name="FocusServerTabCheckBox"
+                                  Content="Focus server tab when clicking a server card"
+                                  Margin="0,0,0,0"/>
                     </StackPanel>
                 </ScrollViewer>
             </TabItem>
diff --git a/Dashboard/SettingsWindow.xaml.cs b/Dashboard/SettingsWindow.xaml.cs
index 99e4fcf0..e80f5720 100644
--- a/Dashboard/SettingsWindow.xaml.cs
+++ b/Dashboard/SettingsWindow.xaml.cs
@@ -86,6 +86,9 @@ private void LoadSettings()
                 DefaultTimeRangeComboBox.SelectedIndex = 2; // 24 hours
             }
 
+            // Navigation settings
+            FocusServerTabCheckBox.IsChecked = prefs.FocusServerTabOnClick;
+
             // Query logging settings
             LogSlowQueriesCheckBox.IsChecked = prefs.LogSlowQueries;
             QueryLogger.SetEnabled(prefs.LogSlowQueries);
@@ -420,6 +423,9 @@ private void OkButton_Click(object sender, RoutedEventArgs e)
                 prefs.DefaultHoursBack = int.Parse(rangeItem.Tag.ToString()!, CultureInfo.InvariantCulture);
             }
 
+            // Save navigation settings
+            prefs.FocusServerTabOnClick = FocusServerTabCheckBox.IsChecked == true;
+
             // Save query logging settings
             prefs.LogSlowQueries = LogSlowQueriesCheckBox.IsChecked == true;
             QueryLogger.SetEnabled(prefs.LogSlowQueries);

From b5d8477c0aea1255a1f4fc1a6e939b9a42390726 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 17:32:10 -0500
Subject: [PATCH 22/34] Fix deadlock charts not populating data (fixes #73)

Four fixes for the deadlock chart pipeline:

- Dashboard charts: plot raw per-interval columns instead of delta columns
  (blocking_event_count, deadlock_count, etc.) since delta framework
  incorrectly computed current-previous=0 for per-interval values
- XAML: remove "(Delta)" from all four Locking > Trends chart titles
- Analyzer: filter collect.deadlocks on collection_time instead of
  event_date so late-arriving XE deadlock events are not missed
- Process XML: add +1 second buffer to @end_date so sp_BlitzLock's
  strict less-than filter works when processing a single deadlock event

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Dashboard/ServerTab.xaml                  |  8 ++++----
 Dashboard/ServerTab.xaml.cs               | 16 ++++++++--------
 install/25_process_deadlock_xml.sql       |  2 +-
 install/26_blocking_deadlock_analyzer.sql |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Dashboard/ServerTab.xaml b/Dashboard/ServerTab.xaml
index 2467781f..70f7efb6 100644
--- a/Dashboard/ServerTab.xaml
+++ b/Dashboard/ServerTab.xaml
@@ -1122,7 +1122,7 @@
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="*"/>
                                         </Grid.RowDefinitions>
-                                        <TextBlock Grid.Row="0" Text="Blocking Events (Delta)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                                        <TextBlock Grid.Row="0" Text="Blocking Events" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
                                         <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsBlockingEventsChart"/>
                                     </Grid>
                                 </Border>
@@ -1133,7 +1133,7 @@
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="*"/>
                                         </Grid.RowDefinitions>
-                                        <TextBlock Grid.Row="0" Text="Blocking Duration (Delta ms)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                                        <TextBlock Grid.Row="0" Text="Blocking Duration (ms)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
                                         <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsDurationChart"/>
                                     </Grid>
                                 </Border>
@@ -1144,7 +1144,7 @@
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="*"/>
                                         </Grid.RowDefinitions>
-                                        <TextBlock Grid.Row="0" Text="Deadlock Count (Delta)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                                        <TextBlock Grid.Row="0" Text="Deadlock Count" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
                                         <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsDeadlocksChart"/>
                                     </Grid>
                                 </Border>
@@ -1155,7 +1155,7 @@
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="*"/>
                                         </Grid.RowDefinitions>
-                                        <TextBlock Grid.Row="0" Text="Deadlock Wait Time (Delta ms)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                                        <TextBlock Grid.Row="0" Text="Deadlock Wait Time (ms)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
                                         <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsDeadlockWaitTimeChart"/>
                                     </Grid>
                                 </Border>
diff --git a/Dashboard/ServerTab.xaml.cs b/Dashboard/ServerTab.xaml.cs
index 821509ed..51c17f69 100644
--- a/Dashboard/ServerTab.xaml.cs
+++ b/Dashboard/ServerTab.xaml.cs
@@ -1661,13 +1661,13 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
             var orderedData = data?.OrderBy(d => d.CollectionTime).ToList() ?? new List<BlockingDeadlockStatsItem>();
 
             // Get all unique time points for consistent X-axis across all charts
-            // Blocking Events Delta Chart
+            // Blocking Events Chart (raw per-interval count, not delta)
             BlockingStatsBlockingEventsChart.Plot.Clear();
             _blockingEventsHover?.Clear();
             ApplyDarkModeToChart(BlockingStatsBlockingEventsChart);
             var (blockingXs, blockingYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
-                orderedData.Select(d => (double)d.BlockingEventCountDelta));
+                orderedData.Select(d => (double)d.BlockingEventCount));
             if (blockingXs.Length > 0)
             {
                 var scatter = BlockingStatsBlockingEventsChart.Plot.Add.Scatter(blockingXs, blockingYs);
@@ -1691,13 +1691,13 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
             LockChartVerticalAxis(BlockingStatsBlockingEventsChart);
             BlockingStatsBlockingEventsChart.Refresh();
 
-            // Blocking Duration Delta Chart
+            // Blocking Duration Chart (raw per-interval total, not delta)
             BlockingStatsDurationChart.Plot.Clear();
             _blockingDurationHover?.Clear();
             ApplyDarkModeToChart(BlockingStatsDurationChart);
             var (durationXs, durationYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
-                orderedData.Select(d => (double)d.TotalBlockingDurationMsDelta));
+                orderedData.Select(d => (double)d.TotalBlockingDurationMs));
             if (durationXs.Length > 0)
             {
                 var scatter = BlockingStatsDurationChart.Plot.Add.Scatter(durationXs, durationYs);
@@ -1721,13 +1721,13 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
             LockChartVerticalAxis(BlockingStatsDurationChart);
             BlockingStatsDurationChart.Refresh();
 
-            // Deadlock Count Delta Chart
+            // Deadlock Count Chart (raw per-interval count, not delta)
             BlockingStatsDeadlocksChart.Plot.Clear();
             _deadlocksHover?.Clear();
             ApplyDarkModeToChart(BlockingStatsDeadlocksChart);
             var (deadlockXs, deadlockYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
-                orderedData.Select(d => (double)d.DeadlockCountDelta));
+                orderedData.Select(d => (double)d.DeadlockCount));
             if (deadlockXs.Length > 0)
             {
                 var scatter = BlockingStatsDeadlocksChart.Plot.Add.Scatter(deadlockXs, deadlockYs);
@@ -1751,13 +1751,13 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
             LockChartVerticalAxis(BlockingStatsDeadlocksChart);
             BlockingStatsDeadlocksChart.Refresh();
 
-            // Deadlock Wait Time Chart
+            // Deadlock Wait Time Chart (raw per-interval total, not delta)
             BlockingStatsDeadlockWaitTimeChart.Plot.Clear();
             _deadlockWaitTimeHover?.Clear();
             ApplyDarkModeToChart(BlockingStatsDeadlockWaitTimeChart);
             var (deadlockWaitXs, deadlockWaitYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
-                orderedData.Select(d => (double)d.TotalDeadlockWaitTimeMsDelta));
+                orderedData.Select(d => (double)d.TotalDeadlockWaitTimeMs));
             if (deadlockWaitXs.Length > 0)
             {
                 var scatter = BlockingStatsDeadlockWaitTimeChart.Plot.Add.Scatter(deadlockWaitXs, deadlockWaitYs);
diff --git a/install/25_process_deadlock_xml.sql b/install/25_process_deadlock_xml.sql
index 85c713ce..b7e75850 100644
--- a/install/25_process_deadlock_xml.sql
+++ b/install/25_process_deadlock_xml.sql
@@ -129,7 +129,7 @@ BEGIN
             BEGIN
                 SELECT
                     @start_date = MIN(dx.event_time),
-                    @end_date = MAX(dx.event_time)
+                    @end_date = DATEADD(SECOND, 1, MAX(dx.event_time))
                 FROM collect.deadlock_xml AS dx
                 WHERE dx.is_processed = 0
                 AND   dx.event_time IS NOT NULL
diff --git a/install/26_blocking_deadlock_analyzer.sql b/install/26_blocking_deadlock_analyzer.sql
index b02a8fae..d8dfe243 100644
--- a/install/26_blocking_deadlock_analyzer.sql
+++ b/install/26_blocking_deadlock_analyzer.sql
@@ -102,7 +102,7 @@ BEGIN
 
             RAISERROR(N'Aggregating blocking and deadlock events from the last %d hour(s)', 0, 1, @lookback_hours) WITH NOWAIT;
             RAISERROR(N'Blocking: counting events from %s', 0, 1, @blocking_range) WITH NOWAIT;
-            RAISERROR(N'Deadlock: counting events from %s (interval-based)', 0, 1, @deadlock_range) WITH NOWAIT;
+            RAISERROR(N'Deadlock: counting events collected from %s (by collection_time)', 0, 1, @deadlock_range) WITH NOWAIT;
         END;
 
         /*
@@ -188,8 +188,8 @@ BEGIN
                     total_deadlock_wait_time_ms = SUM(bl.wait_time),
                     victim_count = SUM(CASE WHEN bl.deadlock_group LIKE N'%- VICTIM' THEN 1 ELSE 0 END)
                 FROM collect.deadlocks AS bl
-                WHERE bl.event_date >= @last_deadlock_collection
-                AND   bl.event_date < @start_time
+                WHERE bl.collection_time >= @last_deadlock_collection
+                AND   bl.collection_time < @start_time
                 GROUP BY
                     bl.database_name
             )

From 4efc6f67558165928f04bb135fb5191e1ff983f9 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Mon, 16 Feb 2026 18:20:03 -0500
Subject: [PATCH 23/34] Add missing chart hover tooltips for CPU, Memory, and
 TempDB charts in Lite

Wire up ChartHoverHelper for the three Lite charts that were missing
tooltip support. Wait Stats, Perfmon, TempDB File I/O, and File I/O
charts already had this; CPU, Memory, and TempDB (by type) did not.

Closes #81

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Lite/Controls/ServerTab.xaml.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index 0d16810a..4b771b0f 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -39,6 +39,9 @@ public partial class ServerTab : UserControl
     private List<SelectableItem> _perfmonCounterItems = new();
     private Helpers.ChartHoverHelper? _waitStatsHover;
     private Helpers.ChartHoverHelper? _perfmonHover;
+    private Helpers.ChartHoverHelper? _cpuHover;
+    private Helpers.ChartHoverHelper? _memoryHover;
+    private Helpers.ChartHoverHelper? _tempDbHover;
     private Helpers.ChartHoverHelper? _tempDbFileIoHover;
     private Helpers.ChartHoverHelper? _fileIoReadHover;
     private Helpers.ChartHoverHelper? _fileIoWriteHover;
@@ -129,6 +132,9 @@ public ServerTab(ServerConnection server, DuckDbInitializer duckDb, CredentialSe
         /* Chart hover tooltips */
         _waitStatsHover = new Helpers.ChartHoverHelper(WaitStatsChart, "ms/sec");
         _perfmonHover = new Helpers.ChartHoverHelper(PerfmonChart, "");
+        _cpuHover = new Helpers.ChartHoverHelper(CpuChart, "%");
+        _memoryHover = new Helpers.ChartHoverHelper(MemoryChart, "GB");
+        _tempDbHover = new Helpers.ChartHoverHelper(TempDbChart, "MB");
         _tempDbFileIoHover = new Helpers.ChartHoverHelper(TempDbFileIoChart, "ms");
         _fileIoReadHover = new Helpers.ChartHoverHelper(FileIoReadChart, "ms");
         _fileIoWriteHover = new Helpers.ChartHoverHelper(FileIoWriteChart, "ms");
@@ -589,6 +595,7 @@ private static string FormatMb(double mb)
     private void UpdateCpuChart(List<CpuUtilizationRow> data)
     {
         ClearChart(CpuChart);
+        _cpuHover?.Clear();
         ApplyDarkTheme(CpuChart);
 
         if (data.Count == 0) { CpuChart.Refresh(); return; }
@@ -600,10 +607,12 @@ private void UpdateCpuChart(List<CpuUtilizationRow> data)
         var sqlPlot = CpuChart.Plot.Add.Scatter(times, sqlCpu);
         sqlPlot.LegendText = "SQL Server";
         sqlPlot.Color = ScottPlot.Color.FromHex("#4FC3F7");
+        _cpuHover?.Add(sqlPlot, "SQL Server");
 
         var otherPlot = CpuChart.Plot.Add.Scatter(times, otherCpu);
         otherPlot.LegendText = "Other";
         otherPlot.Color = ScottPlot.Color.FromHex("#E57373");
+        _cpuHover?.Add(otherPlot, "Other");
 
         CpuChart.Plot.Axes.DateTimeTicksBottom();
         ReapplyAxisColors(CpuChart);
@@ -617,6 +626,7 @@ private void UpdateCpuChart(List<CpuUtilizationRow> data)
     private void UpdateMemoryChart(List<MemoryTrendPoint> data, List<MemoryTrendPoint> grantData)
     {
         ClearChart(MemoryChart);
+        _memoryHover?.Clear();
         ApplyDarkTheme(MemoryChart);
 
         if (data.Count == 0) { MemoryChart.Refresh(); return; }
@@ -629,15 +639,18 @@ private void UpdateMemoryChart(List<MemoryTrendPoint> data, List<MemoryTrendPoin
         var totalPlot = MemoryChart.Plot.Add.Scatter(times, totalMem);
         totalPlot.LegendText = "Total Server Memory";
         totalPlot.Color = ScottPlot.Color.FromHex("#4FC3F7");
+        _memoryHover?.Add(totalPlot, "Total Server Memory");
 
         var targetPlot = MemoryChart.Plot.Add.Scatter(times, targetMem);
         targetPlot.LegendText = "Target Memory";
         targetPlot.Color = ScottPlot.Colors.Gray;
         targetPlot.LineStyle.Pattern = LinePattern.Dashed;
+        _memoryHover?.Add(targetPlot, "Target Memory");
 
         var bpPlot = MemoryChart.Plot.Add.Scatter(times, bufferPool);
         bpPlot.LegendText = "Buffer Pool";
         bpPlot.Color = ScottPlot.Color.FromHex("#81C784");
+        _memoryHover?.Add(bpPlot, "Buffer Pool");
 
         /* Memory grants trend line — show zero line when no grant data */
         double[] grantTimes, grantMb;
@@ -655,6 +668,7 @@ private void UpdateMemoryChart(List<MemoryTrendPoint> data, List<MemoryTrendPoin
         var grantPlot = MemoryChart.Plot.Add.Scatter(grantTimes, grantMb);
         grantPlot.LegendText = "Memory Grants";
         grantPlot.Color = ScottPlot.Color.FromHex("#FFB74D");
+        _memoryHover?.Add(grantPlot, "Memory Grants");
 
         MemoryChart.Plot.Axes.DateTimeTicksBottom();
         ReapplyAxisColors(MemoryChart);
@@ -670,6 +684,7 @@ private void UpdateMemoryChart(List<MemoryTrendPoint> data, List<MemoryTrendPoin
     private void UpdateTempDbChart(List<TempDbRow> data)
     {
         ClearChart(TempDbChart);
+        _tempDbHover?.Clear();
         ApplyDarkTheme(TempDbChart);
 
         if (data.Count == 0) { TempDbChart.Refresh(); return; }
@@ -682,14 +697,17 @@ private void UpdateTempDbChart(List<TempDbRow> data)
         var userPlot = TempDbChart.Plot.Add.Scatter(times, userObj);
         userPlot.LegendText = "User Objects";
         userPlot.Color = ScottPlot.Color.FromHex("#4FC3F7");
+        _tempDbHover?.Add(userPlot, "User Objects");
 
         var internalPlot = TempDbChart.Plot.Add.Scatter(times, internalObj);
         internalPlot.LegendText = "Internal Objects";
         internalPlot.Color = ScottPlot.Color.FromHex("#FFD54F");
+        _tempDbHover?.Add(internalPlot, "Internal Objects");
 
         var vsPlot = TempDbChart.Plot.Add.Scatter(times, versionStore);
         vsPlot.LegendText = "Version Store";
         vsPlot.Color = ScottPlot.Color.FromHex("#81C784");
+        _tempDbHover?.Add(vsPlot, "Version Store");
 
         TempDbChart.Plot.Axes.DateTimeTicksBottom();
         ReapplyAxisColors(TempDbChart);

From ea13df4809d973e6587abb693360db348ea1cf2a Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Tue, 17 Feb 2026 00:12:47 -0500
Subject: [PATCH 24/34] Pass @skip_locks and @skip_waits to sp_HealthParser in
 collector wrapper

The dashboard doesn't display blocking/deadlock or wait stats data from
sp_HealthParser. Passing @skip_locks = 1 and @skip_waits = 1 (defaulted
on) reduces collection time from 43s to 1.6s (27x improvement).

Requires sp_HealthParser 3.3+ (DarlingData PR #666/#667).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 install/28_collect_system_health_wrapper.sql | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/install/28_collect_system_health_wrapper.sql b/install/28_collect_system_health_wrapper.sql
index 82d63a5f..1c2b7fc2 100644
--- a/install/28_collect_system_health_wrapper.sql
+++ b/install/28_collect_system_health_wrapper.sql
@@ -36,6 +36,8 @@ ALTER PROCEDURE
     @what_to_check varchar(10) = 'all', /*What portion of data to collect (all, waits, cpu, memory, disk, system, locking)*/
     @hours_back integer = 1, /*How many hours back to analyze*/
     @warnings_only bit = 1, /*Only collect data from recorded warnings*/
+    @skip_locks bit = 1, /*Skip the blocking and deadlocks section*/
+    @skip_waits bit = 1, /*Skip the wait stats section*/
     @log_retention_days integer = 30, /*Days to retain sp_HealthParser data*/
     @procedure_database sysname = NULL, /*Database where sp_HealthParser is installed (NULL = search PerformanceMonitor then master)*/
     @debug bit = 0 /*Print debugging information*/
@@ -164,6 +166,8 @@ BEGIN
             @start_date = @start_date,
             @end_date = @end_date,
             @warnings_only = @warnings_only,
+            @skip_locks = @skip_locks,
+            @skip_waits = @skip_waits,
             @log_to_table = 1,
             @log_database_name = N''PerformanceMonitor'',
             @log_schema_name = N''collect'',
@@ -173,11 +177,13 @@ BEGIN
 
         EXECUTE sys.sp_executesql
             @sql,
-            N'@what_to_check varchar(10), @start_date datetimeoffset(7), @end_date datetimeoffset(7), @warnings_only bit, @log_retention_days integer, @debug bit',
+            N'@what_to_check varchar(10), @start_date datetimeoffset(7), @end_date datetimeoffset(7), @warnings_only bit, @skip_locks bit, @skip_waits bit, @log_retention_days integer, @debug bit',
             @what_to_check = @what_to_check,
             @start_date = @start_date,
             @end_date = @end_date,
             @warnings_only = @warnings_only,
+            @skip_locks = @skip_locks,
+            @skip_waits = @skip_waits,
             @log_retention_days = @log_retention_days,
             @debug = @debug;
         

From cc15b19a7217a3ca4ecf4dfbacaffa14a1c3a14a Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Tue, 17 Feb 2026 01:22:48 -0500
Subject: [PATCH 25/34] Chain-trigger blocking/deadlock parsers, optimize XML
 collection, tune schedule (#86)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Blocked process and deadlock XML collectors now chain-trigger their
  parsers and analyzer immediately when rows are found, eliminating up
  to 15 min pipeline latency
- Materialize XE ring buffer XML into table variable before shredding,
  avoiding repeated XML document validation (35s → 300ms under load)
- Master collector passes @minutes_back = frequency * 2 instead of
  defaulting to 15 min lookback every cycle
- Bump 18 cheap collectors to 1-min frequency, 4 medium to 2-min

Tested on sql2022 under TPC-C workload: 79 deadlock events collected
in 297ms (was 35s), chain triggers fire correctly, zero CHAIN_ERRORs.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 install/04_create_schedule_table.sql      |  42 +++---
 install/22_collect_blocked_processes.sql  | 172 +++++++++++++++-------
 install/24_collect_deadlock_xml.sql       | 172 +++++++++++++++-------
 install/42_scheduled_master_collector.sql |   8 +-
 4 files changed, 270 insertions(+), 124 deletions(-)

diff --git a/install/04_create_schedule_table.sql b/install/04_create_schedule_table.sql
index f1c1b31d..d73c13b4 100644
--- a/install/04_create_schedule_table.sql
+++ b/install/04_create_schedule_table.sql
@@ -43,39 +43,39 @@ SELECT
 FROM
 (
     VALUES
-    (N'wait_stats_collector', 1, 5, 2, 30, N'Wait statistics - high frequency for trending'),
+    (N'wait_stats_collector', 1, 1, 2, 30, N'Wait statistics - high frequency for trending'),
     (N'query_stats_collector', 1, 2, 5, 30, N'Plan cache queries - recent activity focused'),
-    (N'memory_stats_collector', 1, 5, 2, 30, N'Memory pressure monitoring'),
-    (N'memory_pressure_events_collector', 1, 5, 5, 30, N'Ring buffer system events'),
+    (N'memory_stats_collector', 1, 1, 2, 30, N'Memory pressure monitoring'),
+    (N'memory_pressure_events_collector', 1, 1, 5, 30, N'Ring buffer system events'),
     (N'system_health_collector', 1, 5, 10, 30, N'System health extended events via sp_HealthParser'),
-    (N'blocked_process_xml_collector', 1, 5, 2, 30, N'Fast blocked process XML collection'),
-    (N'deadlock_xml_collector', 1, 5, 3, 30, N'Fast deadlock XML collection'),
-    (N'process_blocked_process_xml', 1, 5, 5, 30, N'Parse blocked process XML via sp_HumanEventsBlockViewer'),
-    (N'blocking_deadlock_analyzer', 1, 5, 5, 30, N'Analyze blocking/deadlock trends and alert on significant increases'),
-    (N'process_deadlock_xml', 1, 5, 5, 30, N'Parse deadlock XML via sp_BlitzLock'),
-    (N'query_store_collector', 1, 5, 10, 30, N'Query Store data collection'),
-    (N'procedure_stats_collector', 1, 5, 10, 30, N'Procedure/trigger/function statistics'),
+    (N'blocked_process_xml_collector', 1, 1, 2, 30, N'Fast blocked process XML collection (chain-triggers parser + analyzer)'),
+    (N'deadlock_xml_collector', 1, 1, 3, 30, N'Fast deadlock XML collection (chain-triggers parser + analyzer)'),
+    (N'process_blocked_process_xml', 1, 5, 5, 30, N'Parse blocked process XML via sp_HumanEventsBlockViewer (also chain-triggered)'),
+    (N'blocking_deadlock_analyzer', 1, 5, 5, 30, N'Analyze blocking/deadlock trends (also chain-triggered)'),
+    (N'process_deadlock_xml', 1, 5, 5, 30, N'Parse deadlock XML via sp_BlitzLock (also chain-triggered)'),
+    (N'query_store_collector', 1, 2, 10, 30, N'Query Store data collection'),
+    (N'procedure_stats_collector', 1, 2, 10, 30, N'Procedure/trigger/function statistics'),
     (N'query_snapshots_collector', 1, 1, 2, 10, N'Currently executing queries with session wait stats (every minute - high frequency)'),
-    (N'file_io_stats_collector', 1, 5, 2, 30, N'File I/O statistics from dm_io_virtual_file_stats'),
-    (N'memory_grant_stats_collector', 1, 5, 2, 30, N'Memory grant semaphore pressure monitoring'),
-    (N'cpu_scheduler_stats_collector', 1, 5, 2, 30, N'CPU scheduler and workload group statistics'),
+    (N'file_io_stats_collector', 1, 1, 2, 30, N'File I/O statistics from dm_io_virtual_file_stats'),
+    (N'memory_grant_stats_collector', 1, 1, 2, 30, N'Memory grant semaphore pressure monitoring'),
+    (N'cpu_scheduler_stats_collector', 1, 1, 2, 30, N'CPU scheduler and workload group statistics'),
     (N'memory_clerks_stats_collector', 1, 5, 3, 30, N'Memory clerk allocation tracking'),
     (N'perfmon_stats_collector', 1, 5, 2, 30, N'Performance counter statistics from dm_os_performance_counters'),
-    (N'cpu_utilization_stats_collector', 1, 5, 2, 30, N'CPU utilization from ring buffer (SQL vs other processes)'),
+    (N'cpu_utilization_stats_collector', 1, 1, 2, 30, N'CPU utilization from ring buffer (SQL vs other processes)'),
     (N'trace_management_collector', 1, 1440, 5, 30, N'SQL Trace management for long-running queries'),
-    (N'trace_analysis_collector', 1, 5, 5, 30, N'Process trace files into analysis tables'),
+    (N'trace_analysis_collector', 1, 2, 5, 30, N'Process trace files into analysis tables'),
     (N'default_trace_collector', 1, 5, 3, 30, N'System events from default trace (memory, autogrow, config changes)'),
     (N'server_configuration_collector', 1, 1440, 5, 30, N'Server-level configuration settings and trace flags (daily collection)'),
     (N'database_configuration_collector', 1, 1440, 10, 30, N'Database-level configuration settings including scoped configs (daily collection)'),
     (N'configuration_issues_analyzer', 1, 1, 2, 30, N'Analyze configuration for issues: database config (Query Store, auto shrink/close), memory/CPU pressure warnings, server config (MAXDOP, priority boost)'),
-    (N'latch_stats_collector', 1, 5, 3, 30, N'Latch contention statistics - internal synchronization object waits'),
-    (N'spinlock_stats_collector', 1, 5, 3, 30, N'Spinlock contention statistics - lightweight synchronization primitive collisions'),
-    (N'tempdb_stats_collector', 1, 5, 2, 30, N'TempDB space usage - version store, user/internal objects, allocation contention'),
+    (N'latch_stats_collector', 1, 1, 3, 30, N'Latch contention statistics - internal synchronization object waits'),
+    (N'spinlock_stats_collector', 1, 1, 3, 30, N'Spinlock contention statistics - lightweight synchronization primitive collisions'),
+    (N'tempdb_stats_collector', 1, 1, 2, 30, N'TempDB space usage - version store, user/internal objects, allocation contention'),
     (N'plan_cache_stats_collector', 1, 5, 5, 30, N'Plan cache composition statistics - single-use plans and plan cache bloat detection'),
-    (N'session_stats_collector', 1, 5, 2, 30, N'Session and connection statistics - connection leaks and application patterns'),
-    (N'waiting_tasks_collector', 1, 5, 2, 30, N'Currently waiting tasks - blocking chains and wait analysis'),
+    (N'session_stats_collector', 1, 1, 2, 30, N'Session and connection statistics - connection leaks and application patterns'),
+    (N'waiting_tasks_collector', 1, 1, 2, 30, N'Currently waiting tasks - blocking chains and wait analysis'),
     (N'session_wait_stats_collector', 1, 1, 2, 30, N'Per-session wait statistics - correlates waits with specific sessions/queries (requires SQL Server 2016 SP1+)'),
-    (N'running_jobs_collector', 1, 5, 2, 7, N'Currently running SQL Agent jobs with historical duration comparison')
+    (N'running_jobs_collector', 1, 1, 2, 7, N'Currently running SQL Agent jobs with historical duration comparison')
 ) AS v (collector_name, enabled, frequency_minutes, max_duration_minutes, retention_days, description)
 WHERE NOT EXISTS
 (
diff --git a/install/22_collect_blocked_processes.sql b/install/22_collect_blocked_processes.sql
index 50b2fb8d..5032ad3b 100644
--- a/install/22_collect_blocked_processes.sql
+++ b/install/22_collect_blocked_processes.sql
@@ -162,89 +162,103 @@ BEGIN
         IF @is_azure_sql_db = 1
         BEGIN
             SET @sql = N'
-            WITH
-                ring_buffer_xml AS
+            DECLARE
+                @ring_buffer TABLE
             (
-                SELECT
-                    target_data = TRY_CAST(xet.target_data AS xml)
-                FROM sys.dm_xe_database_session_targets AS xet
-                JOIN sys.dm_xe_database_sessions AS xes
-                  ON xes.address = xet.event_session_address
-                WHERE xes.name = @session_name
-                AND   xet.target_name = N''ring_buffer''
-            ),
-                recent_events AS
+                ring_buffer xml NOT NULL
+            );
+
+            INSERT
+                @ring_buffer
             (
-                SELECT TOP (1000)
-                    event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)''),
-                    blocked_process_xml = evt.query(''.'')
-                FROM ring_buffer_xml AS rb
-                CROSS APPLY rb.target_data.nodes(''RingBufferTarget/event[@name="blocked_process_report"]'') AS q(evt)
-                WHERE evt.value(''(@timestamp)[1]'', ''datetime2(7)'') >= @cutoff_time
-                ORDER BY
-                    evt.value(''(@timestamp)[1]'', ''datetime2(7)'') DESC
+                ring_buffer
             )
+            SELECT
+                ring_xml = TRY_CAST(xet.target_data AS xml)
+            FROM sys.dm_xe_database_session_targets AS xet
+            JOIN sys.dm_xe_database_sessions AS xes
+              ON xes.address = xet.event_session_address
+            WHERE xes.name = @session_name
+            AND   xet.target_name = N''ring_buffer''
+            OPTION(RECOMPILE);
+
             INSERT INTO
                 collect.blocked_process_xml
             (
                 event_time,
                 blocked_process_xml
             )
-            SELECT
-                re.event_time,
-                re.blocked_process_xml
-            FROM recent_events AS re
-            WHERE NOT EXISTS
+            SELECT TOP (1000)
+                event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)''),
+                blocked_process_xml = evt.query(''.'')
+            FROM
+            (
+                SELECT
+                    rb.ring_buffer
+                FROM @ring_buffer AS rb
+            ) AS rb
+            CROSS APPLY rb.ring_buffer.nodes(''RingBufferTarget/event[@name="blocked_process_report"]'') AS q(evt)
+            WHERE evt.value(''(@timestamp)[1]'', ''datetime2(7)'') >= @cutoff_time
+            AND NOT EXISTS
             (
                 SELECT
                     1/0
                 FROM collect.blocked_process_xml AS bx
-                WHERE bx.event_time = re.event_time
+                WHERE bx.event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)'')
             )
+            ORDER BY
+                evt.value(''(@timestamp)[1]'', ''datetime2(7)'') DESC
             OPTION(RECOMPILE);';
         END;
         ELSE
         BEGIN
             SET @sql = N'
-            WITH
-                ring_buffer_xml AS
+            DECLARE
+                @ring_buffer TABLE
             (
-                SELECT
-                    target_data = TRY_CAST(xet.target_data AS xml)
-                FROM sys.dm_xe_session_targets AS xet
-                JOIN sys.dm_xe_sessions AS xes
-                  ON xes.address = xet.event_session_address
-                WHERE xes.name = @session_name
-                AND   xet.target_name = N''ring_buffer''
-            ),
-                recent_events AS
+                ring_buffer xml NOT NULL
+            );
+
+            INSERT
+                @ring_buffer
             (
-                SELECT TOP (1000)
-                    event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)''),
-                    blocked_process_xml = evt.query(''.'')
-                FROM ring_buffer_xml AS rb
-                CROSS APPLY rb.target_data.nodes(''RingBufferTarget/event[@name="blocked_process_report"]'') AS q(evt)
-                WHERE evt.value(''(@timestamp)[1]'', ''datetime2(7)'') >= @cutoff_time
-                ORDER BY
-                    evt.value(''(@timestamp)[1]'', ''datetime2(7)'') DESC
+                ring_buffer
             )
+            SELECT
+                ring_xml = TRY_CAST(xet.target_data AS xml)
+            FROM sys.dm_xe_session_targets AS xet
+            JOIN sys.dm_xe_sessions AS xes
+              ON xes.address = xet.event_session_address
+            WHERE xes.name = @session_name
+            AND   xet.target_name = N''ring_buffer''
+            OPTION(RECOMPILE);
+
             INSERT INTO
                 collect.blocked_process_xml
             (
                 event_time,
                 blocked_process_xml
             )
-            SELECT
-                re.event_time,
-                re.blocked_process_xml
-            FROM recent_events AS re
-            WHERE NOT EXISTS
+            SELECT TOP (1000)
+                event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)''),
+                blocked_process_xml = evt.query(''.'')
+            FROM
+            (
+                SELECT
+                    rb.ring_buffer
+                FROM @ring_buffer AS rb
+            ) AS rb
+            CROSS APPLY rb.ring_buffer.nodes(''RingBufferTarget/event[@name="blocked_process_report"]'') AS q(evt)
+            WHERE evt.value(''(@timestamp)[1]'', ''datetime2(7)'') >= @cutoff_time
+            AND NOT EXISTS
             (
                 SELECT
                     1/0
                 FROM collect.blocked_process_xml AS bx
-                WHERE bx.event_time = re.event_time
+                WHERE bx.event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)'')
             )
+            ORDER BY
+                evt.value(''(@timestamp)[1]'', ''datetime2(7)'') DESC
             OPTION(RECOMPILE);';
         END;
 
@@ -303,6 +317,64 @@ BEGIN
 
         COMMIT TRANSACTION;
 
+        /*
+        Chain-trigger: when new blocked process XML is found, immediately
+        parse it and run the analyzer instead of waiting for their next
+        scheduled runs. This eliminates up to 10 minutes of pipeline latency.
+        Parser/analyzer errors are logged but do not fail this collector.
+        */
+        IF @rows_collected > 0
+        BEGIN
+            IF @debug = 1
+            BEGIN
+                RAISERROR(N'Chain-triggering blocked process parser and analyzer', 0, 1) WITH NOWAIT;
+            END;
+
+            BEGIN TRY
+                EXECUTE collect.process_blocked_process_xml
+                    @debug = @debug;
+            END TRY
+            BEGIN CATCH
+                INSERT INTO
+                    config.collection_log
+                (
+                    collector_name,
+                    collection_status,
+                    duration_ms,
+                    error_message
+                )
+                VALUES
+                (
+                    N'blocked_process_xml_collector',
+                    N'CHAIN_ERROR',
+                    DATEDIFF(MILLISECOND, @start_time, SYSDATETIME()),
+                    N'Chain-triggered parser failed: ' + ERROR_MESSAGE()
+                );
+            END CATCH;
+
+            BEGIN TRY
+                EXECUTE collect.blocking_deadlock_analyzer
+                    @debug = @debug;
+            END TRY
+            BEGIN CATCH
+                INSERT INTO
+                    config.collection_log
+                (
+                    collector_name,
+                    collection_status,
+                    duration_ms,
+                    error_message
+                )
+                VALUES
+                (
+                    N'blocked_process_xml_collector',
+                    N'CHAIN_ERROR',
+                    DATEDIFF(MILLISECOND, @start_time, SYSDATETIME()),
+                    N'Chain-triggered analyzer failed: ' + ERROR_MESSAGE()
+                );
+            END CATCH;
+        END;
+
     END TRY
     BEGIN CATCH
         IF @@TRANCOUNT > 0
diff --git a/install/24_collect_deadlock_xml.sql b/install/24_collect_deadlock_xml.sql
index 17598e47..6bf8f877 100644
--- a/install/24_collect_deadlock_xml.sql
+++ b/install/24_collect_deadlock_xml.sql
@@ -123,89 +123,103 @@ BEGIN
         IF @is_azure_sql_db = 1
         BEGIN
             SET @sql = N'
-            WITH
-                ring_buffer_xml AS
+            DECLARE
+                @ring_buffer TABLE
             (
-                SELECT
-                    target_data = TRY_CAST(xet.target_data AS xml)
-                FROM sys.dm_xe_database_session_targets AS xet
-                JOIN sys.dm_xe_database_sessions AS xes
-                  ON xes.address = xet.event_session_address
-                WHERE xes.name = @session_name
-                AND   xet.target_name = N''ring_buffer''
-            ),
-                recent_events AS
+                ring_buffer xml NOT NULL
+            );
+
+            INSERT
+                @ring_buffer
             (
-                SELECT TOP (1000)
-                    event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)''),
-                    deadlock_xml = evt.query(''.'')
-                FROM ring_buffer_xml AS rb
-                CROSS APPLY rb.target_data.nodes(''RingBufferTarget/event[@name="xml_deadlock_report"]'') AS q(evt)
-                WHERE evt.value(''(@timestamp)[1]'', ''datetime2(7)'') >= @cutoff_time
-                ORDER BY
-                    evt.value(''(@timestamp)[1]'', ''datetime2(7)'') DESC
+                ring_buffer
             )
+            SELECT
+                ring_xml = TRY_CAST(xet.target_data AS xml)
+            FROM sys.dm_xe_database_session_targets AS xet
+            JOIN sys.dm_xe_database_sessions AS xes
+              ON xes.address = xet.event_session_address
+            WHERE xes.name = @session_name
+            AND   xet.target_name = N''ring_buffer''
+            OPTION(RECOMPILE);
+
             INSERT INTO
                 collect.deadlock_xml
             (
                 event_time,
                 deadlock_xml
             )
-            SELECT
-                re.event_time,
-                re.deadlock_xml
-            FROM recent_events AS re
-            WHERE NOT EXISTS
+            SELECT TOP (1000)
+                event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)''),
+                deadlock_xml = evt.query(''.'')
+            FROM
+            (
+                SELECT
+                    rb.ring_buffer
+                FROM @ring_buffer AS rb
+            ) AS rb
+            CROSS APPLY rb.ring_buffer.nodes(''RingBufferTarget/event[@name="xml_deadlock_report"]'') AS q(evt)
+            WHERE evt.value(''(@timestamp)[1]'', ''datetime2(7)'') >= @cutoff_time
+            AND NOT EXISTS
             (
                 SELECT
                     1/0
                 FROM collect.deadlock_xml AS dx
-                WHERE dx.event_time = re.event_time
+                WHERE dx.event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)'')
             )
+            ORDER BY
+                evt.value(''(@timestamp)[1]'', ''datetime2(7)'') DESC
             OPTION(RECOMPILE);';
         END;
         ELSE
         BEGIN
             SET @sql = N'
-            WITH
-                ring_buffer_xml AS
+            DECLARE
+                @ring_buffer TABLE
             (
-                SELECT
-                    target_data = TRY_CAST(xet.target_data AS xml)
-                FROM sys.dm_xe_session_targets AS xet
-                JOIN sys.dm_xe_sessions AS xes
-                  ON xes.address = xet.event_session_address
-                WHERE xes.name = @session_name
-                AND   xet.target_name = N''ring_buffer''
-            ),
-                recent_events AS
+                ring_buffer xml NOT NULL
+            );
+
+            INSERT
+                @ring_buffer
             (
-                SELECT TOP (1000)
-                    event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)''),
-                    deadlock_xml = evt.query(''.'')
-                FROM ring_buffer_xml AS rb
-                CROSS APPLY rb.target_data.nodes(''RingBufferTarget/event[@name="xml_deadlock_report"]'') AS q(evt)
-                WHERE evt.value(''(@timestamp)[1]'', ''datetime2(7)'') >= @cutoff_time
-                ORDER BY
-                    evt.value(''(@timestamp)[1]'', ''datetime2(7)'') DESC
+                ring_buffer
             )
+            SELECT
+                ring_xml = TRY_CAST(xet.target_data AS xml)
+            FROM sys.dm_xe_session_targets AS xet
+            JOIN sys.dm_xe_sessions AS xes
+              ON xes.address = xet.event_session_address
+            WHERE xes.name = @session_name
+            AND   xet.target_name = N''ring_buffer''
+            OPTION(RECOMPILE);
+
             INSERT INTO
                 collect.deadlock_xml
             (
                 event_time,
                 deadlock_xml
             )
-            SELECT
-                re.event_time,
-                re.deadlock_xml
-            FROM recent_events AS re
-            WHERE NOT EXISTS
+            SELECT TOP (1000)
+                event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)''),
+                deadlock_xml = evt.query(''.'')
+            FROM
+            (
+                SELECT
+                    rb.ring_buffer
+                FROM @ring_buffer AS rb
+            ) AS rb
+            CROSS APPLY rb.ring_buffer.nodes(''RingBufferTarget/event[@name="xml_deadlock_report"]'') AS q(evt)
+            WHERE evt.value(''(@timestamp)[1]'', ''datetime2(7)'') >= @cutoff_time
+            AND NOT EXISTS
             (
                 SELECT
                     1/0
                 FROM collect.deadlock_xml AS dx
-                WHERE dx.event_time = re.event_time
+                WHERE dx.event_time = evt.value(''(@timestamp)[1]'', ''datetime2(7)'')
             )
+            ORDER BY
+                evt.value(''(@timestamp)[1]'', ''datetime2(7)'') DESC
             OPTION(RECOMPILE);';
         END;
 
@@ -264,6 +278,64 @@ BEGIN
 
         COMMIT TRANSACTION;
 
+        /*
+        Chain-trigger: when new deadlock XML is found, immediately
+        parse it and run the analyzer instead of waiting for their next
+        scheduled runs. This eliminates up to 10 minutes of pipeline latency.
+        Parser/analyzer errors are logged but do not fail this collector.
+        */
+        IF @rows_collected > 0
+        BEGIN
+            IF @debug = 1
+            BEGIN
+                RAISERROR(N'Chain-triggering deadlock parser and analyzer', 0, 1) WITH NOWAIT;
+            END;
+
+            BEGIN TRY
+                EXECUTE collect.process_deadlock_xml
+                    @debug = @debug;
+            END TRY
+            BEGIN CATCH
+                INSERT INTO
+                    config.collection_log
+                (
+                    collector_name,
+                    collection_status,
+                    duration_ms,
+                    error_message
+                )
+                VALUES
+                (
+                    N'deadlock_xml_collector',
+                    N'CHAIN_ERROR',
+                    DATEDIFF(MILLISECOND, @start_time, SYSDATETIME()),
+                    N'Chain-triggered parser failed: ' + ERROR_MESSAGE()
+                );
+            END CATCH;
+
+            BEGIN TRY
+                EXECUTE collect.blocking_deadlock_analyzer
+                    @debug = @debug;
+            END TRY
+            BEGIN CATCH
+                INSERT INTO
+                    config.collection_log
+                (
+                    collector_name,
+                    collection_status,
+                    duration_ms,
+                    error_message
+                )
+                VALUES
+                (
+                    N'deadlock_xml_collector',
+                    N'CHAIN_ERROR',
+                    DATEDIFF(MILLISECOND, @start_time, SYSDATETIME()),
+                    N'Chain-triggered analyzer failed: ' + ERROR_MESSAGE()
+                );
+            END CATCH;
+        END;
+
     END TRY
     BEGIN CATCH
         IF @@TRANCOUNT > 0
diff --git a/install/42_scheduled_master_collector.sql b/install/42_scheduled_master_collector.sql
index f853dd3c..791a4953 100644
--- a/install/42_scheduled_master_collector.sql
+++ b/install/42_scheduled_master_collector.sql
@@ -53,6 +53,7 @@ BEGIN
         @schedule_id integer,
         @frequency_minutes integer,
         @max_duration_minutes integer,
+        @minutes_back integer,
         @error_message nvarchar(4000);
     
     BEGIN TRY
@@ -175,7 +176,8 @@ BEGIN
         WHILE @@FETCH_STATUS = 0
         BEGIN
             SET @collector_start_time = SYSDATETIME();
-            
+            SET @minutes_back = @frequency_minutes * 2;
+
             IF @debug = 1
             BEGIN
                 RAISERROR(N'Running collector: %s (frequency: %d minutes)', 0, 1, @collector_name, @frequency_minutes) WITH NOWAIT;
@@ -207,7 +209,7 @@ BEGIN
                 END;
                 ELSE IF @collector_name = N'blocked_process_xml_collector'
                 BEGIN
-                    EXECUTE collect.blocked_process_xml_collector @debug = @debug;
+                    EXECUTE collect.blocked_process_xml_collector @minutes_back = @minutes_back, @debug = @debug;
                 END;
                 ELSE IF @collector_name = N'process_blocked_process_xml'
                 BEGIN
@@ -215,7 +217,7 @@ BEGIN
                 END;
                 ELSE IF @collector_name = N'deadlock_xml_collector'
                 BEGIN
-                    EXECUTE collect.deadlock_xml_collector @debug = @debug;
+                    EXECUTE collect.deadlock_xml_collector @minutes_back = @minutes_back, @debug = @debug;
                 END;
                 ELSE IF @collector_name = N'process_deadlock_xml'
                 BEGIN

From 0b8a8405144c995058834a2391fb022cd411241d Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Tue, 17 Feb 2026 12:57:34 -0500
Subject: [PATCH 26/34] Replace all AddWithValue with explicit SqlParameter
 types, fix alert re-firing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

AddWithValue infers types incorrectly — for DateTime it sends legacy datetime
(3.33ms precision) instead of datetime2, causing the deadlock dedup cutoff to
round and re-collect the same event every cycle. Replaced all 28 usages across
7 files with explicitly typed SqlParameter.

Fixed alert re-firing: ServerTab used CollectionTime (always new) instead of
DeadlockTime/EventTime for ack comparison. Overview deadlock count query also
filtered by collection_time instead of deadlock_time, inflating counts with
duplicate rows and triggering spurious popup alerts.

Tested: zero AddWithValue remaining, all 3 projects build clean, dedup confirmed
working under HammerDB load (97 new deadlocks collected, zero duplicates).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../Services/DatabaseService.NocHealth.cs     |  5 +++--
 Dashboard/Services/DatabaseService.cs         |  9 ++++----
 Installer/Program.cs                          | 21 ++++++++++---------
 Lite/Controls/ServerTab.xaml.cs               |  4 ++--
 Lite/Services/LocalDataService.Overview.cs    |  2 +-
 Lite/Services/LocalDataService.QueryStats.cs  |  9 ++++----
 Lite/Services/LocalDataService.QueryStore.cs  |  3 ++-
 ...teCollectorService.BlockedProcessReport.cs |  8 +++----
 .../RemoteCollectorService.Deadlocks.cs       |  8 +++----
 9 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/Dashboard/Services/DatabaseService.NocHealth.cs b/Dashboard/Services/DatabaseService.NocHealth.cs
index f678a3c3..33a68263 100644
--- a/Dashboard/Services/DatabaseService.NocHealth.cs
+++ b/Dashboard/Services/DatabaseService.NocHealth.cs
@@ -8,6 +8,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Threading.Tasks;
 using Microsoft.Data.SqlClient;
 using PerformanceMonitorDashboard.Helpers;
@@ -631,7 +632,7 @@ ORDER BY r.total_elapsed_time DESC
             {
                 using var cmd = new SqlCommand(query, connection);
                 cmd.CommandTimeout = 10;
-                cmd.Parameters.AddWithValue("@thresholdMs", (long)thresholdMinutes * 60 * 1000);
+                cmd.Parameters.Add(new SqlParameter("@thresholdMs", SqlDbType.BigInt) { Value = (long)thresholdMinutes * 60 * 1000 });
                 using var reader = await cmd.ExecuteReaderAsync();
 
                 while (await reader.ReadAsync())
@@ -685,7 +686,7 @@ ORDER BY percent_of_average DESC
             {
                 using var cmd = new SqlCommand(query, connection);
                 cmd.CommandTimeout = 10;
-                cmd.Parameters.AddWithValue("@thresholdPercent", thresholdPercent);
+                cmd.Parameters.Add(new SqlParameter("@thresholdPercent", SqlDbType.Int) { Value = thresholdPercent });
                 using var reader = await cmd.ExecuteReaderAsync();
 
                 while (await reader.ReadAsync())
diff --git a/Dashboard/Services/DatabaseService.cs b/Dashboard/Services/DatabaseService.cs
index ffcd89d7..f255a10b 100644
--- a/Dashboard/Services/DatabaseService.cs
+++ b/Dashboard/Services/DatabaseService.cs
@@ -8,6 +8,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
@@ -302,10 +303,10 @@ public async Task UpdateCollectorScheduleAsync(int scheduleId, bool enabled, int
 
             using var command = new SqlCommand(query, connection);
             command.CommandTimeout = 120;
-            command.Parameters.AddWithValue("@schedule_id", scheduleId);
-            command.Parameters.AddWithValue("@enabled", enabled);
-            command.Parameters.AddWithValue("@frequency_minutes", frequencyMinutes);
-            command.Parameters.AddWithValue("@retention_days", retentionDays);
+            command.Parameters.Add(new SqlParameter("@schedule_id", SqlDbType.Int) { Value = scheduleId });
+            command.Parameters.Add(new SqlParameter("@enabled", SqlDbType.Bit) { Value = enabled });
+            command.Parameters.Add(new SqlParameter("@frequency_minutes", SqlDbType.Int) { Value = frequencyMinutes });
+            command.Parameters.Add(new SqlParameter("@retention_days", SqlDbType.Int) { Value = retentionDays });
 
             await command.ExecuteNonQueryAsync();
         }
diff --git a/Installer/Program.cs b/Installer/Program.cs
index a3b7c97e..db6bceac 100644
--- a/Installer/Program.cs
+++ b/Installer/Program.cs
@@ -8,6 +8,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -1341,16 +1342,16 @@ INSERT INTO PerformanceMonitor.config.installation_history
 
                     using (var insertCmd = new SqlCommand(insertSql, connection))
                     {
-                        insertCmd.Parameters.AddWithValue("@installer_version", assemblyVersion);
-                        insertCmd.Parameters.AddWithValue("@installer_info_version", (object?)infoVersion ?? DBNull.Value);
-                        insertCmd.Parameters.AddWithValue("@sql_server_version", sqlVersion);
-                        insertCmd.Parameters.AddWithValue("@sql_server_edition", sqlEdition);
-                        insertCmd.Parameters.AddWithValue("@installation_type", installationType);
-                        insertCmd.Parameters.AddWithValue("@previous_version", (object?)previousVersion ?? DBNull.Value);
-                        insertCmd.Parameters.AddWithValue("@installation_status", status);
-                        insertCmd.Parameters.AddWithValue("@files_executed", filesExecuted);
-                        insertCmd.Parameters.AddWithValue("@files_failed", filesFailed);
-                        insertCmd.Parameters.AddWithValue("@installation_duration_ms", durationMs);
+                        insertCmd.Parameters.Add(new SqlParameter("@installer_version", SqlDbType.NVarChar, 50) { Value = assemblyVersion });
+                        insertCmd.Parameters.Add(new SqlParameter("@installer_info_version", SqlDbType.NVarChar, 100) { Value = (object?)infoVersion ?? DBNull.Value });
+                        insertCmd.Parameters.Add(new SqlParameter("@sql_server_version", SqlDbType.NVarChar, 500) { Value = sqlVersion });
+                        insertCmd.Parameters.Add(new SqlParameter("@sql_server_edition", SqlDbType.NVarChar, 128) { Value = sqlEdition });
+                        insertCmd.Parameters.Add(new SqlParameter("@installation_type", SqlDbType.VarChar, 20) { Value = installationType });
+                        insertCmd.Parameters.Add(new SqlParameter("@previous_version", SqlDbType.NVarChar, 50) { Value = (object?)previousVersion ?? DBNull.Value });
+                        insertCmd.Parameters.Add(new SqlParameter("@installation_status", SqlDbType.VarChar, 20) { Value = status });
+                        insertCmd.Parameters.Add(new SqlParameter("@files_executed", SqlDbType.Int) { Value = filesExecuted });
+                        insertCmd.Parameters.Add(new SqlParameter("@files_failed", SqlDbType.Int) { Value = filesFailed });
+                        insertCmd.Parameters.Add(new SqlParameter("@installation_duration_ms", SqlDbType.BigInt) { Value = durationMs });
 
                         await insertCmd.ExecuteNonQueryAsync().ConfigureAwait(false);
                     }
diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index 4b771b0f..113adc41 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -536,8 +536,8 @@ Include the latest event timestamp so acknowledgement is only
             DateTime? latestEventTime = null;
             if (blockingCount > 0 || deadlockCount > 0)
             {
-                var latestBlocking = blockedProcessTask.Result.Max(r => (DateTime?)r.CollectionTime);
-                var latestDeadlock = deadlockTask.Result.Max(r => (DateTime?)r.CollectionTime);
+                var latestBlocking = blockedProcessTask.Result.Max(r => (DateTime?)r.EventTime);
+                var latestDeadlock = deadlockTask.Result.Max(r => (DateTime?)r.DeadlockTime);
                 latestEventTime = latestBlocking > latestDeadlock ? latestBlocking : latestDeadlock;
             }
             AlertCountsChanged?.Invoke(blockingCount, deadlockCount, latestEventTime);
diff --git a/Lite/Services/LocalDataService.Overview.cs b/Lite/Services/LocalDataService.Overview.cs
index 3e353376..2c9789be 100644
--- a/Lite/Services/LocalDataService.Overview.cs
+++ b/Lite/Services/LocalDataService.Overview.cs
@@ -85,7 +85,7 @@ FROM blocked_process_reports
 SELECT COUNT(*)
 FROM deadlocks
 WHERE server_id = $1
-AND   collection_time >= $2";
+AND   deadlock_time >= $2";
             cmd.Parameters.Add(new DuckDBParameter { Value = serverId });
             cmd.Parameters.Add(new DuckDBParameter { Value = DateTime.UtcNow.AddHours(-1) });
             var result = await cmd.ExecuteScalarAsync();
diff --git a/Lite/Services/LocalDataService.QueryStats.cs b/Lite/Services/LocalDataService.QueryStats.cs
index 78b4ab51..fd4bafaf 100644
--- a/Lite/Services/LocalDataService.QueryStats.cs
+++ b/Lite/Services/LocalDataService.QueryStats.cs
@@ -8,6 +8,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Threading.Tasks;
 using DuckDB.NET.Data;
 using Microsoft.Data.SqlClient;
@@ -27,7 +28,7 @@ public partial class LocalDataService
     quoted_name = QUOTENAME(d.name)
 FROM sys.databases AS d
 WHERE d.name = @database_name;", connection);
-        command.Parameters.AddWithValue("@database_name", databaseName);
+        command.Parameters.Add(new SqlParameter("@database_name", SqlDbType.NVarChar, 128) { Value = databaseName });
         var result = await command.ExecuteScalarAsync();
         return result as string;
     }
@@ -247,7 +248,7 @@ qs.total_elapsed_time DESC
         using var connection = new SqlConnection(connectionString);
         await connection.OpenAsync();
         using var command = new SqlCommand(query, connection) { CommandTimeout = 30 };
-        command.Parameters.AddWithValue("@query_hash", queryHash);
+        command.Parameters.Add(new SqlParameter("@query_hash", SqlDbType.VarChar, 64) { Value = queryHash });
         var result = await command.ExecuteScalarAsync();
         return result as string;
     }
@@ -294,8 +295,8 @@ ps.total_elapsed_time DESC
     @schema_name;";
 
         using var command = new SqlCommand(query, connection) { CommandTimeout = 30 };
-        command.Parameters.AddWithValue("@object_name", objectName);
-        command.Parameters.AddWithValue("@schema_name", schemaName);
+        command.Parameters.Add(new SqlParameter("@object_name", SqlDbType.NVarChar, 128) { Value = objectName });
+        command.Parameters.Add(new SqlParameter("@schema_name", SqlDbType.NVarChar, 128) { Value = schemaName });
         var result = await command.ExecuteScalarAsync();
         return result as string;
     }
diff --git a/Lite/Services/LocalDataService.QueryStore.cs b/Lite/Services/LocalDataService.QueryStore.cs
index f02fe78f..b492ae72 100644
--- a/Lite/Services/LocalDataService.QueryStore.cs
+++ b/Lite/Services/LocalDataService.QueryStore.cs
@@ -8,6 +8,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Threading.Tasks;
 using DuckDB.NET.Data;
 using Microsoft.Data.SqlClient;
@@ -198,7 +199,7 @@ AND   qsp.query_plan IS NOT NULL
     @plan_id;";
 
         using var command = new SqlCommand(query, connection) { CommandTimeout = 30 };
-        command.Parameters.AddWithValue("@plan_id", planId);
+        command.Parameters.Add(new SqlParameter("@plan_id", SqlDbType.BigInt) { Value = planId });
         var result = await command.ExecuteScalarAsync();
         return result as string;
     }
diff --git a/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs b/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
index c66f5957..7c6da3d3 100644
--- a/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
+++ b/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
@@ -7,6 +7,7 @@
  */
 
 using System;
+using System.Data;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
@@ -126,7 +127,7 @@ LEFT JOIN sys.dm_xe_sessions AS dxs
 WHERE ses.name = @session_name;", connection))
         {
             cmd.CommandTimeout = CommandTimeoutSeconds;
-            cmd.Parameters.AddWithValue("@session_name", BlockedProcessXeSessionName);
+            cmd.Parameters.Add(new SqlParameter("@session_name", SqlDbType.NVarChar, 128) { Value = BlockedProcessXeSessionName });
             var result = await cmd.ExecuteScalarAsync(cancellationToken);
 
             if (result != null)
@@ -205,7 +206,7 @@ FROM sys.database_event_sessions AS des
 WHERE des.name = @session_name;", connection))
         {
             cmd.CommandTimeout = CommandTimeoutSeconds;
-            cmd.Parameters.AddWithValue("@session_name", BlockedProcessXeSessionName);
+            cmd.Parameters.Add(new SqlParameter("@session_name", SqlDbType.NVarChar, 128) { Value = BlockedProcessXeSessionName });
             var result = await cmd.ExecuteScalarAsync(cancellationToken);
 
             if (result != null)
@@ -380,8 +381,7 @@ as it lingers in the ring buffer across collection cycles. */
         command.CommandTimeout = CommandTimeoutSeconds;
 
         /* Use the most recent timestamp from DuckDB as the cutoff, or fall back to 10-minute window */
-        command.Parameters.AddWithValue("@cutoff_time",
-            lastCollectedTime ?? DateTime.UtcNow.AddMinutes(-10));
+        command.Parameters.Add(new SqlParameter("@cutoff_time", SqlDbType.DateTime2) { Value = lastCollectedTime ?? DateTime.UtcNow.AddMinutes(-10) });
 
         try
         {
diff --git a/Lite/Services/RemoteCollectorService.Deadlocks.cs b/Lite/Services/RemoteCollectorService.Deadlocks.cs
index 4a1e5a7e..1a76b726 100644
--- a/Lite/Services/RemoteCollectorService.Deadlocks.cs
+++ b/Lite/Services/RemoteCollectorService.Deadlocks.cs
@@ -7,6 +7,7 @@
  */
 
 using System;
+using System.Data;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
@@ -80,7 +81,7 @@ LEFT JOIN sys.dm_xe_sessions AS dxs
 WHERE ses.name = @session_name;", connection))
         {
             cmd.CommandTimeout = CommandTimeoutSeconds;
-            cmd.Parameters.AddWithValue("@session_name", DeadlockXeSessionName);
+            cmd.Parameters.Add(new SqlParameter("@session_name", SqlDbType.NVarChar, 128) { Value = DeadlockXeSessionName });
             var result = await cmd.ExecuteScalarAsync(cancellationToken);
 
             if (result != null)
@@ -179,7 +180,7 @@ ELSE NULL
     END;", connection))
         {
             cmd.CommandTimeout = CommandTimeoutSeconds;
-            cmd.Parameters.AddWithValue("@session_name", DeadlockXeSessionName);
+            cmd.Parameters.Add(new SqlParameter("@session_name", SqlDbType.NVarChar, 128) { Value = DeadlockXeSessionName });
             var result = await cmd.ExecuteScalarAsync(cancellationToken);
 
             if (result is int hasCorrectEvent)
@@ -380,8 +381,7 @@ lingers in the ring buffer across collection cycles. */
         command.CommandTimeout = CommandTimeoutSeconds;
 
         /* Use the most recent timestamp from DuckDB as the cutoff, or fall back to 10-minute window */
-        command.Parameters.AddWithValue("@cutoff_time",
-            lastCollectedTime ?? DateTime.UtcNow.AddMinutes(-10));
+        command.Parameters.Add(new SqlParameter("@cutoff_time", SqlDbType.DateTime2) { Value = lastCollectedTime ?? DateTime.UtcNow.AddMinutes(-10) });
 
         try
         {

From f8d1b63471ad849e9a51bd683e2ceec83b78df77 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Tue, 17 Feb 2026 15:08:08 -0500
Subject: [PATCH 27/34] Fix chart zero lines, collection log server name, and
 overview online status (#85, #91, #93)

#85: Blocking/deadlock trend charts now show a visible flat line at zero
instead of empty space. Added negative Y-axis margin so zero-value data
renders above the axis border. Reduced fallback Y range from +100 to +1.

#91: Added server_name column to collection_log DuckDB table (schema v10)
so log entries identify which server produced them without a lookup join.

#93: Sidebar status dots now reflect actual connection check results
(IsOnline) instead of the IsEnabled user config toggle. Added IsOnline
property to ServerConnection model, synced from connection status in
RefreshServerList and CheckConnectionsAndNotify. Fixed first-check
refresh so dots update as soon as initial connection checks complete.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Lite/Controls/ServerTab.xaml.cs               | 28 ++++++++++++++-----
 Lite/Database/DuckDbInitializer.cs            | 17 ++++++++++-
 Lite/Database/Schema.cs                       |  1 +
 Lite/MainWindow.xaml                          |  4 +--
 Lite/MainWindow.xaml.cs                       | 18 +++++++++++-
 Lite/Models/ServerConnection.cs               |  7 +++++
 .../LocalDataService.CollectionHealth.cs      |  7 +++--
 Lite/Services/RemoteCollectorService.cs       |  9 +++---
 8 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index 113adc41..b14035fb 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -849,12 +849,19 @@ private void UpdateBlockingTrendChart(List<TrendPoint> data, int hoursBack, Date
 
         if (data.Count == 0)
         {
-            /* Show empty chart with correct time range */
+            /* No blocking events — show a flat line at zero so the chart looks active */
+            var zeroLine = BlockingTrendChart.Plot.Add.Scatter(
+                new[] { rangeStart.ToOADate(), rangeEnd.ToOADate() },
+                new[] { 0.0, 0.0 });
+            zeroLine.LegendText = "Blocking Incidents";
+            zeroLine.Color = ScottPlot.Color.FromHex("#E57373");
+            zeroLine.MarkerSize = 0;
             BlockingTrendChart.Plot.Axes.DateTimeTicksBottom();
             BlockingTrendChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
-            BlockingTrendChart.Plot.Axes.SetLimitsY(0, 1);
             ReapplyAxisColors(BlockingTrendChart);
             BlockingTrendChart.Plot.YLabel("Blocking Incidents");
+            SetChartYLimitsWithLegendPadding(BlockingTrendChart, 0, 1);
+            ShowChartLegend(BlockingTrendChart);
             BlockingTrendChart.Refresh();
             return;
         }
@@ -919,12 +926,19 @@ private void UpdateDeadlockTrendChart(List<TrendPoint> data, int hoursBack, Date
 
         if (data.Count == 0)
         {
-            /* Show empty chart with correct time range */
+            /* No deadlocks — show a flat line at zero so the chart looks active */
+            var zeroLine = DeadlockTrendChart.Plot.Add.Scatter(
+                new[] { rangeStart.ToOADate(), rangeEnd.ToOADate() },
+                new[] { 0.0, 0.0 });
+            zeroLine.LegendText = "Deadlocks";
+            zeroLine.Color = ScottPlot.Color.FromHex("#FFB74D");
+            zeroLine.MarkerSize = 0;
             DeadlockTrendChart.Plot.Axes.DateTimeTicksBottom();
             DeadlockTrendChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
-            DeadlockTrendChart.Plot.Axes.SetLimitsY(0, 1);
             ReapplyAxisColors(DeadlockTrendChart);
             DeadlockTrendChart.Plot.YLabel("Deadlocks");
+            SetChartYLimitsWithLegendPadding(DeadlockTrendChart, 0, 1);
+            ShowChartLegend(DeadlockTrendChart);
             DeadlockTrendChart.Refresh();
             return;
         }
@@ -1495,13 +1509,13 @@ private static void SetChartYLimitsWithLegendPadding(ScottPlot.WPF.WpfPlot chart
             dataYMin = limits.Bottom;
             dataYMax = limits.Top;
         }
-        if (dataYMax <= dataYMin) dataYMax = dataYMin + 100;
+        if (dataYMax <= dataYMin) dataYMax = dataYMin + 1;
 
         double range = dataYMax - dataYMin;
         double topPadding = range * 0.05;
 
-        /* Only add bottom padding if dataYMin is above zero - don't go negative */
-        double yMin = dataYMin >= 0 ? 0 : dataYMin - (range * 0.10);
+        /* Add small bottom margin when dataYMin is zero so flat lines at Y=0 are visible above the axis */
+        double yMin = dataYMin > 0 ? 0 : dataYMin == 0 ? -(range * 0.05) : dataYMin - (range * 0.10);
         double yMax = dataYMax + topPadding;
 
         chart.Plot.Axes.SetLimitsY(yMin, yMax);
diff --git a/Lite/Database/DuckDbInitializer.cs b/Lite/Database/DuckDbInitializer.cs
index 809fb1ea..a288429a 100644
--- a/Lite/Database/DuckDbInitializer.cs
+++ b/Lite/Database/DuckDbInitializer.cs
@@ -19,7 +19,7 @@ public class DuckDbInitializer
     /// <summary>
     /// Current schema version. Increment this when schema changes require table rebuilds.
     /// </summary>
-    private const int CurrentSchemaVersion = 9;
+    private const int CurrentSchemaVersion = 10;
 
     public DuckDbInitializer(string databasePath, ILogger<DuckDbInitializer>? logger = null)
     {
@@ -328,6 +328,21 @@ Safe to ALTER because this table uses INSERT (not appender). */
                 /* Table doesn't exist yet — will be created with correct schema below */
             }
         }
+
+        if (fromVersion < 10)
+        {
+            /* v10: Added server_name column to collection_log so log entries
+                    can be identified by server without needing a lookup table. */
+            _logger?.LogInformation("Running migration to v10: adding server_name column to collection_log");
+            try
+            {
+                await ExecuteNonQueryAsync(connection, "ALTER TABLE collection_log ADD COLUMN IF NOT EXISTS server_name VARCHAR");
+            }
+            catch
+            {
+                /* Table doesn't exist yet — will be created with correct schema below */
+            }
+        }
     }
 
     /// <summary>
diff --git a/Lite/Database/Schema.cs b/Lite/Database/Schema.cs
index 658325b3..24f46ab5 100644
--- a/Lite/Database/Schema.cs
+++ b/Lite/Database/Schema.cs
@@ -38,6 +38,7 @@ modified_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 CREATE TABLE IF NOT EXISTS collection_log (
     log_id BIGINT PRIMARY KEY,
     server_id INTEGER NOT NULL,
+    server_name VARCHAR,
     collector_name VARCHAR NOT NULL,
     collection_time TIMESTAMP NOT NULL,
     duration_ms INTEGER,
diff --git a/Lite/MainWindow.xaml b/Lite/MainWindow.xaml
index 55d89105..c57bb020 100644
--- a/Lite/MainWindow.xaml
+++ b/Lite/MainWindow.xaml
@@ -97,10 +97,10 @@
                                             <Style TargetType="Ellipse">
                                                 <Setter Property="Fill" Value="{DynamicResource ForegroundMutedBrush}"/>
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding IsEnabled}" Value="True">
+                                                    <DataTrigger Binding="{Binding IsOnline}" Value="True">
                                                         <Setter Property="Fill" Value="{DynamicResource SuccessBrush}"/>
                                                     </DataTrigger>
-                                                    <DataTrigger Binding="{Binding IsEnabled}" Value="False">
+                                                    <DataTrigger Binding="{Binding IsOnline}" Value="False">
                                                         <Setter Property="Fill" Value="{DynamicResource ErrorBrush}"/>
                                                     </DataTrigger>
                                                 </Style.Triggers>
diff --git a/Lite/MainWindow.xaml.cs b/Lite/MainWindow.xaml.cs
index 1dd5e08b..a29d0600 100644
--- a/Lite/MainWindow.xaml.cs
+++ b/Lite/MainWindow.xaml.cs
@@ -249,6 +249,10 @@ private void ServerTabControl_SelectionChanged(object sender, SelectionChangedEv
     private void RefreshServerList()
     {
         var servers = _serverManager.GetAllServers();
+        foreach (var server in servers)
+        {
+            server.IsOnline = _serverManager.GetConnectionStatus(server.Id).IsOnline;
+        }
         ServerListView.ItemsSource = servers;
 
         // Update UI based on server count
@@ -883,9 +887,11 @@ private void CheckConnectionsAndNotify()
         try
         {
             var servers = _serverManager.GetAllServers();
+            bool needsRefresh = false;
             foreach (var server in servers)
             {
                 var status = _serverManager.GetConnectionStatus(server.Id);
+                server.IsOnline = status?.IsOnline;
                 if (status?.IsOnline == null) continue;
 
                 bool isOnline = status.IsOnline == true;
@@ -912,12 +918,22 @@ private void CheckConnectionsAndNotify()
 
                     if (wasOnline != isOnline)
                     {
-                        RefreshServerList();
+                        needsRefresh = true;
                     }
                 }
+                else
+                {
+                    /* First time seeing this server's status — need to refresh */
+                    needsRefresh = true;
+                }
 
                 _previousConnectionStates[server.Id] = isOnline;
             }
+
+            if (needsRefresh)
+            {
+                RefreshServerList();
+            }
         }
         catch (Exception ex)
         {
diff --git a/Lite/Models/ServerConnection.cs b/Lite/Models/ServerConnection.cs
index 34bd442e..610b2b23 100644
--- a/Lite/Models/ServerConnection.cs
+++ b/Lite/Models/ServerConnection.cs
@@ -81,6 +81,13 @@ public bool UseWindowsAuth
         _ => "Windows"
     };
 
+    /// <summary>
+    /// Actual connection status from the most recent connection check.
+    /// null = not checked yet, true = online, false = offline.
+    /// </summary>
+    [JsonIgnore]
+    public bool? IsOnline { get; set; }
+
     /// <summary>
     /// Display-only property for showing status in UI.
     /// </summary>
diff --git a/Lite/Services/LocalDataService.CollectionHealth.cs b/Lite/Services/LocalDataService.CollectionHealth.cs
index 8a5da51a..6f4c1902 100644
--- a/Lite/Services/LocalDataService.CollectionHealth.cs
+++ b/Lite/Services/LocalDataService.CollectionHealth.cs
@@ -79,7 +79,8 @@ public async Task<List<CollectionLogRow>> GetRecentCollectionLogAsync(int server
     duckdb_duration_ms,
     rows_collected,
     status,
-    error_message
+    error_message,
+    server_name
 FROM collection_log
 WHERE server_id = $1
 AND   collection_time >= $2
@@ -103,7 +104,8 @@ ORDER BY collection_time DESC
                 DuckDbDurationMs = reader.IsDBNull(4) ? null : (int?)Convert.ToInt32(reader.GetValue(4)),
                 RowsCollected = reader.IsDBNull(5) ? null : (int?)Convert.ToInt32(reader.GetValue(5)),
                 Status = reader.GetString(6),
-                ErrorMessage = reader.IsDBNull(7) ? null : reader.GetString(7)
+                ErrorMessage = reader.IsDBNull(7) ? null : reader.GetString(7),
+                ServerName = reader.IsDBNull(8) ? null : reader.GetString(8)
             });
         }
 
@@ -114,6 +116,7 @@ ORDER BY collection_time DESC
 public class CollectionLogRow
 {
     public string CollectorName { get; set; } = "";
+    public string? ServerName { get; set; }
     public DateTime CollectionTime { get; set; }
     public int? DurationMs { get; set; }
     public int? SqlDurationMs { get; set; }
diff --git a/Lite/Services/RemoteCollectorService.cs b/Lite/Services/RemoteCollectorService.cs
index 9e2c3886..fde3d467 100644
--- a/Lite/Services/RemoteCollectorService.cs
+++ b/Lite/Services/RemoteCollectorService.cs
@@ -363,13 +363,13 @@ public async Task RunCollectorAsync(ServerConnection server, string collectorNam
         RecordCollectorResult(GetServerId(server), collectorName, status == "SUCCESS", errorMessage);
 
         // Log the collection attempt
-        await LogCollectionAsync(GetServerId(server), collectorName, startTime, status, errorMessage, rowsCollected, _lastSqlMs, _lastDuckDbMs);
+        await LogCollectionAsync(GetServerId(server), server.DisplayName, collectorName, startTime, status, errorMessage, rowsCollected, _lastSqlMs, _lastDuckDbMs);
     }
 
     /// <summary>
     /// Logs a collection attempt to the collection_log table.
     /// </summary>
-    private async Task LogCollectionAsync(int serverId, string collectorName, DateTime startTime, string status, string? errorMessage, int rowsCollected, long sqlMs = 0, long duckDbMs = 0)
+    private async Task LogCollectionAsync(int serverId, string serverName, string collectorName, DateTime startTime, string status, string? errorMessage, int rowsCollected, long sqlMs = 0, long duckDbMs = 0)
     {
         try
         {
@@ -380,11 +380,12 @@ private async Task LogCollectionAsync(int serverId, string collectorName, DateTi
 
             using var command = connection.CreateCommand();
             command.CommandText = @"
-                INSERT INTO collection_log (log_id, server_id, collector_name, collection_time, duration_ms, status, error_message, rows_collected, sql_duration_ms, duckdb_duration_ms)
-                VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)";
+                INSERT INTO collection_log (log_id, server_id, server_name, collector_name, collection_time, duration_ms, status, error_message, rows_collected, sql_duration_ms, duckdb_duration_ms)
+                VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)";
 
             command.Parameters.Add(new DuckDBParameter { Value = GenerateCollectionId() });
             command.Parameters.Add(new DuckDBParameter { Value = serverId });
+            command.Parameters.Add(new DuckDBParameter { Value = serverName });
             command.Parameters.Add(new DuckDBParameter { Value = collectorName });
             command.Parameters.Add(new DuckDBParameter { Value = startTime });
             command.Parameters.Add(new DuckDBParameter { Value = durationMs });

From a5884e6c85c0f73214bdb9e47b1de64df74db34b Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Tue, 17 Feb 2026 15:17:03 -0500
Subject: [PATCH 28/34] Update schema version assertion to v10 in tests

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Lite.Tests/DuckDbSchemaTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lite.Tests/DuckDbSchemaTests.cs b/Lite.Tests/DuckDbSchemaTests.cs
index 9df7deb9..170c8d36 100644
--- a/Lite.Tests/DuckDbSchemaTests.cs
+++ b/Lite.Tests/DuckDbSchemaTests.cs
@@ -96,7 +96,7 @@ public async Task InitializeAsync_SetsCorrectSchemaVersion()
         cmd.CommandText = "SELECT MAX(version) FROM schema_version";
         var version = Convert.ToInt32(await cmd.ExecuteScalarAsync());
 
-        Assert.Equal(9, version);
+        Assert.Equal(10, version);
     }
 
     [Fact]
@@ -115,7 +115,7 @@ public async Task InitializeAsync_IsIdempotent()
         cmd.CommandText = "SELECT MAX(version) FROM schema_version";
         var version = Convert.ToInt32(await cmd.ExecuteScalarAsync());
 
-        Assert.Equal(9, version);
+        Assert.Equal(10, version);
     }
 
     [Fact]

From 0a2148f48b38f5e7a19f4dec32b42ed39134809f Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Tue, 17 Feb 2026 15:22:58 -0500
Subject: [PATCH 29/34] Use DuckDbInitializer.CurrentSchemaVersion in tests
 instead of hardcoded value

Made CurrentSchemaVersion internal and added InternalsVisibleTo so the
test project references the constant directly. Schema bumps no longer
require updating tests.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Lite.Tests/DuckDbSchemaTests.cs    | 4 ++--
 Lite/Database/DuckDbInitializer.cs | 2 +-
 Lite/PerformanceMonitorLite.csproj | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Lite.Tests/DuckDbSchemaTests.cs b/Lite.Tests/DuckDbSchemaTests.cs
index 170c8d36..e8415ab5 100644
--- a/Lite.Tests/DuckDbSchemaTests.cs
+++ b/Lite.Tests/DuckDbSchemaTests.cs
@@ -96,7 +96,7 @@ public async Task InitializeAsync_SetsCorrectSchemaVersion()
         cmd.CommandText = "SELECT MAX(version) FROM schema_version";
         var version = Convert.ToInt32(await cmd.ExecuteScalarAsync());
 
-        Assert.Equal(10, version);
+        Assert.Equal(DuckDbInitializer.CurrentSchemaVersion, version);
     }
 
     [Fact]
@@ -115,7 +115,7 @@ public async Task InitializeAsync_IsIdempotent()
         cmd.CommandText = "SELECT MAX(version) FROM schema_version";
         var version = Convert.ToInt32(await cmd.ExecuteScalarAsync());
 
-        Assert.Equal(10, version);
+        Assert.Equal(DuckDbInitializer.CurrentSchemaVersion, version);
     }
 
     [Fact]
diff --git a/Lite/Database/DuckDbInitializer.cs b/Lite/Database/DuckDbInitializer.cs
index a288429a..13e7874b 100644
--- a/Lite/Database/DuckDbInitializer.cs
+++ b/Lite/Database/DuckDbInitializer.cs
@@ -19,7 +19,7 @@ public class DuckDbInitializer
     /// <summary>
     /// Current schema version. Increment this when schema changes require table rebuilds.
     /// </summary>
-    private const int CurrentSchemaVersion = 10;
+    internal const int CurrentSchemaVersion = 10;
 
     public DuckDbInitializer(string databasePath, ILogger<DuckDbInitializer>? logger = null)
     {
diff --git a/Lite/PerformanceMonitorLite.csproj b/Lite/PerformanceMonitorLite.csproj
index 60686279..b9b7f369 100644
--- a/Lite/PerformanceMonitorLite.csproj
+++ b/Lite/PerformanceMonitorLite.csproj
@@ -27,6 +27,10 @@
     <NoWarn>CA1849;CA2007;CA1508;CA1822;CA1805;CA1510;CA1816;CA1861;CA1845;CA2201;CS4014;NU1701;CA1001;CA1848;CA1852;CA1305;CA1860;CA1707;CA1507;CA1806</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Lite.Tests" />
+  </ItemGroup>
+
   <ItemGroup>
     <!-- DuckDB for local data storage -->
     <PackageReference Include="DuckDB.NET.Data" Version="1.2.1" />

From 0fb96ebb616a6ce29a9b9e5fc6e1993d56d8a057 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Tue, 17 Feb 2026 16:38:05 -0500
Subject: [PATCH 30/34] Add --reset-schedule flag to reset collection schedule
 on re-install
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CLI: --reset-schedule flag prepends TRUNCATE to 04_create_schedule_table.sql
GUI: "Reset collection schedule to recommended defaults" checkbox
Both pass resetSchedule to installer logic which truncates config.collection_schedule
before the WHERE NOT EXISTS inserts re-populate with current defaults.

Tested on sql2022 with update install — schedule reset to 33 collectors with
current recommended frequencies.

Closes #92

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Installer/Program.cs                         | 13 +++++++++++++
 InstallerGui/MainWindow.xaml                 |  6 ++++++
 InstallerGui/MainWindow.xaml.cs              |  2 ++
 InstallerGui/Services/InstallationService.cs | 12 ++++++++++++
 4 files changed, 33 insertions(+)

diff --git a/Installer/Program.cs b/Installer/Program.cs
index db6bceac..6689f45b 100644
--- a/Installer/Program.cs
+++ b/Installer/Program.cs
@@ -84,6 +84,7 @@ static async Task<int> Main(string[] args)
             */
             bool automatedMode = args.Length > 0;
             bool reinstallMode = args.Any(a => a.Equals("--reinstall", StringComparison.OrdinalIgnoreCase));
+            bool resetSchedule = args.Any(a => a.Equals("--reset-schedule", StringComparison.OrdinalIgnoreCase));
             bool trustCert = args.Any(a => a.Equals("--trust-cert", StringComparison.OrdinalIgnoreCase));
 
             /*Parse encryption option (default: Mandatory)*/
@@ -103,6 +104,7 @@ static async Task<int> Main(string[] args)
             /*Filter out option flags to get positional arguments*/
             var filteredArgs = args
                 .Where(a => !a.Equals("--reinstall", StringComparison.OrdinalIgnoreCase))
+                .Where(a => !a.Equals("--reset-schedule", StringComparison.OrdinalIgnoreCase))
                 .Where(a => !a.Equals("--trust-cert", StringComparison.OrdinalIgnoreCase))
                 .Where(a => !a.StartsWith("--encrypt=", StringComparison.OrdinalIgnoreCase))
                 .ToArray();
@@ -167,6 +169,7 @@ Automated mode with command-line arguments
                     Console.WriteLine();
                     Console.WriteLine("Options:");
                     Console.WriteLine("  --reinstall          Drop existing database and perform clean install");
+                    Console.WriteLine("  --reset-schedule     Reset collection schedule to recommended defaults");
                     Console.WriteLine("  --encrypt=<level>    Connection encryption: optional (default), mandatory, strict");
                     Console.WriteLine("  --trust-cert         Trust server certificate without validation (default: require valid cert)");
                     return ExitCodes.InvalidArguments;
@@ -610,6 +613,16 @@ Connection pooling handles the underlying socket reuse
                     {
                         string sqlContent = await File.ReadAllTextAsync(sqlFile);
 
+                        /*
+                        Reset schedule to defaults if requested — truncate before the
+                        INSERT...WHERE NOT EXISTS re-populates with current recommended values
+                        */
+                        if (resetSchedule && fileName.StartsWith("04_", StringComparison.Ordinal))
+                        {
+                            sqlContent = "TRUNCATE TABLE config.collection_schedule;\nGO\n" + sqlContent;
+                            Console.Write("(resetting schedule) ");
+                        }
+
                         /*
                         Remove SQLCMD directives (:r includes) as we're executing files directly
                         */
diff --git a/InstallerGui/MainWindow.xaml b/InstallerGui/MainWindow.xaml
index 93bc3122..5f032534 100644
--- a/InstallerGui/MainWindow.xaml
+++ b/InstallerGui/MainWindow.xaml
@@ -180,6 +180,12 @@
                           Margin="0,0,0,10"
                           Foreground="{DynamicResource ForegroundBrush}"/>
 
+                <!-- Reset Schedule Checkbox -->
+                <CheckBox x:Name="ResetScheduleCheckBox"
+                          Content="Reset collection schedule to recommended defaults"
+                          Margin="0,0,0,10"
+                          Foreground="{DynamicResource ForegroundBrush}"/>
+
                 <!-- Validation Checkbox -->
                 <CheckBox x:Name="ValidationCheckBox"
                           Content="Run validation after install (recommended)"
diff --git a/InstallerGui/MainWindow.xaml.cs b/InstallerGui/MainWindow.xaml.cs
index de3aa51e..a516f680 100644
--- a/InstallerGui/MainWindow.xaml.cs
+++ b/InstallerGui/MainWindow.xaml.cs
@@ -394,10 +394,12 @@ private async void Install_Click(object sender, RoutedEventArgs e)
                 Execute installation
                 Community dependencies install automatically before validation (98_validate)
                 */
+                bool resetSchedule = ResetScheduleCheckBox.IsChecked == true;
                 _installationResult = await InstallationService.ExecuteInstallationAsync(
                     _connectionString,
                     _sqlFiles,
                     isCleanInstall,
+                    resetSchedule,
                     progress,
                     preValidationAction: async () =>
                     {
diff --git a/InstallerGui/Services/InstallationService.cs b/InstallerGui/Services/InstallationService.cs
index ebb5b585..7c061461 100644
--- a/InstallerGui/Services/InstallationService.cs
+++ b/InstallerGui/Services/InstallationService.cs
@@ -324,6 +324,7 @@ public static async Task<InstallationResult> ExecuteInstallationAsync(
             string connectionString,
             List<string> sqlFiles,
             bool cleanInstall,
+            bool resetSchedule = false,
             IProgress<InstallationProgress>? progress = null,
             Func<Task>? preValidationAction = null,
             CancellationToken cancellationToken = default)
@@ -410,6 +411,17 @@ Execute SQL files
                 {
                     string sqlContent = await File.ReadAllTextAsync(sqlFile, cancellationToken).ConfigureAwait(false);
 
+                    /*Reset schedule to defaults if requested*/
+                    if (resetSchedule && fileName.StartsWith("04_", StringComparison.Ordinal))
+                    {
+                        sqlContent = "TRUNCATE TABLE config.collection_schedule;\nGO\n" + sqlContent;
+                        progress?.Report(new InstallationProgress
+                        {
+                            Message = "Resetting schedule to recommended defaults...",
+                            Status = "Info"
+                        });
+                    }
+
                     /*Remove SQLCMD directives*/
                     sqlContent = SqlCmdDirectivePattern.Replace(sqlContent, "");
 

From 6218041b6285d4d7215df086d097ea8fcee93616 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Tue, 17 Feb 2026 18:33:12 -0500
Subject: [PATCH 31/34] Skip offline servers during collection and reduce
 connection timeout

RunDueCollectorsAsync now checks IsOnline status before queuing collectors
for each server. Servers marked offline by the connection check are skipped
entirely, eliminating wasted timeout cycles. Connection timeout reduced
from 15s to 5s to match the connection check timeout.

Tested under 30-min HammerDB TPC-C load: 437 Lite collections at 100%
success rate, avg 176ms. Zero offline server attempts.

Closes #90

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Lite/Services/RemoteCollectorService.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Lite/Services/RemoteCollectorService.cs b/Lite/Services/RemoteCollectorService.cs
index fde3d467..ea1e79a2 100644
--- a/Lite/Services/RemoteCollectorService.cs
+++ b/Lite/Services/RemoteCollectorService.cs
@@ -80,7 +80,7 @@ public partial class RemoteCollectorService
     /// <summary>
     /// Connection timeout for SQL Server connections in seconds.
     /// </summary>
-    private const int ConnectionTimeoutSeconds = 15;
+    private const int ConnectionTimeoutSeconds = 5;
 
     /// <summary>
     /// Per-call timing fields set by each collector method.
@@ -193,19 +193,28 @@ public async Task RunDueCollectorsAsync(CancellationToken cancellationToken = de
             return;
         }
 
-        _logger?.LogInformation("Running {CollectorCount} collectors for {ServerCount} servers",
-            dueCollectors.Count, enabledServers.Count);
-
         var tasks = new List<Task>();
+        int skippedOffline = 0;
 
         foreach (var server in enabledServers)
         {
+            var serverStatus = _serverManager.GetConnectionStatus(server.Id);
+            if (serverStatus.IsOnline == false)
+            {
+                skippedOffline++;
+                _logger?.LogDebug("Skipping offline server '{Server}'", server.DisplayName);
+                continue;
+            }
+
             foreach (var collector in dueCollectors)
             {
                 tasks.Add(RunCollectorAsync(server, collector.Name, cancellationToken));
             }
         }
 
+        _logger?.LogInformation("Running {CollectorCount} collectors for {OnlineCount}/{TotalCount} servers ({SkippedCount} offline, skipped)",
+            dueCollectors.Count, enabledServers.Count - skippedOffline, enabledServers.Count, skippedOffline);
+
         await Task.WhenAll(tasks);
     }
 

From ecad30b1a7f1aea975dc702c8f0b61b03a5b882c Mon Sep 17 00:00:00 2001
From: Orestes Zoupanos <orestes.zoupanos@tpr.gov.uk>
Date: Wed, 18 Feb 2026 12:05:36 +0000
Subject: [PATCH 32/34] Issue #101 update NuGet packages to latest stable
 version

---
 Dashboard/Dashboard.csproj                   | 12 ++++++------
 Installer/PerformanceMonitorInstaller.csproj |  2 +-
 InstallerGui/InstallerGui.csproj             |  2 +-
 Lite/PerformanceMonitorLite.csproj           | 16 ++++++++--------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Dashboard/Dashboard.csproj b/Dashboard/Dashboard.csproj
index 57d305dd..ca513638 100644
--- a/Dashboard/Dashboard.csproj
+++ b/Dashboard/Dashboard.csproj
@@ -30,14 +30,14 @@
 
   <ItemGroup>
     <PackageReference Include="CredentialManagement" Version="1.0.2" />
-    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.52" />
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.3" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.1.57" />
     <PackageReference Include="ModelContextProtocol" Version="0.7.0-preview.1" />
     <PackageReference Include="ModelContextProtocol.AspNetCore" Version="0.7.0-preview.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Installer/PerformanceMonitorInstaller.csproj b/Installer/PerformanceMonitorInstaller.csproj
index a8d9d60a..e260c732 100644
--- a/Installer/PerformanceMonitorInstaller.csproj
+++ b/Installer/PerformanceMonitorInstaller.csproj
@@ -31,7 +31,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/InstallerGui/InstallerGui.csproj b/InstallerGui/InstallerGui.csproj
index eda92986..b2442623 100644
--- a/InstallerGui/InstallerGui.csproj
+++ b/InstallerGui/InstallerGui.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Lite/PerformanceMonitorLite.csproj b/Lite/PerformanceMonitorLite.csproj
index 60686279..e8d0c141 100644
--- a/Lite/PerformanceMonitorLite.csproj
+++ b/Lite/PerformanceMonitorLite.csproj
@@ -29,29 +29,29 @@
 
   <ItemGroup>
     <!-- DuckDB for local data storage -->
-    <PackageReference Include="DuckDB.NET.Data" Version="1.2.1" />
-    <PackageReference Include="DuckDB.NET.Bindings.Full" Version="1.2.1" />
+    <PackageReference Include="DuckDB.NET.Data" Version="1.4.4" />
+    <PackageReference Include="DuckDB.NET.Bindings.Full" Version="1.4.4" />
 
     <!-- SQL Server connectivity -->
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
 
     <!-- Charting -->
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.52" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.1.57" />
 
     <!-- Windows Credential Manager for secure credential storage -->
     <PackageReference Include="CredentialManagement" Version="1.0.2" />
 
     <!-- Background service hosting -->
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
 
     <!-- Logging -->
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
 
     <!-- System tray -->
-    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="2.0.1" />
 
     <!-- JSON configuration -->
-    <PackageReference Include="System.Text.Json" Version="10.0.2" />
+    <PackageReference Include="System.Text.Json" Version="10.0.3" />
 
     <!-- MCP server for LLM tool access -->
     <PackageReference Include="ModelContextProtocol" Version="0.7.0-preview.1" />

From cd790c33f991701d49b12b612d0b1e472fb5a9a9 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Wed, 18 Feb 2026 07:38:08 -0500
Subject: [PATCH 33/34] Add dev branch to CI build trigger

PRs to dev now get the same build validation as PRs to main,
so package updates and other changes can be verified before merge.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 593b9e05..1b83eaba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
+    branches: [main, dev]
   release:
     types: [created]
 

From cfe5cf410407855678a7cd2fb57cf8a315584d01 Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Wed, 18 Feb 2026 12:31:30 -0500
Subject: [PATCH 34/34] Bump version to 1.2.0

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 Dashboard/AboutWindow.xaml         | 2 +-
 Dashboard/Dashboard.csproj         | 2 +-
 Dashboard/Mcp/McpHostService.cs    | 2 +-
 Lite/Mcp/McpHostService.cs         | 2 +-
 Lite/PerformanceMonitorLite.csproj | 2 +-
 Lite/Windows/AboutWindow.xaml      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dashboard/AboutWindow.xaml b/Dashboard/AboutWindow.xaml
index f7c250ed..5fa28bcb 100644
--- a/Dashboard/AboutWindow.xaml
+++ b/Dashboard/AboutWindow.xaml
@@ -18,7 +18,7 @@
 
         <!-- Title -->
         <TextBlock Grid.Row="0" Text="Performance Monitor Dashboard" FontWeight="Bold" FontSize="18" Margin="0,0,0,5"/>
-        <TextBlock Grid.Row="1" x:Name="VersionText" Text="Version 1.1.0" FontSize="12" Foreground="{DynamicResource ForegroundMutedBrush}" Margin="0,0,0,20"/>
+        <TextBlock Grid.Row="1" x:Name="VersionText" Text="Version 1.2.0" FontSize="12" Foreground="{DynamicResource ForegroundMutedBrush}" Margin="0,0,0,20"/>
 
         <!-- Copyright -->
         <StackPanel Grid.Row="2" Margin="0,0,0,20">
diff --git a/Dashboard/Dashboard.csproj b/Dashboard/Dashboard.csproj
index ca513638..8de16fa1 100644
--- a/Dashboard/Dashboard.csproj
+++ b/Dashboard/Dashboard.csproj
@@ -6,7 +6,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>PerformanceMonitorDashboard</AssemblyName>
     <Product>SQL Server Performance Monitor Dashboard</Product>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <ApplicationIcon>EDD.ico</ApplicationIcon>
diff --git a/Dashboard/Mcp/McpHostService.cs b/Dashboard/Mcp/McpHostService.cs
index e6754c2a..25d32b73 100644
--- a/Dashboard/Mcp/McpHostService.cs
+++ b/Dashboard/Mcp/McpHostService.cs
@@ -59,7 +59,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                     options.ServerInfo = new()
                     {
                         Name = "PerformanceMonitorDashboard",
-                        Version = "1.1.0"
+                        Version = "1.2.0"
                     };
                     options.ServerInstructions = McpInstructions.Text;
                 })
diff --git a/Lite/Mcp/McpHostService.cs b/Lite/Mcp/McpHostService.cs
index 9ce7d73b..7835a9d5 100644
--- a/Lite/Mcp/McpHostService.cs
+++ b/Lite/Mcp/McpHostService.cs
@@ -52,7 +52,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                     options.ServerInfo = new()
                     {
                         Name = "PerformanceMonitorLite",
-                        Version = "1.1.0"
+                        Version = "1.2.0"
                     };
                     options.ServerInstructions = McpInstructions.Text;
                 })
diff --git a/Lite/PerformanceMonitorLite.csproj b/Lite/PerformanceMonitorLite.csproj
index 4f91e24e..6b51c5fa 100644
--- a/Lite/PerformanceMonitorLite.csproj
+++ b/Lite/PerformanceMonitorLite.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>PerformanceMonitorLite</AssemblyName>
     <RootNamespace>PerformanceMonitorLite</RootNamespace>
     <Product>SQL Server Performance Monitor Lite</Product>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <Description>Lightweight SQL Server performance monitoring - no installation required on target servers</Description>
diff --git a/Lite/Windows/AboutWindow.xaml b/Lite/Windows/AboutWindow.xaml
index 3bc51c5e..8b40f0ba 100644
--- a/Lite/Windows/AboutWindow.xaml
+++ b/Lite/Windows/AboutWindow.xaml
@@ -18,7 +18,7 @@
                    FontSize="18" FontWeight="Bold" Foreground="{DynamicResource ForegroundBrush}"
                    Margin="0,0,0,8"/>
 
-        <TextBlock Grid.Row="1" x:Name="VersionText" Text="Version 1.1.0"
+        <TextBlock Grid.Row="1" x:Name="VersionText" Text="Version 1.2.0"
                    Foreground="{DynamicResource ForegroundMutedBrush}" Margin="0,0,0,16"/>
 
         <TextBlock Grid.Row="2" TextWrapping="Wrap" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,8">