[DBMON-5545] Update core tags with agent host name

mysql/changelog.d/20870.added

@@ -0,0 +1 @@
+Update core tags with agent host name

mysql/datadog_checks/mysql/mysql.py

@@ -242,6 +242,7 @@ def add_core_tags(self):
         """
         self.tag_manager.set_tag("database_hostname", self.database_hostname, replace=True)
         self.tag_manager.set_tag("database_instance", self.database_identifier, replace=True)
+        self.tag_manager.set_tag("ddagenthostname", self.agent_hostname, replace=True)
 
     def set_resource_tags(self):
         if self.cloud_metadata.get("gcp") is not None:

mysql/tests/tags.py

@@ -9,6 +9,7 @@ def database_instance_resource_tags(hostname):
         f'dd.internal.resource:database_instance:{hostname}',
         f'database_hostname:{hostname}',
         f'database_instance:{hostname}',
+        f'ddagenthostname:{hostname}',
     )
 
 
@@ -35,6 +36,7 @@ def database_instance_resource_tags(hostname):
     'dd.internal.resource:database_instance:stubbed.hostname',
     'database_hostname:stubbed.hostname',
     'database_instance:stubbed.hostname',
+    'ddagenthostname:stubbed.hostname',
 )
 SC_FAILURE_TAGS = (
     'port:unix_socket',

mysql/tests/test_metadata.py

@@ -662,6 +662,7 @@ def test_collect_schemas(aggregator, dd_run_check, dbm_instance):
         'database_instance:stubbed.hostname',
         'dbms_flavor:{}'.format(common.MYSQL_FLAVOR.lower()),
         'dd.internal.resource:database_instance:stubbed.hostname',
+        'ddagenthostname:stubbed.hostname',
         'port:13306',
         'tag1:value1',
         'tag2:value2',

mysql/tests/test_mysql.py

@@ -134,6 +134,7 @@ def test_e2e(dd_agent_check, dd_default_hostname, instance_complex, root_conn):
     expected_metric_tags = tags.METRIC_TAGS + (
         f'database_hostname:{dd_default_hostname}',
         f'database_instance:{dd_default_hostname}',
+        f'ddagenthostname:{"stubbed.hostname"}',
         'dbms_flavor:{}'.format(MYSQL_FLAVOR.lower()),
     )
     if MYSQL_FLAVOR in ('mysql', 'percona'):
@@ -457,6 +458,7 @@ def test_correct_hostname(dbm_enabled, reported_hostname, expected_hostname, agg
         'server:{}'.format(HOST),
         'port:{}'.format(PORT),
         'dd.internal.resource:database_instance:{}'.format(expected_hostname),
+        'ddagenthostname:{}'.format('stubbed.hostname'),
     )
     aggregator.assert_service_check(
         'mysql.can_connect', status=MySql.OK, tags=expected_tags, count=1, hostname=expected_hostname
@@ -828,6 +830,7 @@ def test_database_instance_metadata(aggregator, dd_run_check, instance_complex,
         "database_instance:{}".format(expected_database_instance),
         'dd.internal.resource:database_instance:{}'.format(expected_database_instance),
         "dbms_flavor:{}".format(MYSQL_FLAVOR.lower()),
+        'ddagenthostname:{}'.format('stubbed.hostname'),
     )
 
     mysql_check = MySql(common.CHECK_NAME, {}, [instance_complex])
@@ -897,6 +900,7 @@ def test_propagate_agent_tags(
         + (
             'database_hostname:stubbed.hostname',
             'database_instance:forced_hostname',
+            'ddagenthostname:stubbed.hostname',
             'server:{}'.format(HOST),
             'port:{}'.format(PORT),
             'dd.internal.resource:database_instance:forced_hostname',

mysql/tests/test_query_activity.py

@@ -121,6 +121,7 @@ def _run_blocking(conn):
     expected_tags = (
         'database_hostname:stubbed.hostname',
         'database_instance:stubbed.hostname',
+        'ddagenthostname:stubbed.hostname',
         'tag1:value1',
         'tag2:value2',
         'port:13306',
@@ -550,6 +551,7 @@ def _expected_dbm_job_err_tags(dbm_instance, check):
     _tags = dbm_instance['tags'] + (
         'database_hostname:stubbed.hostname',
         'database_instance:stubbed.hostname',
+        'ddagenthostname:stubbed.hostname',
         'job:query-activity',
         'port:{}'.format(PORT),
         'dd.internal.resource:database_instance:stubbed.hostname',

mysql/tests/test_statements.py

@@ -879,6 +879,7 @@ def _expected_dbm_instance_tags(dbm_instance, check):
     _tags = dbm_instance.get('tags', ()) + (
         'database_hostname:{}'.format('stubbed.hostname'),
         'database_instance:{}'.format('stubbed.hostname'),
+        'ddagenthostname:{}'.format('stubbed.hostname'),
         'server:{}'.format(common.HOST),
         'port:{}'.format(common.PORT),
         'dbms_flavor:{}'.format(MYSQL_FLAVOR.lower()),
@@ -896,6 +897,7 @@ def _expected_dbm_job_err_tags(dbm_instance, check):
     _tags = dbm_instance['tags'] + (
         'database_hostname:{}'.format('stubbed.hostname'),
         'database_instance:{}'.format('stubbed.hostname'),
+        'ddagenthostname:{}'.format('stubbed.hostname'),
         'port:{}'.format(common.PORT),
         'server:{}'.format(common.HOST),
         'dd.internal.resource:database_instance:stubbed.hostname',

mysql/tests/test_unit.py

@@ -309,6 +309,7 @@ def cursor(self):
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
                 'dd.internal.resource:database_instance:stubbed.hostname',
+                'ddagenthostname:stubbed.hostname',
             },
         ),
         (
@@ -320,6 +321,7 @@ def cursor(self):
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
                 'dd.internal.resource:database_instance:stubbed.hostname',
+                'ddagenthostname:stubbed.hostname',
             },
         ),
         (
@@ -330,6 +332,7 @@ def cursor(self):
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
                 'dd.internal.resource:database_instance:stubbed.hostname',
+                'ddagenthostname:stubbed.hostname',
             },
         ),
         (
@@ -341,6 +344,7 @@ def cursor(self):
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
                 'dd.internal.resource:database_instance:stubbed.hostname',
+                'ddagenthostname:stubbed.hostname',
             },
         ),
     ],

postgres/changelog.d/20870.added

@@ -0,0 +1 @@
+Update tags with agent host name. Added agent_hostname to the core tags to be able to inject it to all surfaces of the UI

postgres/datadog_checks/postgres/postgres.py

@@ -185,6 +185,7 @@ def add_core_tags(self):
         """
         self.tags.append("database_hostname:{}".format(self.database_hostname))
         self.tags.append("database_instance:{}".format(self.database_identifier))
