Add traffic server url tag (#11862)

DataDog · Apr 20, 2022 · c0845a4 · c0845a4
1 parent 4590045
commit c0845a4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/traffic_server/assets/service_checks.json b/traffic_server/assets/service_checks.json
@@ -4,7 +4,8 @@
         "integration": "Traffic Server",
         "groups": [
             "host",
-            "instance"
+            "instance",
+            "traffic_server_url"
         ],
         "check": "traffic_server.can_connect",
         "statuses": [

diff --git a/traffic_server/datadog_checks/traffic_server/check.py b/traffic_server/datadog_checks/traffic_server/check.py
@@ -19,11 +19,12 @@ def __init__(self, name, init_config, instances):
         super(TrafficServerCheck, self).__init__(name, init_config, instances)
 
         self.traffic_server_url = self.instance.get("traffic_server_url")
-        self.tags = self.instance.get("tags", [])
-
         if self.traffic_server_url is None:
             raise ConfigurationError('Must specify a traffic_server_url')
 
+        self.tags = self.instance.get("tags", [])
+        self.tags.append("traffic_server_url:{}".format(self.traffic_server_url))
+
     def check(self, _):
         # type: (Any) -> None
         hostname_tag = []

diff --git a/traffic_server/tests/test_traffic_server.py b/traffic_server/tests/test_traffic_server.py
@@ -29,7 +29,7 @@ def test_check(aggregator, instance, dd_run_check):
         )
         for tag in traffic_server_tags:
             aggregator.assert_metric_has_tag(metric_name, tag)
-    aggregator.assert_service_check('traffic_server.can_connect', TrafficServerCheck.OK)
+    aggregator.assert_service_check('traffic_server.can_connect', TrafficServerCheck.OK, tags=traffic_server_tags)
     aggregator.assert_all_metrics_covered()
 
     aggregator.assert_metrics_using_metadata(get_metadata_metrics())
@@ -39,13 +39,14 @@ def test_check_cant_reach_url(aggregator, instance_bad_url, dd_run_check):
     # type: (AggregatorStub, Callable[[AgentCheck, bool], None], Dict[str, Any]) -> None
 
     check = TrafficServerCheck('traffic_server', {}, [instance_bad_url])
+    traffic_server_tags = instance_bad_url.get('tags')
 
     with pytest.raises(
         Exception, match='404 Client Error: Not Found on Accelerator for url: http://localhost:8080/_statss'
     ):
         dd_run_check(check)
 
-    aggregator.assert_service_check('traffic_server.can_connect', TrafficServerCheck.CRITICAL)
+    aggregator.assert_service_check('traffic_server.can_connect', TrafficServerCheck.CRITICAL, tags=traffic_server_tags)
     aggregator.assert_all_metrics_covered()