From bb5c65f5f3555dbfdec1695c5b8efd23ab65b5f7 Mon Sep 17 00:00:00 2001
From: Avinash Nigam <56562150+avinash-nigam@users.noreply.github.com>
Date: Thu, 24 Sep 2020 09:09:51 -0700
Subject: [PATCH] Added more performance counters to SqlServer input plugin
 (#8120)

---
 plugins/inputs/sqlserver/sqlqueriesV2.go | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/sqlserver/sqlqueriesV2.go b/plugins/inputs/sqlserver/sqlqueriesV2.go
index 5cc8d4953689a..66b1bdf5976b5 100644
--- a/plugins/inputs/sqlserver/sqlqueriesV2.go
+++ b/plugins/inputs/sqlserver/sqlqueriesV2.go
@@ -386,6 +386,17 @@ FROM sys.dm_os_schedulers AS s'
 EXEC sp_executesql @SqlStatement
 `
 
+/*
+This string defines a SQL statements to retrieve Performance Counters as documented here -
+	SQL Server Performance Objects - https://docs.microsoft.com/en-us/sql/relational-databases/performance-monitor/use-sql-server-objects?view=sql-server-ver15#SQLServerPOs
+Some of the specific objects used are -
+	MSSQL$*:Access Methods - https://docs.microsoft.com/en-us/sql/relational-databases/performance-monitor/sql-server-access-methods-object?view=sql-server-ver15
+	MSSQL$*:Buffer Manager - https://docs.microsoft.com/en-us/sql/relational-databases/performance-monitor/sql-server-buffer-manager-object?view=sql-server-ver15
+	MSSQL$*:Databases - https://docs.microsoft.com/en-us/sql/relational-databases/performance-monitor/sql-server-databases-object?view=sql-server-ver15
+	MSSQL$*:General Statistics - https://docs.microsoft.com/en-us/sql/relational-databases/performance-monitor/sql-server-general-statistics-object?view=sql-server-ver15
+	MSSQL$*:Exec Statistics - https://docs.microsoft.com/en-us/sql/relational-databases/performance-monitor/sql-server-execstatistics-object?view=sql-server-ver15
+	SQLServer:Query Store - https://docs.microsoft.com/en-us/sql/relational-databases/performance-monitor/sql-server-query-store-object?view=sql-server-ver15
+*/
 const sqlPerformanceCountersV2 string = `
 SET DEADLOCK_PRIORITY -10;
 
@@ -465,13 +476,19 @@ SET @SqlStatement = @SqlStatement + CAST(N' WHERE	(
 				''Readahead pages/sec'',
 				''Lazy writes/sec'',
 				''Checkpoint pages/sec'',
+				''Free pages'',
+				''Extension free pages'',
+				''Table Lock Escalations/sec'',
 				''Page life expectancy'',
 				''Log File(s) Size (KB)'',
 				''Log File(s) Used Size (KB)'',
 				''Data File(s) Size (KB)'',
 				''Transactions/sec'',
 				''Write Transactions/sec'',
+				''Active Transactions'',
+				''Log Growths'',
 				''Active Temp Tables'',
+				''Logical Connections'',
 				''Temp Tables Creation Rate'',
 				''Temp Tables For Destruction'',
 				''Free Space in tempdb (KB)'',
@@ -527,7 +544,10 @@ SET @SqlStatement = @SqlStatement + CAST(N' WHERE	(
 				''Redo Queue KB'',
 				''Mirrored Write Transactions/sec'',
 				''Group Commit Time'',
-				''Group Commits/Sec''
+				''Group Commits/Sec'',
+				''Distributed Query'',
+				''DTC calls'',
+				''Query Store CPU usage''
 			)
 		) OR (
 			object_name LIKE ''%User Settable%''