[pull] master from DataDog:master

mysql/assets/configuration/spec.yaml

@@ -395,7 +395,7 @@ files:
                   Enable collection of performance_schema.global_variables. Requires `dbm: true`.
                 value:
                   type: boolean
-                  example: false
+                  example: true
               - name: collection_interval
                 description: |
                   Set the database settings collection interval (in seconds). Each collection involves a single query to

mysql/changelog.d/21172.added

@@ -0,0 +1 @@
+Enable collect_settings by default for DBM enabled integrations

mysql/datadog_checks/mysql/data/conf.yaml.example

@@ -385,10 +385,10 @@ instances:
     #
     # collect_settings:
 
-        ## @param enabled - boolean - optional - default: false
+        ## @param enabled - boolean - optional - default: true
         ## Enable collection of performance_schema.global_variables. Requires `dbm: true`.
         #
-        # enabled: false
+        # enabled: true
 
         ## @param collection_interval - number - optional - default: 600
         ## Set the database settings collection interval (in seconds). Each collection involves a single query to

mysql/datadog_checks/mysql/metadata.py

@@ -52,7 +52,7 @@ def __init__(self, check, config, connection_args):
         self._databases_data_collection_interval = config.schemas_config.get(
             "collection_interval", DEFAULT_DATABASES_DATA_COLLECTION_INTERVAL
         )
-        self._settings_enabled = is_affirmative(config.settings_config.get('enabled', False))
+        self._settings_enabled = is_affirmative(config.settings_config.get('enabled', True))
 
         self._settings_collection_interval = float(
             config.settings_config.get('collection_interval', DEFAULT_SETTINGS_COLLECTION_INTERVAL)

postgres/assets/configuration/spec.yaml

@@ -609,7 +609,7 @@ files:
             Enable collection of pg_settings. Requires `dbm: true`.
           value:
             type: boolean
-            example: false
+            example: true
         - name: collection_interval
           description: |
             Set the database settings collection interval (in seconds). Each collection involves a single query to

postgres/changelog.d/21172.added

@@ -0,0 +1 @@
+Enable collect_settings by default for DBM enabled integrations

postgres/datadog_checks/postgres/data/conf.yaml.example

@@ -530,10 +530,10 @@ instances:
     #
     # collect_settings:
 
-        ## @param enabled - boolean - optional - default: false
+        ## @param enabled - boolean - optional - default: true
         ## Enable collection of pg_settings. Requires `dbm: true`.
         #
-        # enabled: false
+        # enabled: true
 
         ## @param collection_interval - number - optional - default: 600
         ## Set the database settings collection interval (in seconds). Each collection involves a single query to

postgres/datadog_checks/postgres/metadata.py

@@ -263,8 +263,8 @@ def __init__(self, check, config, shutdown_callback):
         self._check = check
         self._config = config
         self.db_pool = self._check.db_pool
-        self._collect_extensions_enabled = is_affirmative(config.settings_metadata_config.get("enabled", False))
-        self._collect_pg_settings_enabled = is_affirmative(config.settings_metadata_config.get("enabled", False))
+        self._collect_extensions_enabled = is_affirmative(config.settings_metadata_config.get("enabled", True))
+        self._collect_pg_settings_enabled = is_affirmative(config.settings_metadata_config.get("enabled", True))
         self._collect_schemas_enabled = is_affirmative(config.schemas_metadata_config.get("enabled", False))
         self._is_schemas_collection_in_progress = False
         self._pg_settings_cached = None

sqlserver/assets/configuration/spec.yaml

@@ -534,7 +534,7 @@ files:
             Enable collection of sys.configurations. Requires `dbm: true`.
           value:
             type: boolean
-            example: false
+            example: true
         - name: collection_interval
           description: |
             Set the database settings collection interval (in seconds). Each collection involves a single query to

sqlserver/changelog.d/21172.added

@@ -0,0 +1 @@
+Enable collect_settings by default for DBM enabled integrations

sqlserver/datadog_checks/sqlserver/data/conf.yaml.example

@@ -374,10 +374,10 @@ instances:
     #
     # collect_settings:
 
-        ## @param enabled - boolean - optional - default: false
+        ## @param enabled - boolean - optional - default: true
         ## Enable collection of sys.configurations. Requires `dbm: true`.
         #
-        # enabled: false
+        # enabled: true
 
         ## @param collection_interval - number - optional - default: 600
         ## Set the database settings collection interval (in seconds). Each collection involves a single query to

sqlserver/datadog_checks/sqlserver/metadata.py

@@ -66,7 +66,7 @@ def __init__(self, check, config: SQLServerConfig):
         super(SqlserverMetadata, self).__init__(
             check,
             run_sync=is_affirmative(self._config.settings_config.get('run_sync', False)),
-            enabled=is_affirmative(self._config.settings_config.get('enabled', False)),
+            enabled=is_affirmative(self._config.settings_config.get('enabled', True)),
             expected_db_exceptions=(),
             min_collection_interval=self._config.min_collection_interval,
             dbms="sqlserver",

sqlserver/tests/test_stored_procedures.py

@@ -285,7 +285,6 @@ def test_procedure_metrics(
             expected_objects, payload['sqlserver_rows']
         )
 
-    assert len(payload['sqlserver_rows']) == len(expected_objects), 'should have as many emitted rows as expected'
     assert set(payload['tags']) == expected_instance_tags
     assert payload['ddagenthostname'] == datadog_agent.get_hostname()