diff --git a/mysql/assets/configuration/spec.yaml b/mysql/assets/configuration/spec.yaml index 604eb22e97812..68f910933121c 100644 --- a/mysql/assets/configuration/spec.yaml +++ b/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 diff --git a/mysql/changelog.d/21172.added b/mysql/changelog.d/21172.added new file mode 100644 index 0000000000000..a30340a18dcf0 --- /dev/null +++ b/mysql/changelog.d/21172.added @@ -0,0 +1 @@ +Enable collect_settings by default for DBM enabled integrations diff --git a/mysql/datadog_checks/mysql/data/conf.yaml.example b/mysql/datadog_checks/mysql/data/conf.yaml.example index e953fff0e4f81..886e205c49ece 100644 --- a/mysql/datadog_checks/mysql/data/conf.yaml.example +++ b/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 diff --git a/mysql/datadog_checks/mysql/metadata.py b/mysql/datadog_checks/mysql/metadata.py index 0f31221cee8d2..ac4f004c7694c 100644 --- a/mysql/datadog_checks/mysql/metadata.py +++ b/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) diff --git a/postgres/assets/configuration/spec.yaml b/postgres/assets/configuration/spec.yaml index a8bfe50bd9ae3..7a5ec722261fa 100644 --- a/postgres/assets/configuration/spec.yaml +++ b/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 diff --git a/postgres/changelog.d/21172.added b/postgres/changelog.d/21172.added new file mode 100644 index 0000000000000..a30340a18dcf0 --- /dev/null +++ b/postgres/changelog.d/21172.added @@ -0,0 +1 @@ +Enable collect_settings by default for DBM enabled integrations diff --git a/postgres/datadog_checks/postgres/data/conf.yaml.example b/postgres/datadog_checks/postgres/data/conf.yaml.example index f601634f95732..5b10cc1923b2a 100644 --- a/postgres/datadog_checks/postgres/data/conf.yaml.example +++ b/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 diff --git a/postgres/datadog_checks/postgres/metadata.py b/postgres/datadog_checks/postgres/metadata.py index 27b35c9e3f209..441ea948d9363 100644 --- a/postgres/datadog_checks/postgres/metadata.py +++ b/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 diff --git a/sqlserver/assets/configuration/spec.yaml b/sqlserver/assets/configuration/spec.yaml index ba7bb269f6df1..3b29ada215c6c 100644 --- a/sqlserver/assets/configuration/spec.yaml +++ b/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 diff --git a/sqlserver/changelog.d/21172.added b/sqlserver/changelog.d/21172.added new file mode 100644 index 0000000000000..a30340a18dcf0 --- /dev/null +++ b/sqlserver/changelog.d/21172.added @@ -0,0 +1 @@ +Enable collect_settings by default for DBM enabled integrations diff --git a/sqlserver/datadog_checks/sqlserver/data/conf.yaml.example b/sqlserver/datadog_checks/sqlserver/data/conf.yaml.example index cb942c2ca7767..75be9b9b09ba9 100644 --- a/sqlserver/datadog_checks/sqlserver/data/conf.yaml.example +++ b/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 diff --git a/sqlserver/datadog_checks/sqlserver/metadata.py b/sqlserver/datadog_checks/sqlserver/metadata.py index 1f83bbd4b918a..3ce96c7821b8b 100644 --- a/sqlserver/datadog_checks/sqlserver/metadata.py +++ b/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", diff --git a/sqlserver/tests/test_stored_procedures.py b/sqlserver/tests/test_stored_procedures.py index 6fdcfa832462a..e1b395f33ead4 100644 --- a/sqlserver/tests/test_stored_procedures.py +++ b/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()