diff options
author | Stephen Wong <stephen.kf.wong@gmail.com> | 2018-11-01 17:13:16 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-11-01 17:13:16 +0000 |
commit | d9de52c04ccceb677a1d8a2393f48e329e1ab1a1 (patch) | |
tree | ab9addd2bc6da38c181de7cf321a73f030d3301b /clover/controller/control/api/collector.py | |
parent | 523fad972276b3b31ff848d48ddaece13b860ccc (diff) | |
parent | 4c2ab18a3d928c6b15502728b7c871c833922200 (diff) |
Merge "Initial UI dashboard added for visibility" into stable/gambia
Diffstat (limited to 'clover/controller/control/api/collector.py')
-rw-r--r-- | clover/controller/control/api/collector.py | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/clover/controller/control/api/collector.py b/clover/controller/control/api/collector.py index 3abcba7..2d0c32c 100644 --- a/clover/controller/control/api/collector.py +++ b/clover/controller/control/api/collector.py @@ -108,26 +108,31 @@ def set_collector(): try: p = request.json r = redis.StrictRedis(host=HOST_IP, port=6379, db=0) - del_keys = ['visibility_services', 'metric_prefixes', - 'metric_suffixes', 'custom_metrics'] - for dk in del_keys: - r.delete(dk) try: - for service in p['services']: - r.sadd('visibility_services', service['name']) + if p['services']: + r.delete('visibility_services') + for service in p['services']: + r.sadd('visibility_services', service['name'].replace('-', '_')) except (KeyError, ValueError) as e: logging.debug(e) return Response( "Specify at least one service to track", status=400) - if p['metric_prefixes'] and p['metric_suffixes']: - for prefix in p['metric_prefixes']: - r.sadd('metric_prefixes', prefix['prefix']) - for suffix in p['metric_suffixes']: - r.sadd('metric_suffixes', suffix['suffix']) - if p['custom_metrics']: - for metric in p['custom_metrics']: - r.sadd('custom_metrics', metric['metric']) + try: + if p['metric_prefixes'] and p['metric_suffixes']: + del_keys = ['metric_prefixes', 'metric_suffixes'] + for dk in del_keys: + r.delete(dk) + for prefix in p['metric_prefixes']: + r.sadd('metric_prefixes', prefix['prefix']) + for suffix in p['metric_suffixes']: + r.sadd('metric_suffixes', suffix['suffix']) + if p['custom_metrics']: + r.delete('custom_metrics') + for metric in p['custom_metrics']: + r.sadd('custom_metrics', metric['metric']) + except Exception as e: + logging.debug(e) except Exception as e: logging.debug(e) |