Tweak the metrics to support computing uptime using avg_over_time

Change-Id: I086784a15d621ff8cf401c1d4621bd618fdfe733
diff --git a/edge-monitoring/test_edge_monitoring_server.py b/edge-monitoring/test_edge_monitoring_server.py
index fa2a417..ac4b8b9 100755
--- a/edge-monitoring/test_edge_monitoring_server.py
+++ b/edge-monitoring/test_edge_monitoring_server.py
@@ -139,8 +139,8 @@
         self.assertTrue('aetheredge_last_update{name="ace-menlo-pixel"}' in data)
         self.assertTrue('aetheredge_connect_test_ok{name="ace-menlo-pixel"} 1.0' in data)
         self.assertTrue('aetheredge_ping_test_ok{name="ace-menlo-pixel"} 1.0' in data)
-        self.assertTrue('aetheredge_connect_test_down{name="ace-menlo-pixel"} 0.0' in data)
-        self.assertTrue('aetheredge_ping_test_down{name="ace-menlo-pixel"} 0.0' in data)
+        self.assertTrue('aetheredge_e2e_tests_ok{name="ace-menlo-pixel"} 1.0' in data)
+        self.assertTrue('aetheredge_e2e_tests_down{name="ace-menlo-pixel"} 0.0' in data)
 
         response = self.app.delete('/edges/ace-menlo-pixel')
         data = json.loads(response.get_data(as_text=True))