From 85cbf2bae3e3c2299c9182d4b5f700378945731c Mon Sep 17 00:00:00 2001 From: Alex Normand Date: Mon, 20 Dec 2021 20:38:48 -0800 Subject: [PATCH] Add mysql_version to dbm query metrics payloads --- mysql/datadog_checks/mysql/statements.py | 2 ++ mysql/tests/test_statements.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mysql/datadog_checks/mysql/statements.py b/mysql/datadog_checks/mysql/statements.py index 041a57928b074..b868b5371c348 100644 --- a/mysql/datadog_checks/mysql/statements.py +++ b/mysql/datadog_checks/mysql/statements.py @@ -123,6 +123,8 @@ def collect_per_statement_metrics(self): payload = { 'host': self._check.resolved_hostname, 'timestamp': time.time() * 1000, + 'mysql_version': self._check.version.version + '+' + self._check.version.build, + 'mysql_flavor': self._check.version.flavor, 'ddagentversion': datadog_agent.get_version(), 'min_collection_interval': self._metric_collection_interval, 'tags': self._tags, diff --git a/mysql/tests/test_statements.py b/mysql/tests/test_statements.py index eb5a7e9c1c479..d0d56236f3ae9 100644 --- a/mysql/tests/test_statements.py +++ b/mysql/tests/test_statements.py @@ -131,6 +131,8 @@ def run_query(q): assert event['host'] == 'stubbed.hostname' assert event['ddagentversion'] == datadog_agent.get_version() + assert event['mysql_version'] == mysql_check.version.version + '+' + mysql_check.version.build + assert event['mysql_flavor'] == mysql_check.version.flavor assert event['timestamp'] > 0 assert event['min_collection_interval'] == dbm_instance['query_metrics']['collection_interval'] expected_tags = set(tags.METRIC_TAGS + ['server:{}'.format(common.HOST), 'port:{}'.format(common.PORT)])