Merge pull request #311 from erikdarlingdata/dev

Dev
erikdarlingdata · Oct 18, 2023 · 475961f · 475961f
2 parents c5f0116 + 610639f
commit 475961f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/sp_HumanEvents/sp_HumanEventsBlockViewer.sql b/sp_HumanEvents/sp_HumanEventsBlockViewer.sql
@@ -886,7 +886,7 @@ BEGIN
             CONVERT(decimal(38, 6), deqs.total_worker_time / 1000. / deqs.execution_count),
         total_elapsed_time_ms =
             deqs.total_elapsed_time / 1000.,
-        avg_elapsed_time =
+        avg_elapsed_time_ms =
             CONVERT(decimal(38, 6), deqs.total_elapsed_time / 1000. / deqs.execution_count),
         executions_per_second =
             ISNULL
@@ -947,7 +947,7 @@ BEGIN
         ap.total_worker_time_ms,
         ap.avg_worker_time_ms,
         ap.total_elapsed_time_ms,
-        ap.avg_elapsed_time,
+        ap.avg_elapsed_time_ms,
         ap.total_logical_reads_mb,
         ap.total_physical_reads_mb,
         ap.total_logical_writes_mb,
@@ -975,7 +975,7 @@ BEGIN
             c.total_worker_time_ms,
             c.avg_worker_time_ms,
             c.total_elapsed_time_ms,
-            c.avg_elapsed_time,
+            c.avg_elapsed_time_ms,
             c.executions_per_second,
             c.total_physical_reads_mb,
             c.total_logical_writes_mb,
@@ -1673,7 +1673,7 @@ SELECT
     ap.total_worker_time_ms,
     ap.avg_worker_time_ms,
     ap.total_elapsed_time_ms,
-    ap.avg_elapsed_time,
+    ap.avg_elapsed_time_ms,
     ap.total_logical_reads_mb,
     ap.total_physical_reads_mb,
     ap.total_logical_writes_mb,
@@ -1702,7 +1702,7 @@ FROM
         c.total_worker_time_ms,
         c.avg_worker_time_ms,
         c.total_elapsed_time_ms,
-        c.avg_elapsed_time,
+        c.avg_elapsed_time_ms,
         c.executions_per_second,
         c.total_physical_reads_mb,
         c.total_logical_writes_mb,

diff --git a/sp_LogHunter/sp_LogHunter.sql b/sp_LogHunter/sp_LogHunter.sql
@@ -322,7 +322,8 @@ BEGIN
         VALUES
             (N'"Microsoft SQL Server"'),
             (N'"detected"'),
-            (N'"SQL Server has encountered"')
+            (N'"SQL Server has encountered"'),
+            (N'"Warning: Enterprise Server/CAL license used for this instance"')
     ) AS x (search_string)
     CROSS JOIN
     (
@@ -363,8 +364,7 @@ BEGIN
             ('Warning ******************'), ('SQL Server should be restarted'), ('Server name is'), ('Could not connect'), ('yielding'), ('worker thread'), ('A new connection was rejected'), 
             ('A significant part of sql server process memory has been paged out'), ('Dispatcher'), ('I/O requests taking longer than'), ('killed'), ('SQL Server could not start'), 
             ('SQL Server cannot start'), ('System Manufacturer:'), ('columnstore'), ('timed out'), ('inconsistent'), ('flushcache'), ('Recovery for availability database'), ('currently busy'), 
-            ('The service is experiencing a problem'), ('The service account is'), ('Total Log Writer threads'), ('thread pool'), ('debug'), ('resolving'),
-			      ('stack dump'), ('Stack Signature')
+            ('The service is experiencing a problem'), ('The service account is'), ('Total Log Writer threads'), ('thread pool'), ('debug'), ('resolving'), ('stack dump'), ('Stack Signature')
     ) AS v (search_string)
     CROSS JOIN
     (