Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Database_type config to Split up sql queries by engine type #7934

Merged
merged 14 commits into from
Sep 8, 2020
Merged

Database_type config to Split up sql queries by engine type #7934

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1759750
split functionality by database engine type
denzilribeiro Aug 2, 2020
749a6b2
Split out SQL Managed instance queries
denzilribeiro Aug 3, 2020
2bfa6b2
Adding database_type SQLServer
denzilribeiro Aug 3, 2020
31acde7
Updating tests
denzilribeiro Aug 3, 2020
a435ecb
Reverting test file changes
denzilribeiro Aug 3, 2020
9f71952
V2 Queries split and deprecation notice
denzilribeiro Aug 10, 2020
2dbdcc5
Changed requests to include blocking sessions
denzilribeiro Aug 10, 2020
9c9c085
Added New counter - Lock Timeouts (timeout>0)/sec
denzilribeiro Aug 10, 2020
2aa2036
Fixing unintentional syntax bug with AzureDBServerProperties
denzilribeiro Aug 13, 2020
93a2751
Split on-prem SQL Server queries
denzilribeiro Aug 15, 2020
ba1b40c
Adding SQL Server On-prem queries file
denzilribeiro Aug 15, 2020
e6be374
Reverting to request database ID for SQL 2008/R2 compat
denzilribeiro Sep 3, 2020
19ede7c
Change to dynamic sql for 2008/R2 compat
denzilribeiro Sep 5, 2020
c3b0da8
Changing SqlRequests collector for 2008/R2 compatibility
denzilribeiro Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 33 additions & 18 deletions plugins/inputs/sqlserver/sqlqueriesV2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,16 +1222,28 @@ ELSE
`

const sqlServerRequestsV2 string = `
SET NOCOUNT ON;
SET NOCOUNT ON;
DECLARE
@SqlStatement AS nvarchar(max)
,@MajorMinorVersion AS int = CAST(PARSENAME(CAST(SERVERPROPERTY('ProductVersion') as nvarchar),4) AS int) * 100 + CAST(PARSENAME(CAST(SERVERPROPERTY('ProductVersion') as nvarchar),3) AS int)

-- 2008R2 and before doesn't have open_transaction_count in sys.dm_exec_sessions
DECLARE @Columns as nvarchar(max) = ''
IF @MajorMinorVersion >= 1200
SET @Columns = ',s.open_transaction_count as open_transaction '
ELSE
SET @Columns = ',r.open_transaction_count as open_transaction'

