X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fcli%2Fprometheus.py;h=9432408dfeba6f2a5262523d9ff632b6ecd07269;hb=f3bf0e72a2df0a10a62565279a71598f5d9c6e63;hp=26f18bfda1a9167a309965ffc83bd9fbe8e28e47;hpb=48db0512f82329aa9f46ba9e87efb8a1846ba966;p=osm%2Fvim-emu.git diff --git a/src/emuvim/cli/prometheus.py b/src/emuvim/cli/prometheus.py index 26f18bf..9432408 100755 --- a/src/emuvim/cli/prometheus.py +++ b/src/emuvim/cli/prometheus.py @@ -3,8 +3,9 @@ Prometheus API helper functions (c) 2016 by Steven Van Rossem """ -import urllib2 -import ast +#import urllib2 +import requests +#import ast # set this to localhost for now # this is correct for son-emu started outside of a container or as a container with net=host @@ -16,9 +17,11 @@ prometheus_REST_api = 'http://{0}:{1}'.format(prometheus_ip, prometheus_port) def query_Prometheus(query): url = prometheus_REST_api + '/' + 'api/v1/query?query=' + query # logging.info('query:{0}'.format(url)) - req = urllib2.Request(url) - ret = urllib2.urlopen(req).read() - ret = ast.literal_eval(ret) + #req = urllib2.Request(url) + req = requests.get(url) + #ret = urllib2.urlopen(req).read() + #ret = ast.literal_eval(ret) + ret = req.json() if ret['status'] == 'success': # logging.info('return:{0}'.format(ret)) try: