Add missing custom tags to the can_connect service check (#17194)

DataDog · Mar 15, 2024 · 60818e2 · 60818e2
1 parent 54f36f5
commit 60818e2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/harbor/changelog.d/17194.fixed b/harbor/changelog.d/17194.fixed
@@ -0,0 +1 @@
+Add missing custom tags to the `can_connect` service check
diff --git a/harbor/datadog_checks/harbor/harbor.py b/harbor/datadog_checks/harbor/harbor.py
@@ -99,7 +99,7 @@ def check(self, instance):
             self._submit_read_only_status(api, tags)
         except Exception:
             self.log.exception("An error occurred when collecting Harbor metrics")
-            self.service_check(CAN_CONNECT, AgentCheck.CRITICAL)
+            self.service_check(CAN_CONNECT, AgentCheck.CRITICAL, tags)
             raise
         else:
-            self.service_check(CAN_CONNECT, AgentCheck.OK)
+            self.service_check(CAN_CONNECT, AgentCheck.OK, tags)
diff --git a/harbor/tests/common.py b/harbor/tests/common.py
@@ -23,8 +23,8 @@
 
 HERE = os.path.dirname(os.path.abspath(__file__))
 URL = 'http://{}'.format(get_docker_hostname())
-INSTANCE = {'url': URL, 'username': 'NotAnAdmin', 'password': 'Str0ngPassw0rd'}
-ADMIN_INSTANCE = {'url': URL, 'username': 'admin', 'password': 'Harbor12345'}
+INSTANCE = {'url': URL, 'username': 'NotAnAdmin', 'password': 'Str0ngPassw0rd', 'tags': ['environment:test']}
+ADMIN_INSTANCE = {'url': URL, 'username': 'admin', 'password': 'Harbor12345', 'tags': ['environment:test']}
 
 HEALTH_FIXTURE = {
     "status": "healthy",

diff --git a/harbor/tests/test_harbor.py b/harbor/tests/test_harbor.py
@@ -52,6 +52,8 @@ def assert_basic_case(aggregator):
 
 
 def assert_service_checks(aggregator):
-    aggregator.assert_service_check('harbor.can_connect', status=HarborCheck.OK)
+    aggregator.assert_service_check('harbor.can_connect', status=HarborCheck.OK, tags=['environment:test'])
     for c in HARBOR_COMPONENTS:
-        aggregator.assert_service_check('harbor.status', status=mock.ANY, tags=['component:{}'.format(c)])
+        aggregator.assert_service_check(
+            'harbor.status', status=mock.ANY, tags=['component:{}'.format(c), 'environment:test']
+        )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add missing custom tags to the `can_connect` service check