SET @SqlStatement = N'
SELECT blocking_session_id into #blockingSessions FROM sys.dm_exec_requests WHERE blocking_session_id != 0
create index ix_blockingSessions_1 on #blockingSessions (blocking_session_id)
SELECT
'sqlserver_requests' AS [measurement]
, REPLACE(@@SERVERNAME,'\',':') AS [sql_instance]
SELECT
''sqlserver_requests'' AS [measurement]
, REPLACE(@@SERVERNAME,''\'','':'') AS [sql_instance]
, DB_NAME() as [database_name]
, s.session_id
, ISNULL(r.request_id,0) as request_id
, DB_NAME(r.database_id) as session_db_name
, DB_NAME(s.database_id) as session_db_name
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s.database_id is not available in SQL 2008 and R2, it should be r.database_id

But since this is dynamic SQL now you can just pass it in the column parameter

IF @MajorMinorVersion >= 1200  
	SET @Columns = ',s.open_transaction_count as open_transaction
	,DB_NAME(s.database_id) as session_db_name'
ELSE
	SET @Columns = ',r.open_transaction_count as open_transaction
	,DB_NAME(r.database_id) as session_db_name'

after this the PR is approved to me

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dang it sorry moving target should install a 2008/R2 instance at some point. should be done now.

, COALESCE(r.status,s.status) AS status
, COALESCE(r.cpu_time,s.cpu_time) AS cpu_time_ms
, COALESCE(r.total_elapsed_time,s.total_elapsed_time) AS total_elapsed_time_ms
Expand All @@ -1244,16 +1256,16 @@ SELECT
, r.blocking_session_id
, s.program_name
, s.host_name
, s.nt_user_name
, s.open_transaction_count AS open_transaction
, LEFT (CASE COALESCE(r.transaction_isolation_level, s.transaction_isolation_level)
WHEN 0 THEN '0-Read Committed'
WHEN 1 THEN '1-Read Uncommitted (NOLOCK)'
WHEN 2 THEN '2-Read Committed'
WHEN 3 THEN '3-Repeatable Read'
WHEN 4 THEN '4-Serializable'
WHEN 5 THEN '5-Snapshot'
ELSE CONVERT (varchar(30), r.transaction_isolation_level) + '-UNKNOWN'
, s.nt_user_name '
+ @Columns +
N', LEFT (CASE COALESCE(r.transaction_isolation_level, s.transaction_isolation_level)
WHEN 0 THEN ''0-Read Committed''
WHEN 1 THEN ''1-Read Uncommitted (NOLOCK)''
WHEN 2 THEN ''2-Read Committed''
WHEN 3 THEN ''3-Repeatable Read''
WHEN 4 THEN ''4-Serializable''
WHEN 5 THEN ''5-Snapshot''
ELSE CONVERT (varchar(30), r.transaction_isolation_level) + ''-UNKNOWN''
END, 30) AS transaction_isolation_level
, r.granted_query_memory as granted_query_memory_pages
, r.percent_complete
Expand All @@ -1266,7 +1278,7 @@ SELECT
END - r.statement_start_offset) / 2 + 1
) AS statement_text
, qt.objectid
, QUOTENAME(OBJECT_SCHEMA_NAME(qt.objectid,qt.dbid)) + '.' + QUOTENAME(OBJECT_NAME(qt.objectid,qt.dbid)) as stmt_object_name
, QUOTENAME(OBJECT_SCHEMA_NAME(qt.objectid,qt.dbid)) + ''.'' + QUOTENAME(OBJECT_NAME(qt.objectid,qt.dbid)) as stmt_object_name
, DB_NAME(qt.dbid) stmt_db_name
, CONVERT(varchar(20),[query_hash],1) as [query_hash]
, CONVERT(varchar(20),[query_plan_hash],1) as [query_plan_hash]
Expand All @@ -1275,9 +1287,12 @@ LEFT OUTER JOIN sys.dm_exec_requests AS r
ON s.session_id = r.session_id
OUTER APPLY sys.dm_exec_sql_text(r.sql_handle) AS qt
WHERE 1 = 1
AND (r.session_id IS NOT NULL AND (s.is_user_process = 1 OR r.status COLLATE Latin1_General_BIN NOT IN ('background', 'sleeping')))
AND (r.session_id IS NOT NULL AND (s.is_user_process = 1
OR r.status COLLATE Latin1_General_BIN NOT IN (''background'', ''sleeping'')))
OR (s.session_id IN (SELECT blocking_session_id FROM #blockingSessions))
OPTION(MAXDOP 1)
OPTION(MAXDOP 1)'

EXEC sp_executesql @SqlStatement
`

const sqlServerVolumeSpaceV2 string = `
Expand Down
53 changes: 35 additions & 18 deletions plugins/inputs/sqlserver/sqlserverqueries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,15 +1016,29 @@ IF SERVERPROPERTY('EngineEdition') IN (2,3,4) /*Standard,Enterpris,Express*/
`

const sqlServerRequests string = `
SET NOCOUNT ON;
SET NOCOUNT ON;
DECLARE
@SqlStatement AS nvarchar(max)
,@EngineEdition AS tinyint = CAST(SERVERPROPERTY('EngineEdition') AS int)
,@MajorMinorVersion AS int = CAST(PARSENAME(CAST(SERVERPROPERTY('ProductVersion') as nvarchar),4) AS int) * 100 + CAST(PARSENAME(CAST(SERVERPROPERTY('ProductVersion') as nvarchar),3) AS int)

-- 2008R2 and before doesn't have open_transaction_count in sys.dm_exec_sessions
DECLARE @Columns as nvarchar(max) = ''
IF @MajorMinorVersion >= 1200
SET @Columns = ',s.open_transaction_count as open_transaction '
ELSE
SET @Columns = ',r.open_transaction_count as open_transaction'

SET @SqlStatement = N'
SELECT blocking_session_id into #blockingSessions FROM sys.dm_exec_requests WHERE blocking_session_id != 0
create index ix_blockingSessions_1 on #blockingSessions (blocking_session_id)
SELECT
'sqlserver_requests' AS [measurement]
, REPLACE(@@SERVERNAME,'\',':') AS [sql_instance]
SELECT
''sqlserver_requests'' AS [measurement]
, REPLACE(@@SERVERNAME,''\'','':'') AS [sql_instance]
, DB_NAME() as [database_name]
, s.session_id
, ISNULL(r.request_id,0) as request_id
, DB_NAME(r.database_id) as session_db_name
, DB_NAME(s.database_id) as session_db_name
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For 2008 and 2008R2 compatibility get col from dm_exec_requests

, DB_NAME(r.database_id) as session_db_name

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do, this was a change I picked up from 45a83b9 and can revert it.

, COALESCE(r.status,s.status) AS status
, COALESCE(r.cpu_time,s.cpu_time) AS cpu_time_ms
, COALESCE(r.total_elapsed_time,s.total_elapsed_time) AS total_elapsed_time_ms
Expand All @@ -1037,16 +1051,16 @@ SELECT
, r.blocking_session_id
, s.program_name
, s.host_name
, s.nt_user_name
, s.open_transaction_count AS open_transaction
, LEFT (CASE COALESCE(r.transaction_isolation_level, s.transaction_isolation_level)
WHEN 0 THEN '0-Read Committed'
WHEN 1 THEN '1-Read Uncommitted (NOLOCK)'
WHEN 2 THEN '2-Read Committed'
WHEN 3 THEN '3-Repeatable Read'
WHEN 4 THEN '4-Serializable'
WHEN 5 THEN '5-Snapshot'
ELSE CONVERT (varchar(30), r.transaction_isolation_level) + '-UNKNOWN'
, s.nt_user_name '
+ @Columns +
N', LEFT (CASE COALESCE(r.transaction_isolation_level, s.transaction_isolation_level)
WHEN 0 THEN ''0-Read Committed''
WHEN 1 THEN ''1-Read Uncommitted (NOLOCK)''
WHEN 2 THEN ''2-Read Committed''
WHEN 3 THEN ''3-Repeatable Read''
WHEN 4 THEN ''4-Serializable''
WHEN 5 THEN ''5-Snapshot''
ELSE CONVERT (varchar(30), r.transaction_isolation_level) + ''-UNKNOWN''
END, 30) AS transaction_isolation_level
, r.granted_query_memory as granted_query_memory_pages
, r.percent_complete
Expand All @@ -1059,7 +1073,7 @@ SELECT
END - r.statement_start_offset) / 2 + 1
) AS statement_text
, qt.objectid
, QUOTENAME(OBJECT_SCHEMA_NAME(qt.objectid,qt.dbid)) + '.' + QUOTENAME(OBJECT_NAME(qt.objectid,qt.dbid)) as stmt_object_name
, QUOTENAME(OBJECT_SCHEMA_NAME(qt.objectid,qt.dbid)) + ''.'' + QUOTENAME(OBJECT_NAME(qt.objectid,qt.dbid)) as stmt_object_name
, DB_NAME(qt.dbid) stmt_db_name
, CONVERT(varchar(20),[query_hash],1) as [query_hash]
, CONVERT(varchar(20),[query_plan_hash],1) as [query_plan_hash]
Expand All @@ -1068,9 +1082,12 @@ LEFT OUTER JOIN sys.dm_exec_requests AS r
ON s.session_id = r.session_id
OUTER APPLY sys.dm_exec_sql_text(r.sql_handle) AS qt
WHERE 1 = 1
AND (r.session_id IS NOT NULL AND (s.is_user_process = 1 OR r.status COLLATE Latin1_General_BIN NOT IN ('background', 'sleeping')))
AND (r.session_id IS NOT NULL AND (s.is_user_process = 1
OR r.status COLLATE Latin1_General_BIN NOT IN (''background'', ''sleeping'')))
OR (s.session_id IN (SELECT blocking_session_id FROM #blockingSessions))
OPTION(MAXDOP 1)
OPTION(MAXDOP 1)'

EXEC sp_executesql @SqlStatement
`

const sqlServerVolumeSpace string = `
Expand Down