From 87623ac676dc1115b721d89289ccbc905ffa1097 Mon Sep 17 00:00:00 2001 From: graemej Date: Wed, 30 Apr 2014 13:31:50 -0400 Subject: [PATCH] add instance tags --- checks.d/marathon.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/checks.d/marathon.py b/checks.d/marathon.py index b7b531f054..340e5aa4e1 100644 --- a/checks.d/marathon.py +++ b/checks.d/marathon.py @@ -14,14 +14,15 @@ def check(self, instance): # Load values from the instance config url = instance['url'] + instance_tags = instance.get('tags', []) default_timeout = self.init_config.get('default_timeout', 5) timeout = float(instance.get('timeout', default_timeout)) response = self.get_v2_apps(url, timeout) if response is not None: - self.gauge('marathon.apps', len(response['apps']), tags=['marathon']) + self.gauge('marathon.apps', len(response['apps']), tags=instance_tags) for app in response['apps']: - tags = ['marathon', 'app_id:' + app['id'], 'version:' + app['version']] + tags = ['app_id:' + app['id'], 'version:' + app['version']] + instance_tags for attr in ['taskRateLimit','instances','cpus','mem','tasksStaged','tasksRunning']: self.gauge('marathon.' + attr, app[attr], tags=tags) versions_reply = self.get_v2_app_versions(url, app['id'], timeout)