AETHER-1539 Add new SD-CORE metrics, pull in beta changes

Change-Id: I7f96abcad6ad2d8291e56e6425caf077e0373472
diff --git a/monitoring/grafana-aether/dashboards/global-edge-status-staging-new-metrics.json b/monitoring/grafana-aether/dashboards/global-edge-status-staging-new-metrics.json
index de1e7ca..ac87faf 100644
--- a/monitoring/grafana-aether/dashboards/global-edge-status-staging-new-metrics.json
+++ b/monitoring/grafana-aether/dashboards/global-edge-status-staging-new-metrics.json
@@ -15,7 +15,6 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 27,
   "links": [],
   "panels": [
     {
@@ -252,7 +251,8 @@
           "refId": "C"
         },
         {
-          "expr": "avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"ace-menlo\"}[$__interval]) * 100\n",
+          "expr": "sum(sum_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"ace-menlo\"}[$__interval])) / sum(count_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"ace-menlo\"}[$__interval])) * 100\n",
+          "instant": false,
           "interval": "",
           "legendFormat": "",
           "refId": "D"
@@ -1163,5 +1163,5 @@
   "timezone": "",
   "title": "Aether Connected Edge (new metrics)",
   "uid": "hV2VTo8Mk",
-  "version": 5
-}
\ No newline at end of file
+  "version": 6
+}