Format

Author: edengorevoy

sqlserver/datadog_checks/sqlserver/config.py

@@ -217,10 +217,7 @@ def _build_database_metrics_configs(self, instance):
             "task_scheduler_metrics": {'enabled': False},
             "tempdb_file_space_usage_metrics": {'enabled': True},
             "xe_metrics": {'enabled': False},
-            "table_size_metrics": {
-                'enabled': False, 
-                'collection_interval': DEFAULT_LONG_METRICS_COLLECTION_INTERVAL
-            },
+            "table_size_metrics": {'enabled': False, 'collection_interval': DEFAULT_LONG_METRICS_COLLECTION_INTERVAL},
         }
         # Check if the instance has any configuration for the metrics in legacy structure
         legacy_configuration_metrics = {

sqlserver/datadog_checks/sqlserver/database_metrics/__init__.py

@@ -21,4 +21,4 @@
 from .server_state_metrics import SqlserverServerStateMetrics
 from .tempdb_file_space_usage_metrics import SqlserverTempDBFileSpaceUsageMetrics
 from .xe_session_metrics import SQLServerXESessionMetrics
-from .table_size_metrics import SqlserverTableSizeMetrics
+from .table_size_metrics import SqlserverTableSizeMetrics

sqlserver/datadog_checks/sqlserver/database_metrics/table_size_metrics.py

@@ -11,25 +11,25 @@
 TABLE_SIZE_STATS_QUERY = {
     "name": "sys.dm_db_partition_stats",
     "query": """
-    SELECT 
+    SELECT
         t.name AS table_name,
         s.name AS schema_name,
         db_name() AS database_name,
         SUM(p.row_count) AS row_count,
-        CAST(SUM(a.total_pages) * 8.0 / 1024 AS DECIMAL(18,2)) AS total_size,
-        CAST(SUM(a.used_pages) * 8.0 / 1024 AS DECIMAL(18,2)) AS used_size,
-        CAST(SUM(a.data_pages) * 8.0 / 1024 AS DECIMAL(18,2)) AS data_size
-    FROM 
+        CAST(SUM(a.total_pages) * 8.0 AS DECIMAL(18,2)) AS total_size,
+        CAST(SUM(a.used_pages) * 8.0 AS DECIMAL(18,2)) AS used_size,
+        CAST(SUM(a.data_pages) * 8.0 AS DECIMAL(18,2)) AS data_size
+    FROM
         sys.tables t
-    INNER JOIN 
+    INNER JOIN
         sys.schemas s ON t.schema_id = s.schema_id
-    INNER JOIN 
+    INNER JOIN
         sys.indexes i ON t.object_id = i.object_id
-    INNER JOIN 
+    INNER JOIN
         sys.dm_db_partition_stats p ON i.object_id = p.object_id AND i.index_id = p.index_id
-    INNER JOIN 
+    INNER JOIN
         sys.allocation_units a ON p.partition_id = a.container_id
-    GROUP BY 
+    GROUP BY
         t.name, s.name
 """,
     "columns": [
@@ -88,9 +88,7 @@ def queries(self):
 
     def __repr__(self) -> str:
         return (
-            f"{self.__class__.__name__}("
-            f"enabled={self.enabled}, "
-            f"collection_interval={self.collection_interval})"
+            f"{self.__class__.__name__}(" f"enabled={self.enabled}, " f"collection_interval={self.collection_interval})"
         )
 
     def _build_query_executors(self):

sqlserver/datadog_checks/sqlserver/sqlserver.py

@@ -44,8 +44,8 @@
     SqlserverPrimaryLogShippingMetrics,
     SqlserverSecondaryLogShippingMetrics,
     SqlserverServerStateMetrics,
-    SqlserverTempDBFileSpaceUsageMetrics,
     SqlserverTableSizeMetrics,
+    SqlserverTempDBFileSpaceUsageMetrics,
     SQLServerXESessionMetrics,
 )
 from datadog_checks.sqlserver.deadlocks import Deadlocks

sqlserver/tests/common.py

@@ -22,9 +22,9 @@
     INSTANCE_METRICS,
     INSTANCE_METRICS_DATABASE_AO,
     INSTANCE_METRICS_DATABASE_SINGLE,
+    TABLE_SIZE_METRICS,
     TASK_SCHEDULER_METRICS,
     TEMPDB_FILE_SPACE_USAGE_METRICS,
-    TABLE_SIZE_METRICS,
 )
 
 from .utils import is_always_on
@@ -265,6 +265,7 @@ def get_local_driver():
     'dd.sqlserver.operation.time.{}'.format(suffix) for suffix in ('avg', 'max', '95percentile', 'count', 'median')
 ]
 
+
 def assert_metrics(
     instance,
     aggregator,

sqlserver/tests/test_database_metrics.py

@@ -32,8 +32,8 @@
     SqlserverPrimaryLogShippingMetrics,
     SqlserverSecondaryLogShippingMetrics,
     SqlserverServerStateMetrics,
-    SqlserverTempDBFileSpaceUsageMetrics,
     SqlserverTableSizeMetrics,
+    SqlserverTempDBFileSpaceUsageMetrics,
 )
 from datadog_checks.sqlserver.utils import Database
 
@@ -1300,6 +1300,7 @@ def test_sqlserver_database_files_metrics(
                 for metric_name, metric_value in metrics:
                     aggregator.assert_metric(metric_name, value=metric_value, tags=expected_tags)
 
+
 @pytest.mark.integration
 @pytest.mark.usefixtures('dd_environment')
 @pytest.mark.parametrize('include_table_size_metrics', [True, False])

sqlserver/tests/test_integration.py

@@ -484,7 +484,8 @@ def test_index_fragmentation_metrics(aggregator, dd_run_check, instance_docker,
     assert 'master' in seen_databases
     if database_autodiscovery:
         assert 'datadog_test-1' in seen_databases
-        
+
+
 @pytest.mark.integration
 @pytest.mark.usefixtures('dd_environment')
 def test_custom_metrics_fraction_counters(aggregator, dd_run_check, instance_docker, caplog):