Added support to new format
This commit is contained in:
parent
e33177a07c
commit
0c791452bf
40
reporter.py
40
reporter.py
@ -1,52 +1,68 @@
|
|||||||
import os
|
import os
|
||||||
import time
|
import time
|
||||||
import requests
|
import requests
|
||||||
from urllib.parse import urljoin
|
|
||||||
from apscheduler.schedulers.blocking import BlockingScheduler
|
from apscheduler.schedulers.blocking import BlockingScheduler
|
||||||
|
from typing import List, Tuple
|
||||||
|
|
||||||
|
|
||||||
def run_report_task(hostname: str, test_urls: list, report_urls:list):
|
def run_report_task(hostname: str, test_urls: list, report_urls: list):
|
||||||
for test_url in test_urls:
|
for testpoint_name, testpoint_url in test_urls:
|
||||||
|
|
||||||
start_time = time.time()
|
start_time = time.time()
|
||||||
try:
|
try:
|
||||||
r = requests.get(test_url, timeout=10)
|
r = requests.get(testpoint_url, timeout=10)
|
||||||
except requests.exceptions.Timeout:
|
except requests.exceptions.Timeout:
|
||||||
print(test_url, "Timed out")
|
print(testpoint_name, testpoint_url, "Timed out")
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
latency_s = time.time() - start_time
|
latency_s = time.time() - start_time
|
||||||
|
|
||||||
if r.status_code != 204:
|
if r.status_code != 204:
|
||||||
print(test_url, "Wrong response")
|
print(testpoint_name, testpoint_url, "Wrong response:", r.status_code)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
report = {
|
report = {
|
||||||
"client": hostname,
|
"client": hostname,
|
||||||
"cloud": test_url,
|
"site": testpoint_name,
|
||||||
"measurements": {
|
"measurements": {
|
||||||
"latency": latency_s * 1000
|
"latency": latency_s * 1000
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for report_url in report_urls:
|
for report_name, report_url in report_urls:
|
||||||
r = requests.post(report_url, json=report)
|
r = requests.post(report_url, json=report)
|
||||||
|
|
||||||
if r.status_code != 201:
|
if r.status_code != 201:
|
||||||
print(report_url, "Wrong response")
|
print(report_name, report_url, "Wrong response:", r.status_code)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
||||||
|
def parse_url_list(url_list: str) -> List[Tuple[str, str]]:
|
||||||
|
parsed_urls = []
|
||||||
|
for pair in url_list.split(' '):
|
||||||
|
parsed_urls.append(
|
||||||
|
tuple(pair.split(';', 1))
|
||||||
|
)
|
||||||
|
return parsed_urls
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
test_urls = os.environ.get("TEST_URLS", "").split(';')
|
test_urls = parse_url_list(os.environ.get("TEST_URLS", ""))
|
||||||
report_urls = os.environ.get("REPORT_URLS", "").split(';')
|
report_urls = parse_url_list(os.environ.get("REPORT_URLS", ""))
|
||||||
frequency = float(os.environ.get("FREQUENCY", 15))
|
frequency = float(os.environ.get("FREQUENCY", 15))
|
||||||
|
hostname = os.environ['HOSTNAME']
|
||||||
|
|
||||||
if (not test_urls) or (not report_urls):
|
if (not test_urls) or (not report_urls):
|
||||||
print("No urls defined")
|
print("No urls defined")
|
||||||
return
|
return
|
||||||
|
|
||||||
hostname = os.environ['HOSTNAME']
|
print("Testing the following endpoints:")
|
||||||
|
for testpoint_name, testpoint_url in test_urls:
|
||||||
|
print(testpoint_name, testpoint_url)
|
||||||
|
|
||||||
|
print("Reporting to the following endpoints:")
|
||||||
|
for report_name, report_url in report_urls:
|
||||||
|
print(report_name, report_url)
|
||||||
|
|
||||||
scheduler = BlockingScheduler()
|
scheduler = BlockingScheduler()
|
||||||
scheduler.add_job(lambda: run_report_task(hostname, test_urls, report_urls), trigger='interval', seconds=frequency)
|
scheduler.add_job(lambda: run_report_task(hostname, test_urls, report_urls), trigger='interval', seconds=frequency)
|
||||||
|
Loading…
Reference in New Issue
Block a user