Support multiple IPs for agent to ping, use 0s instead of nulls for speedtest
Change-Id: I68290906d808f652b324bccc44f6935ea662b7e2
diff --git a/edge-monitoring/edge_monitoring_server.py b/edge-monitoring/edge_monitoring_server.py
index f7ec3db..20ddc94 100755
--- a/edge-monitoring/edge_monitoring_server.py
+++ b/edge-monitoring/edge_monitoring_server.py
@@ -44,10 +44,10 @@
'speedtest': {
'ping': {
'dns': {
- 'min': None,
- 'avg': None,
- 'max': None,
- 'stddev': None
+ 'min': 0.0,
+ 'avg': 0.0,
+ 'max': 0.0,
+ 'stddev': 0.0
}
}
},
@@ -141,10 +141,10 @@
if time_elapsed > NO_RESULT_THRESHOLD:
edge['status']['control_plane'] = "no result"
edge['status']['user_plane'] = "no result"
- edge['speedtest']['ping']['dns'] = {'min': None,
- 'avg': None,
- 'max': None,
- 'stddev': None}
+ edge['speedtest']['ping']['dns'] = {'min': 0.0,
+ 'avg': 0.0,
+ 'max': 0.0,
+ 'stddev': 0.0}
def remove_edge_from_metrics(name):
try:
@@ -178,14 +178,14 @@
connect_status = edge['status']['control_plane']
ping_status = edge['status']['user_plane']
- valid_speedtest_results = True
+ speedtest_results_exist = True
if edge['speedtest']['ping']['dns']['avg']:
ping_dns_min_result = edge['speedtest']['ping']['dns']['min']
ping_dns_avg_result = edge['speedtest']['ping']['dns']['avg']
ping_dns_max_result = edge['speedtest']['ping']['dns']['max']
ping_dns_stddev_result = edge['speedtest']['ping']['dns']['stddev']
else:
- valid_speedtest_results = False
+ speedtest_results_exist = False
cp_status.labels(edge['name']).set(status_codes[connect_status])
up_status.labels(edge['name']).set(status_codes[ping_status])
@@ -209,7 +209,7 @@
if connect_status == "connected" and ping_status == "connected":
e2e_tests_ok.labels(edge['name']).set(1)
- if valid_speedtest_results:
+ if speedtest_results_exist:
ping_dns_min.labels(edge['name']).set(ping_dns_min_result)
ping_dns_avg.labels(edge['name']).set(ping_dns_avg_result)
ping_dns_max.labels(edge['name']).set(ping_dns_max_result)
@@ -271,10 +271,10 @@
'speedtest': {
'ping': {
'dns': {
- 'min': None,
- 'avg': None,
- 'max': None,
- 'stddev': None
+ 'min': 0.0,
+ 'avg': 0.0,
+ 'max': 0.0,
+ 'stddev': 0.0
}
}
},