Marathon and Mesos svc #1205
Marathon and Mesos svc #1205
Conversation
| @@ -11,7 +11,17 @@ | |||
| import simplejson as json | |||
| import requests | |||
|
|
|||
| def get_request_json(req): | |||
| # Condition for request v1.x backward compatibility | |||
There was a problem hiding this comment.
With Agent 5.x we bundle only one version of requests so we probably don't need to care about it.
|
One question: can the Marathon API return the list of applications without running instances? |
| @@ -28,7 +38,8 @@ def check(self, instance): | |||
| for app in response['apps']: | |||
| 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) | |||
| if hasattr(app, attr): | |||
| self.gauge('marathon.' + attr, app[attr], tags=tags) | |||
There was a problem hiding this comment.
Can we log something in debug if the attribute is not present ? (See comments in that PR: #1228 )
| if hasattr(app, attr): | ||
| self.gauge('marathon.' + attr, app[attr], tags=tags) | ||
| else: | ||
| self.warning('Marathon application (id: %s) has no attribute %s' % (app['id'], attr)) |
There was a problem hiding this comment.
that should be self.log.debug as it can be expected in some cases depending on the version of marathon.
|
@amankapur Can you fix the latest comments, and rebase your branch as it can't be merged currently ? |
Conflicts: checks.d/marathon.py
| @@ -10,6 +10,9 @@ | |||
| import requests | |||
|
|
|||
| class Marathon(AgentCheck): | |||
|
|
|||
| check_name = "marathon.can_connect" | |||
There was a problem hiding this comment.
This should probably be upper case (https://www.python.org/dev/peps/pep-0008/#constants)
I'll fix it.
For Mesos, simply check master REST url end point, /master/state.json
For Marathon, check on marathon REST endpoint /v2/apps, return status based on app count.