From bacb6c385d5182bd36022a1b82d0b80b2a20d1f0 Mon Sep 17 00:00:00 2001 From: deweter Date: Mon, 22 Aug 2022 21:05:43 +0200 Subject: [PATCH] fix(inputs.sqlserver): fixing wrong filtering for sqlAzureMIRequests and sqlAzureDBRequests (#11701) --- plugins/inputs/sqlserver/azuresqldbqueries.go | 4 ++-- plugins/inputs/sqlserver/azuresqlmanagedqueries.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/inputs/sqlserver/azuresqldbqueries.go b/plugins/inputs/sqlserver/azuresqldbqueries.go index 78cfaafc1..749a5ae51 100644 --- a/plugins/inputs/sqlserver/azuresqldbqueries.go +++ b/plugins/inputs/sqlserver/azuresqldbqueries.go @@ -604,7 +604,7 @@ FROM ( ,REPLACE(@@SERVERNAME,'\',':') AS [sql_instance] ,DB_NAME() as [database_name] ,s.[session_id] - ,ISNULL(r.[request_id], 0) as [request_id] + ,r.[request_id] ,DB_NAME(COALESCE(r.[database_id], s.[database_id])) AS [session_db_name] ,COALESCE(r.[status], s.[status]) AS [status] ,COALESCE(r.[cpu_time], s.[cpu_time]) AS [cpu_time_ms] @@ -660,7 +660,7 @@ WHERE AND ( --Always fetch user process (in any state), fetch system process only if active [is_user_process] = 1 OR [status] COLLATE Latin1_General_BIN NOT IN ('background', 'sleeping') - ) + ) ) OPTION(MAXDOP 1); ` diff --git a/plugins/inputs/sqlserver/azuresqlmanagedqueries.go b/plugins/inputs/sqlserver/azuresqlmanagedqueries.go index 1b1a7ca20..53104919c 100644 --- a/plugins/inputs/sqlserver/azuresqlmanagedqueries.go +++ b/plugins/inputs/sqlserver/azuresqlmanagedqueries.go @@ -471,7 +471,7 @@ FROM ( ,REPLACE(@@SERVERNAME,'\',':') AS [sql_instance] ,DB_NAME() as [database_name] ,s.[session_id] - ,ISNULL(r.[request_id], 0) as [request_id] + ,r.[request_id] ,DB_NAME(COALESCE(r.[database_id], s.[database_id])) AS [session_db_name] ,COALESCE(r.[status], s.[status]) AS [status] ,COALESCE(r.[cpu_time], s.[cpu_time]) AS [cpu_time_ms]