Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/supremm/datasource/prometheus/prominterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class PromClient():
""" Client class to interface with Prometheus """

def __init__(self, resconf):
self._url = "http://{}".format(resconf['prom_host'])
self._url = resconf['prom_url']

self._client = requests.Session()
self._client.mount(self._url, self._client.get_adapter(self._url))
Expand All @@ -36,7 +36,7 @@ def __str__(self):
def build_info(client, test_url):
""" Query server build info. Test connection to server. """

endpoint = "/api/v1/status/buildinfo"
endpoint = "api/v1/status/buildinfo"
url = urlparse.urljoin(test_url, endpoint)

r = client.get(url)
Expand All @@ -59,7 +59,7 @@ def query(self, query, time):
'time': time,
}

endpoint = "/api/v1/query"
endpoint = "api/v1/query"
url = urlparse.urljoin(self._url, endpoint)

r = self._client.get(url, params=params)
Expand All @@ -79,7 +79,7 @@ def query_range(self, query, start, end):
'step': '30s'
}

endpoint = "/api/v1/query_range"
endpoint = "api/v1/query_range"
url = urlparse.urljoin(self._url, endpoint)

r = self._client.get(url, params=params)
Expand All @@ -98,7 +98,7 @@ def ispresent(self, match, start, end):
'end': str(end)
}

endpoint = "/api/v1/series"
endpoint = "api/v1/series"
urlparse.urlencode(params, doseq=True)
url = urlparse.urljoin(self._url, endpoint)
logging.debug('Prometheus QUERY SERIES META, start=%s end=%s', start, end)
Expand All @@ -122,7 +122,7 @@ def label_val(self, match, label, start, end):
}

urlparse.urlencode(params, doseq=True)
url = urlparse.urljoin(self._url, "/api/v1/label/%s/values" % label)
url = urlparse.urljoin(self._url, "api/v1/label/%s/values" % label)
logging.debug('Prometheus QUERY LABEL VALUES, start=%s end=%s', start, end)

# Query data
Expand All @@ -147,7 +147,7 @@ def cgroup_info(self, uid, jobid, start, end):
}

urlparse.urlencode(params, doseq=True)
url = urlparse.urljoin(self._url, "/api/v1/label/cgroup/values")
url = urlparse.urljoin(self._url, "api/v1/label/cgroup/values")
logging.debug('Prometheus QUERY CGROUP, start=%s end=%s', start, end)

# Query data
Expand Down