+        self.tags.append("ddagenthostname:{}".format(self.agent_hostname))
 
     def set_resource_tags(self):
         if self.cloud_metadata.get("gcp") is not None:

postgres/tests/common.py

@@ -160,6 +160,7 @@ def _get_expected_tags(
         pg_instance['tags']
         + [f'port:{pg_instance["port"]}']
         + [f'database_hostname:{check.database_hostname}', f'database_instance:{check.database_identifier}']
+        + [f'ddagenthostname:{check.agent_hostname}']
     )
     if role:
         base_tags.append(f'replication_role:{role}')

postgres/tests/test_pg_integration.py

@@ -772,6 +772,7 @@ def test_database_instance_metadata(aggregator, pg_instance, dbm_enabled, report
         'replication_role:master',
         'database_hostname:{}'.format(expected_database_hostname),
         'database_instance:{}'.format(expected_database_instance),
+        'ddagenthostname:{}'.format('stubbed.hostname'),
     ]
     check = PostgreSql('test_instance', {}, [pg_instance])
     run_one_check(check)

postgres/tests/test_unit.py

@@ -142,6 +142,7 @@ def test_query_timeout_connection_string(aggregator, integration_check, pg_insta
                 'port:5432',
                 'foo:bar',
                 'dd.internal.resource:database_instance:stubbed.hostname',
+                'ddagenthostname:stubbed.hostname',
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
             },
@@ -154,6 +155,7 @@ def test_query_timeout_connection_string(aggregator, integration_check, pg_insta
                 'port:5432',
                 'server:localhost',
                 'dd.internal.resource:database_instance:stubbed.hostname',
+                'ddagenthostname:stubbed.hostname',
                 'database_hostname:stubbed.hostname',
                 'database_instance:stubbed.hostname',
             },

sqlserver/changelog.d/20870.added

@@ -0,0 +1 @@
+Update core tags with agent host name

sqlserver/datadog_checks/sqlserver/sqlserver.py

@@ -235,6 +235,7 @@ def add_core_tags(self):
         """
         self.tag_manager.set_tag("database_hostname", self.database_hostname, replace=True)
         self.tag_manager.set_tag("database_instance", self.database_identifier, replace=True)
+        self.tag_manager.set_tag("ddagenthostname", self.agent_hostname, replace=True)
 
     def set_resource_tags(self):
         if self.cloud_metadata.get("gcp") is not None:

sqlserver/tests/test_statements.py

@@ -912,6 +912,7 @@ def _expected_dbm_instance_tags(check):
         "database_hostname:{}".format("stubbed.hostname"),
         "database_instance:{}".format("stubbed.hostname"),
         "dd.internal.resource:database_instance:{}".format("stubbed.hostname"),
+        "ddagenthostname:{}".format("stubbed.hostname"),
         "sqlserver_servername:{}".format(check.static_info_cache.get(STATIC_INFO_SERVERNAME)),
     ]
 

sqlserver/tests/test_stored_procedures.py

@@ -44,6 +44,7 @@ def _expected_dbm_instance_tags(check):
         "database_hostname:{}".format("stubbed.hostname"),
         "database_instance:{}".format("stubbed.hostname"),
         "dd.internal.resource:database_instance:{}".format("stubbed.hostname"),
+        "ddagenthostname:{}".format("stubbed.hostname"),
         "sqlserver_servername:{}".format(check.static_info_cache.get(STATIC_INFO_SERVERNAME)),
     ]