Skip to content

Commit cee976a

Browse files
shane-bordenShane Borden
andauthored
feat: Add mssql database recovery model (#450)
* feat: add database recovery model metadata * chore: Update License Information * feat: add column heading for new value in csv --------- Co-authored-by: Shane Borden <[email protected]>
1 parent 657f5a6 commit cee976a

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

scripts/collector/sqlserver/instanceReview.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ Set-Content -Path $foldername\$tableList -Encoding utf8 -Value '"PKEY"|"database
516516
Set-Content -Path $foldername\$indexList -Encoding utf8 -Value '"PKEY"|"database_name"|"schema_name"|"table_name"|"index_name"|"index_type"|"is_primary_key"|"is_unique"|"fill_factor"|"allow_page_locks"|"has_filter"|"data_compression"|"data_compression_desc"|"is_partitioned"|"count_key_ordinal"|"count_partition_ordinal"|"count_is_included_column"|"total_space_mb"|"dma_source_id"|"dma_manual_id"|"is_computed_index"|"is_index_on_view"'
517517
Set-Content -Path $foldername\$columnDatatypes -Encoding utf8 -Value '"PKEY"|"database_name"|"schema_name"|"table_name"|"datatype"|"max_length"|"precision"|"scale"|"is_computed"|"is_filestream"|"is_masked"|"encryption_type"|"is_sparse"|"rule_object_id"|"column_count"|"dma_source_id"|"dma_manual_id"'
518518
Set-Content -Path $foldername\$userConnectionList -Encoding utf8 -Value '"PKEY"|"database_name"|"is_user_process"|"host_name"|"program_name"|"login_name"|"num_reads"|"num_writes"|"last_read"|"last_write"|"reads"|"logical_reads"|"writes"|"client_interface_name"|"nt_domain"|"nt_user_name"|"client_net_address"|"local_net_address"|"dma_source_id"|"dma_manual_id"|"client_version"|"protocol_type"|"protocol_version"|"protocol_hex_version"'
519-
Set-Content -Path $foldername\$dbsizes -Encoding utf8 -Value '"PKEY"|"database_name"|"type_desc"|"current_size_mb"|"dma_source_id"|"dma_manual_id"'
519+
Set-Content -Path $foldername\$dbsizes -Encoding utf8 -Value '"PKEY"|"database_name"|"type_desc"|"current_size_mb"|"dma_source_id"|"dma_manual_id"|"recovery_model_desc"'
520520
Set-Content -Path $foldername\$dbServerDmvPerfmon -Encoding utf8 -Value '"PKEY"|"collection_time"|"available_mbytes"|"physicaldisk_avg_disk_bytes_read"|"physicaldisk_avg_disk_bytes_write"|"physicaldisk_avg_disk_bytes_read_sec"|"physicaldisk_avg_disk_bytes_write_sec"|"physicaldisk_disk_reads_sec"|"physicaldisk_disk_writes_sec"|"processor_idle_time_pct"|"processor_total_time_pct"|"processor_frequency"|"processor_queue_length"|"buffer_cache_hit_ratio"|"checkpoint_pages_sec"|"free_list_stalls_sec"|"page_life_expectancy"|"page_lookups_sec"|"page_reads_sec"|"page_writes_sec"|"user_connection_count"|"memory_grants_pending"|"target_server_memory_kb"|"total_server_memory_kb"|"batch_requests_sec"|"dma_source_id"|"dma_manual_id"'
521521
Set-Content -Path $foldername\$databaseLevelBlockingFeatures -Encoding utf8 -Value '"PKEY"|"database_name"|"feature_name"|"is_enabled_or_used"|"occurance_count"|"dma_source_id"|"dma_manual_id"'
522522

scripts/collector/sqlserver/sql/dbSizes.sql

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2023 Google LLC
2+
Copyright 2024 Google LLC
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -58,23 +58,27 @@ BEGIN
5858
'"' + CONVERT(NVARCHAR(255),sizing.type_desc) + '"' as type_desc,
5959
'"' + CONVERT(NVARCHAR(255),sizing.current_size_mb) + '"' as current_size_mb,
6060
'"' + @DMA_SOURCE_ID + '"' as dma_source_id,
61-
'"' + @DMA_MANUAL_ID + '"' as dma_manual_id
61+
'"' + @DMA_MANUAL_ID + '"' as dma_manual_id,
62+
'"' + CONVERT(NVARCHAR(255),sizing.recovery_model_desc) + '"' as recovery_model_desc
6263
FROM(
6364
SELECT
6465
db_name() AS database_name,
6566
type_desc,
66-
SUM(size/128.0) AS current_size_mb
67+
SUM(size/128.0) AS current_size_mb,
68+
d.recovery_model_desc AS recovery_model_desc
6769
FROM sys.database_files sm
70+
CROSS JOIN sys.databases d
6871
WHERE db_name() NOT IN ('master', 'model', 'msdb','distribution','reportserver', 'reportservertempdb','resource','rdsadmin')
69-
AND type IN (0,1)
72+
AND d.name = db_name()
73+
AND sm.type IN (0,1)
7074
AND EXISTS (SELECT 1
7175
FROM sys.databases sd
72-
WHERE state = 0
76+
WHERE sd.state = 0
7377
AND sd.name NOT IN ('master','model','msdb','distribution','reportserver', 'reportservertempdb','resource','rdsadmin')
7478
AND sd.name like @ASSESSMENT_DATABSE_NAME
7579
AND sd.state = 0
7680
AND sd.name =db_name())
77-
GROUP BY type_desc) sizing
81+
GROUP BY sm.type_desc, d.recovery_model_desc) sizing
7882
END
7983
END TRY
8084
BEGIN CATCH

0 commit comments

Comments
 (0)