[mongo] Add tag clustername to mongo metrics (#17876)

* Add tag clustername to mongo metrics

* add changelog

Author: lu-zhengda

mongo/changelog.d/17876.added

@@ -0,0 +1 @@
+Add tag `clustername` to mongo metrics. This tag is set only when `cluster_name` is provided in the integration configuration.

mongo/datadog_checks/mongo/config.py

@@ -97,8 +97,6 @@ def __init__(self, instance, log):
         self.custom_queries = instance.get("custom_queries", [])
 
         self._base_tags = list(set(instance.get('tags', [])))
-        self.service_check_tags = self._compute_service_check_tags()
-        self.metric_tags = self._compute_metric_tags()
 
         # DBM config options
         self.dbm_enabled = is_affirmative(instance.get('dbm', False))
@@ -112,6 +110,10 @@ def __init__(self, instance, log):
         # MongoDB instance hostname override
         self.reported_database_hostname = instance.get('reported_database_hostname', None)
 
+        # Generate tags for service checks and metrics
+        self.service_check_tags = self._compute_service_check_tags()
+        self.metric_tags = self._compute_metric_tags()
+
     def _get_clean_server_name(self):
         try:
             if not self.server:
@@ -143,7 +145,10 @@ def _compute_service_check_tags(self):
         return service_check_tags
 
     def _compute_metric_tags(self):
-        return self._base_tags + ['server:%s' % self.clean_server_name]
+        tags = self._base_tags + ['server:%s' % self.clean_server_name]
+        if self.cluster_name:
+            tags.append('clustername:%s' % self.cluster_name)
+        return tags
 
     @property
     def operation_samples(self):

mongo/tests/results/opeartion-activities-mongos.json

@@ -7,6 +7,7 @@
         "collection_interval": 10,
         "ddtags": [
             "server:mongodb://testUser2:*****@localhost:27017/test",
+            "clustername:my_cluster",
             "sharding_cluster_role:mongos"
         ],
         "timestamp": 1715911398111.2722,

mongo/tests/results/opeartion-activities-standalone.json

@@ -5,7 +5,7 @@
         "ddsource": "mongodb",
         "dbm_type": "activity",
         "collection_interval": 10,
-        "ddtags": ["server:mongodb://testUser2:*****@localhost:27017/test"],
+        "ddtags": ["server:mongodb://testUser2:*****@localhost:27017/test", "clustername:my_cluster"],
         "timestamp": 1715911398111.2722,
         "mongodb_activity": [
             {

mongo/tests/results/operation-samples-mongos.json

@@ -4,7 +4,7 @@
         "dbm_type": "plan",
         "ddagentversion": "0.0.0",
         "ddsource": "mongodb",
-        "ddtags": "server:mongodb://testUser2:*****@localhost:27017/test,sharding_cluster_role:mongos",
+        "ddtags": "server:mongodb://testUser2:*****@localhost:27017/test,clustername:my_cluster,sharding_cluster_role:mongos",
         "timestamp": 1715911398111.2722,
         "network": {
             "client": {

mongo/tests/results/operation-samples-standalone.json

@@ -4,7 +4,7 @@
         "dbm_type": "plan",
         "ddagentversion": "0.0.0",
         "ddsource": "mongodb",
-        "ddtags": "server:mongodb://testUser2:*****@localhost:27017/test",
+        "ddtags": "server:mongodb://testUser2:*****@localhost:27017/test,clustername:my_cluster",
         "timestamp": 1715911398111.2722,
         "network": {
             "client": {

mongo/tests/test_dbm_operation_samples.py

@@ -68,15 +68,13 @@ def test_mongo_operation_samples_mongos(aggregator, instance_integration_cluster
         expected_samples = json.load(f)
         assert len(dbm_samples) == len(expected_samples)
         for i, sample in enumerate(dbm_samples):
-            print(json.dumps(sample))
             assert sample == expected_samples[i]
 
     # assert activities
     with open(os.path.join(HERE, "results", "opeartion-activities-mongos.json"), 'r') as f:
         expected_activities = json.load(f)
         assert len(dbm_activities) == len(expected_activities)
         for i, activity in enumerate(dbm_activities):
-            print(json.dumps(activity))
             assert activity == expected_activities[i]
 
 

mongo/tests/test_integration.py

@@ -100,7 +100,7 @@ def test_integration_mongos(instance_integration_cluster, aggregator, check, dd_
             'jumbo',
             'sessions',
         ],
-        ['sharding_cluster_role:mongos'],
+        ['sharding_cluster_role:mongos', 'clustername:my_cluster'],
     )
 
     aggregator.assert_all_metrics_covered()