mirror of
https://github.com/munin-monitoring/contrib.git
synced 2025-07-22 02:51:03 +00:00
Update task's states to work with Celery 3.0
This commit is contained in:
parent
fd2a8b3bb1
commit
3ec624e844
2 changed files with 23 additions and 23 deletions
|
@ -64,11 +64,13 @@ URL_ENDPOINTS = {
|
||||||
'task_details': '/api/task/name/%s',
|
'task_details': '/api/task/name/%s',
|
||||||
}
|
}
|
||||||
TASK_STATES = (
|
TASK_STATES = (
|
||||||
'task-accepted',
|
'PENDING',
|
||||||
'task-received',
|
'RECEIVED',
|
||||||
'task-succeeded',
|
'STARTED',
|
||||||
'task-failed',
|
'SUCCESS',
|
||||||
'task-retried',
|
'FAILURE',
|
||||||
|
'REVOKED',
|
||||||
|
'RETRY'
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_data(what, api_url, *args):
|
def get_data(what, api_url, *args):
|
||||||
|
@ -90,7 +92,7 @@ def check_web_server_status(api_url):
|
||||||
sys.exit(-1)
|
sys.exit(-1)
|
||||||
|
|
||||||
def clean_state_name(state_name):
|
def clean_state_name(state_name):
|
||||||
return state_name.replace('task-', '')
|
return state_name.lower()
|
||||||
|
|
||||||
# Config
|
# Config
|
||||||
def print_config(workers = None):
|
def print_config(workers = None):
|
||||||
|
@ -115,18 +117,14 @@ def print_values(workers = None, api_url = None):
|
||||||
data = get_data('tasks', api_url)
|
data = get_data('tasks', api_url)
|
||||||
|
|
||||||
counters = dict([(key, 0) for key in TASK_STATES])
|
counters = dict([(key, 0) for key in TASK_STATES])
|
||||||
for task_name, task_data in data.iteritems():
|
for task_name, task_data in data:
|
||||||
for entry in task_data:
|
state = task_data['state']
|
||||||
if not entry.get('state', None):
|
hostname = task_data['worker']['hostname']
|
||||||
continue
|
|
||||||
|
if workers and hostname not in workers:
|
||||||
state = entry.get('state', None)
|
continue
|
||||||
hostname = entry.get('hostname', None)
|
|
||||||
|
counters[state] += 1
|
||||||
if workers and hostname not in workers:
|
|
||||||
continue
|
|
||||||
|
|
||||||
counters[state] += 1
|
|
||||||
|
|
||||||
for name in TASK_STATES:
|
for name in TASK_STATES:
|
||||||
name_cleaned = clean_state_name(name)
|
name_cleaned = clean_state_name(name)
|
||||||
|
|
|
@ -61,11 +61,13 @@ URL_ENDPOINTS = {
|
||||||
'task_details': '/api/task/name/%s',
|
'task_details': '/api/task/name/%s',
|
||||||
}
|
}
|
||||||
TASK_STATES = (
|
TASK_STATES = (
|
||||||
'task-accepted',
|
'PENDING',
|
||||||
'task-received',
|
'RECEIVED',
|
||||||
'task-succeeded',
|
'STARTED',
|
||||||
'task-failed',
|
'SUCCESS',
|
||||||
'task-retried',
|
'FAILURE',
|
||||||
|
'REVOKED',
|
||||||
|
'RETRY'
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_data(what, api_url, *args):
|
def get_data(what, api_url, *args):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue