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

Jump to bottom

Issue 5132 & 5067 #5135

Merged
merged 13 commits into from
Dec 13, 2018
Merged

Issue 5132 & 5067 #5135

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
47a8c79
Refactor based on code from Denzil Ribeiro @ Microsoft.
m82labs Sep 5, 2018
902cfdf
Fixed some missing stats and altered the database IO query to report …
m82labs Sep 6, 2018
407ef92
Fixed some field names.
m82labs Sep 6, 2018
894af92
Fixed a syntax issue.
m82labs Sep 6, 2018
06a1fc6
Fixing dep issue.
m82labs Sep 6, 2018
64c1a61
Adding Gopkg.lock changes.
m82labs Sep 7, 2018
6b54f77
Added Percent Log Used to perf counters to satisfy 4597
m82labs Sep 7, 2018
8baad37
Removing some extra spaces, added a note about Azure Managed Instance…
m82labs Sep 11, 2018
dfdb061
Fixing merge issues.
m82labs Dec 11, 2018
cd52cdc
Removed storage info from the server properties query when NOT using …
m82labs Dec 11, 2018
8b0ee1c
Adding the mistakenly removed "sql_version" field from server propert…
m82labs Dec 11, 2018
16715b0
Merge remote-tracking branch 'upstream/master' into ISSUE_5132
m82labs Dec 12, 2018
25c1bf7
Pulling the existing Gopkg.lock from master.
m82labs Dec 12, 2018
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
6 changes: 3 additions & 3 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 3 additions & 17 deletions plugins/inputs/sqlserver/sqlserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,6 @@ const sqlServerPropertiesV2 = `DECLARE @sys_info TABLE (

IF OBJECT_ID('master.sys.dm_os_sys_info') IS NOT NULL
BEGIN

IF SERVERPROPERTY('EngineEdition') = 8 -- Managed Instance
INSERT INTO @sys_info ( cpu_count, server_memory, sku, engine_edition, hardware_type, total_storage_mb, available_storage_mb, uptime )
SELECT TOP(1)
Expand All @@ -418,19 +417,6 @@ BEGIN

ELSE
BEGIN
DECLARE @total_disk_size_mb BIGINT,
@available_space_mb BIGINT

SELECT @total_disk_size_mb = sum(total_disk_size_mb),
@available_space_mb = sum(free_disk_space_mb)
FROM (
SELECT distinct logical_volume_name AS LogicalName,
total_bytes/(1024*1024)as total_disk_size_mb,
available_bytes /(1024*1024) free_disk_space_mb
FROM sys.master_files AS f
CROSS APPLY sys.dm_os_volume_stats(f.database_id, f.file_id)
) as osVolumes

INSERT INTO @sys_info ( cpu_count, server_memory, sku, engine_edition, hardware_type, total_storage_mb, available_storage_mb, uptime )
SELECT cpu_count,
(SELECT total_physical_memory_kb FROM sys.dm_os_sys_memory) AS server_memory,
Expand All @@ -440,13 +426,12 @@ BEGIN
WHEN 'NONE' THEN 'PHYSICAL Machine'
ELSE virtual_machine_type_desc
END AS hardware_type,
@total_disk_size_mb,
@available_space_mb,
NULL,
NULL,
DATEDIFF(MINUTE,sqlserver_start_time,GETDATE())
FROM sys.dm_os_sys_info
END
END

SELECT 'sqlserver_server_properties' AS [measurement],
REPLACE(@@SERVERNAME,'\',':') AS [sql_instance],
s.cpu_count,
Expand All @@ -457,6 +442,7 @@ SELECT 'sqlserver_server_properties' AS [measurement],
s.total_storage_mb,
s.available_storage_mb,
s.uptime,
SERVERPROPERTY('ProductVersion') AS sql_version,
db_online,
db_restoring,
db_recovering,
Expand Down