Fix issue with retry logic querying prometheus

The issue is that the successful response from prometheus wasn't
triggering of the exit from the retry loop. Now on successful queries
the while retry loop will break into a successful exit strategy.

Change-Id: I528c1c17d2131256097cac5a67ec7ea17541c685
This commit is contained in:
Chris Straut (cs4987) 2021-08-26 10:38:31 -05:00
parent fcb1e9a2af
commit a21cb2a0af
2 changed files with 3 additions and 0 deletions

View File

@ -113,6 +113,7 @@ def query_exporter_metric(exporter_namespace, label_selector, metric_name):
for metric in line_item_metrics:
metric_with_labels, value = metric.split(" ")
metrics[metric_with_labels] = float(value)
break
except Exception as e:
if retry < max_retry:
print('Request timeout, Retrying - {}'.format(retry))

View File

@ -154,6 +154,7 @@ def query_prometheus(prometheus_api, alertname, labels_csv, timeout):
response = requests.get(include_schema(
prometheus_api) + "/api/v1/query", **kwargs)
response_json = response.json()
break
except requests.exceptions.Timeout:
if retry < max_retry:
print('Request timeout, Retrying - {}'.format(retry))
@ -214,6 +215,7 @@ def check_prom_metrics_available(prometheus_api, metrics, labels_csv, timeout):
metrics_available = False
else:
metrics_available = True
break
except requests.exceptions.Timeout:
if retry < max_retry:
retry += 1