diff --git a/checks.d/couchbase.py b/checks.d/couchbase.py index 7270e3258b..1b0031ff72 100644 --- a/checks.d/couchbase.py +++ b/checks.d/couchbase.py @@ -172,7 +172,12 @@ def get_data(self, server, instance): url = '%s%s' % (server, COUCHBASE_STATS_PATH) # Fetch initial stats and capture a service check based on response. - service_check_tags = ['instance:%s' % server] + service_check_tags = instance.get('tags', []) + if service_check_tags is None: + service_check_tags = [] + else: + service_check_tags = list(set(service_check_tags)) + service_check_tags.append('instance:%s' % server) try: overall_stats = self._get_stats(url, instance) # No overall stats? bail out now