add argument to disable disk-space-metrics

CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 Unreleased section should follow [Release Toolkit](https://github.com/newrelic/release-toolkit#render-markdown-and-update-markdown)
 
 ## Unreleased
+### Enhancement
+- Add `enable_disk_metrics_in_bytes` argument (default true), allows disabling disk-space-metrics
 
 ## v2.13.0 - 2024-10-08
 

src/args/argument_list.go

@@ -27,6 +27,7 @@ type ArgumentList struct {
 	CustomMetricsConfig          string `default:"" help:"YAML configuration with one or more SQL queries to collect custom metrics"`
 	ShowVersion                  bool   `default:"false" help:"Print build information and exit"`
 	ExtraConnectionURLArgs       string `default:"" help:"Appends additional parameters to connection url. Ex. 'applicationintent=readonly&foo=bar'"`
+	EnableDiskMetricsInBytes     bool   `default:"true" help:"Enable collection of disk space metrics in bytes."`
 }
 
 // Validate validates SQL specific arguments

src/metrics/instance_metric_definitions.go

@@ -108,19 +108,6 @@ var instanceDefinitions = []*QueryDefinition{
 			Sleeping   *int64 `db:"sleeping" metric_name:"instance.sleepingProcessesCount" source_type:"gauge"`
 		}{},
 	},
-	{
-		query: `SELECT Sum(total_bytes) AS total_disk_space FROM (
-			SELECT DISTINCT
-			dovs.volume_mount_point,
-			dovs.available_bytes available_bytes,
-			dovs.total_bytes total_bytes
-			FROM sys.master_files mf WITH (nolock)
-			CROSS apply sys.Dm_os_volume_stats(mf.database_id, mf.file_id) dovs
-			) drives`,
-		dataModels: &[]struct {
-			TotalDiskSpace *int64 `db:"total_disk_space" metric_name:"instance.diskInBytes" source_type:"gauge"`
-		}{},
-	},
 	{
 		query: `SELECT Sum(runnable_tasks_count) AS runnable_tasks_count
 		FROM sys.dm_os_schedulers
@@ -172,3 +159,19 @@ type waitTimeModel struct {
 	WaitTime  *int64  `db:"wait_time"`
 	WaitCount *int64  `db:"waiting_tasks_count"`
 }
+
+var diskMetricInBytesDefination = []*QueryDefinition{
+	{
+		query: `SELECT Sum(total_bytes) AS total_disk_space FROM (
+			SELECT DISTINCT
+			dovs.volume_mount_point,
+			dovs.available_bytes available_bytes,
+			dovs.total_bytes total_bytes
+			FROM sys.master_files mf WITH (nolock)
+			CROSS apply sys.Dm_os_volume_stats(mf.database_id, mf.file_id) dovs
+			) drives`,
+		dataModels: &[]struct {
+			TotalDiskSpace *int64 `db:"total_disk_space" metric_name:"instance.diskInBytes" source_type:"gauge"`
+		}{},
+	},
+}

src/metrics/metrics.go

@@ -48,6 +48,9 @@ func PopulateInstanceMetrics(instanceEntity *integration.Entity, connection *con
 	if arguments.EnableBufferMetrics {
 		collectionList = append(collectionList, instanceBufferDefinitions...)
 	}
+	if arguments.EnableDiskMetricsInBytes {
+		collectionList = append(collectionList, diskMetricInBytesDefination...)
+	}
 
 	for _, queryDef := range collectionList {
 		models := queryDef.GetDataModels()

src/metrics/metrics_test.go

@@ -159,7 +159,8 @@ func Test_populateInstanceMetrics(t *testing.T) {
 	mock.ExpectClose()
 
 	args := args.ArgumentList{
-		EnableBufferMetrics: true,
+		EnableBufferMetrics:      true,
+		EnableDiskMetricsInBytes: true,
 	}
 	PopulateInstanceMetrics(e, conn, args)