From 652477d7db9d4c5494eda7a749ce715b81998ed6 Mon Sep 17 00:00:00 2001 From: Danny Park Date: Tue, 4 Jun 2024 16:05:00 -0400 Subject: [PATCH 1/4] [dbm] shorten TTL to verify --- sqlserver/datadog_checks/sqlserver/sqlserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sqlserver/datadog_checks/sqlserver/sqlserver.py b/sqlserver/datadog_checks/sqlserver/sqlserver.py index e4fa184009723..6479861fe884c 100644 --- a/sqlserver/datadog_checks/sqlserver/sqlserver.py +++ b/sqlserver/datadog_checks/sqlserver/sqlserver.py @@ -135,7 +135,7 @@ def __init__(self, name, init_config, instances): self.static_info_cache = TTLCache( maxsize=100, # cache these for a full day - ttl=60 * 60 * 24, + ttl=60 * 5, ) # _database_instance_emitted: limit the collection and transmission of the database instance metadata self._database_instance_emitted = TTLCache( @@ -747,14 +747,13 @@ def check(self, _): [QUERY_SERVER_STATIC_INFO], executor=self.execute_query_raw ) self.server_state_queries.compile_queries() - - self._send_database_instance_metadata() if self._config.proc: self.do_stored_procedure_check() else: self.collect_metrics() if self._config.autodiscovery and self._config.autodiscovery_db_service_check: self._check_database_conns() + self._send_database_instance_metadata() if self._config.dbm_enabled: self.statement_metrics.run_job_loop(self.tags) self.procedure_metrics.run_job_loop(self.tags) From 4f5a07a3ca0f6beaf99cfe43d39810699b87f386 Mon Sep 17 00:00:00 2001 From: Danny Park Date: Wed, 5 Jun 2024 12:11:02 -0400 Subject: [PATCH 2/4] [dbm] run on each check --- sqlserver/datadog_checks/sqlserver/sqlserver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sqlserver/datadog_checks/sqlserver/sqlserver.py b/sqlserver/datadog_checks/sqlserver/sqlserver.py index 6479861fe884c..3baa1aa4ed80f 100644 --- a/sqlserver/datadog_checks/sqlserver/sqlserver.py +++ b/sqlserver/datadog_checks/sqlserver/sqlserver.py @@ -135,7 +135,7 @@ def __init__(self, name, init_config, instances): self.static_info_cache = TTLCache( maxsize=100, # cache these for a full day - ttl=60 * 5, + ttl=60 * 60 * 24, ) # _database_instance_emitted: limit the collection and transmission of the database instance metadata self._database_instance_emitted = TTLCache( @@ -234,7 +234,6 @@ def set_resource_tags(self): ) def set_resolved_hostname(self): - # load static information cache self.load_static_information() if self._resolved_hostname is None: if self._config.reported_hostname: @@ -735,6 +734,7 @@ def _check_database_conns(self): def check(self, _): if self.do_check: + self.load_static_information() # configure custom queries for the check if self._query_manager is None: # use QueryManager to process custom queries From 3cd85c0db38cc339bc5746ea973bb3ac35c7cfec Mon Sep 17 00:00:00 2001 From: Danny Park Date: Wed, 5 Jun 2024 16:04:18 -0400 Subject: [PATCH 3/4] add sqlserver change log --- sqlserver/changelog.d/17750.fixed | 1 + 1 file changed, 1 insertion(+) create mode 100644 sqlserver/changelog.d/17750.fixed diff --git a/sqlserver/changelog.d/17750.fixed b/sqlserver/changelog.d/17750.fixed new file mode 100644 index 0000000000000..f186800a75316 --- /dev/null +++ b/sqlserver/changelog.d/17750.fixed @@ -0,0 +1 @@ +[sqlserver] fix missing sqlserver_version From 2265af9df3079cf919d17611fe6cdccd5cf046d7 Mon Sep 17 00:00:00 2001 From: Danny Park Date: Wed, 5 Jun 2024 16:05:50 -0400 Subject: [PATCH 4/4] reset placement --- sqlserver/datadog_checks/sqlserver/sqlserver.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sqlserver/datadog_checks/sqlserver/sqlserver.py b/sqlserver/datadog_checks/sqlserver/sqlserver.py index 3baa1aa4ed80f..3a661d8147d71 100644 --- a/sqlserver/datadog_checks/sqlserver/sqlserver.py +++ b/sqlserver/datadog_checks/sqlserver/sqlserver.py @@ -747,13 +747,14 @@ def check(self, _): [QUERY_SERVER_STATIC_INFO], executor=self.execute_query_raw ) self.server_state_queries.compile_queries() + + self._send_database_instance_metadata() if self._config.proc: self.do_stored_procedure_check() else: self.collect_metrics() if self._config.autodiscovery and self._config.autodiscovery_db_service_check: self._check_database_conns() - self._send_database_instance_metadata() if self._config.dbm_enabled: self.statement_metrics.run_job_loop(self.tags) self.procedure_metrics.run_job_loop(self.tags)