diff --git a/monitoring/grafana-aether/Chart.yaml b/monitoring/grafana-aether/Chart.yaml
index 2dde1f1..d34f620 100644
--- a/monitoring/grafana-aether/Chart.yaml
+++ b/monitoring/grafana-aether/Chart.yaml
@@ -5,6 +5,6 @@
 name: grafana-aether
 description: A Helm chart for deploying Grafana with Aether dashboards
 
-version: 0.5.17
+version: 0.5.18
 
 appVersion: 0.1.0
diff --git a/monitoring/grafana-aether/dashboards/edge-e2e-tests.json b/monitoring/grafana-aether/dashboards/edge-e2e-tests.json
index e5b41db..9412fc4 100644
--- a/monitoring/grafana-aether/dashboards/edge-e2e-tests.json
+++ b/monitoring/grafana-aether/dashboards/edge-e2e-tests.json
@@ -15,11 +15,11 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 26,
-  "iteration": 1616543018514,
+  "iteration": 1616774867835,
   "links": [],
   "panels": [
     {
+      "collapsed": true,
       "datasource": null,
       "gridPos": {
         "h": 1,
@@ -28,7 +28,415 @@
         "y": 0
       },
       "id": 300,
-      "panels": [],
+      "panels": [
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 1,
+                  "operator": "",
+                  "text": "X",
+                  "to": "",
+                  "type": 1,
+                  "value": "-1"
+                },
+                {
+                  "from": "",
+                  "id": 2,
+                  "operator": "",
+                  "text": "fail",
+                  "to": "",
+                  "type": 1,
+                  "value": "0"
+                },
+                {
+                  "from": "",
+                  "id": 3,
+                  "operator": "",
+                  "text": "ok",
+                  "to": "",
+                  "type": 1,
+                  "value": "1"
+                },
+                {
+                  "from": "-100",
+                  "id": 4,
+                  "text": "maint",
+                  "to": "-6",
+                  "type": 2
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#6ED0E0",
+                    "value": -100
+                  },
+                  {
+                    "color": "red",
+                    "value": 0
+                  },
+                  {
+                    "color": "green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 0,
+            "y": 1
+          },
+          "id": 259,
+          "links": [],
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "last"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-cornell1-prd",
+              "value": "ace-cornell1-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Connect:",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Ping:",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Test results",
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 50
+                  },
+                  {
+                    "color": "green",
+                    "value": 95
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 3,
+            "y": 1
+          },
+          "id": 260,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-cornell1-prd",
+              "value": "ace-cornell1-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "avg(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "C"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Uptime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 1
+                  },
+                  {
+                    "color": "red",
+                    "value": 10
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 6,
+            "y": 1
+          },
+          "id": 262,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-cornell1-prd",
+              "value": "ace-cornell1-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
+              "interval": "",
+              "legendFormat": "Unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
+              "interval": "",
+              "legendFormat": "Scheduled",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Downtime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "aliasColors": {
+            "Down, unsched": "red",
+            "Down: unscheduled": "red",
+            "Scheduled": "blue",
+            "Scheduled downtime": "blue",
+            "Test down": "yellow",
+            "Unscheduled": "red",
+            "Unscheduled downtime": "red"
+          },
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "Uptime and downtime over time",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 10,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 3,
+            "w": 15,
+            "x": 9,
+            "y": 1
+          },
+          "hiddenSeries": false,
+          "id": 235,
+          "legend": {
+            "alignAsTable": false,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 0,
+          "maxPerRow": 6,
+          "nullPointMode": "null",
+          "options": {
+            "alertThreshold": true
+          },
+          "percentage": false,
+          "pluginVersion": "7.1.5",
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "repeatDirection": "h",
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-cornell1-prd",
+              "value": "ace-cornell1-prd"
+            }
+          },
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": true,
+          "targets": [
+            {
+              "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Up",
+              "refId": "D"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Down: unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Down: scheduled",
+              "refId": "B"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Test down",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:93",
+              "decimals": 0,
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": "1",
+              "min": "-1",
+              "show": true
+            },
+            {
+              "$$hashKey": "object:94",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
       "repeat": "edge",
       "scopedVars": {
         "edge": {
@@ -41,413 +449,1339 @@
       "type": "row"
     },
     {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [
-            {
-              "from": "",
-              "id": 1,
-              "operator": "",
-              "text": "X",
-              "to": "",
-              "type": 1,
-              "value": "-1"
-            },
-            {
-              "from": "",
-              "id": 2,
-              "operator": "",
-              "text": "fail",
-              "to": "",
-              "type": 1,
-              "value": "0"
-            },
-            {
-              "from": "",
-              "id": 3,
-              "operator": "",
-              "text": "ok",
-              "to": "",
-              "type": 1,
-              "value": "1"
-            },
-            {
-              "from": "-100",
-              "id": 4,
-              "text": "maint",
-              "to": "-6",
-              "type": 2
-            }
-          ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": -100
-              },
-              {
-                "color": "red",
-                "value": 0
-              },
-              {
-                "color": "green",
-                "value": 1
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
+      "collapsed": true,
+      "datasource": null,
       "gridPos": {
-        "h": 3,
-        "w": 3,
+        "h": 1,
+        "w": 24,
         "x": 0,
         "y": 1
       },
-      "id": 259,
-      "links": [],
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-cornell1-prd",
-          "value": "ace-cornell1-prd"
-        }
-      },
-      "targets": [
+      "id": 301,
+      "panels": [
         {
-          "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Connect:",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Ping:",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Test results",
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 50
-              },
-              {
-                "color": "green",
-                "value": 95
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 1,
+                  "operator": "",
+                  "text": "X",
+                  "to": "",
+                  "type": 1,
+                  "value": "-1"
+                },
+                {
+                  "from": "",
+                  "id": 2,
+                  "operator": "",
+                  "text": "fail",
+                  "to": "",
+                  "type": 1,
+                  "value": "0"
+                },
+                {
+                  "from": "",
+                  "id": 3,
+                  "operator": "",
+                  "text": "ok",
+                  "to": "",
+                  "type": 1,
+                  "value": "1"
+                },
+                {
+                  "from": "-100",
+                  "id": 4,
+                  "text": "maint",
+                  "to": "-6",
+                  "type": 2
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#6ED0E0",
+                    "value": -100
+                  },
+                  {
+                    "color": "red",
+                    "value": 0
+                  },
+                  {
+                    "color": "green",
+                    "value": 1
+                  }
+                ]
               }
-            ]
+            },
+            "overrides": []
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 3,
-        "y": 1
-      },
-      "id": 260,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 0,
+            "y": 1
+          },
+          "id": 302,
+          "links": [],
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "last"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 259,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-intel",
+              "value": "ace-intel"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Connect:",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Ping:",
+              "refId": "B"
+            }
           ],
-          "fields": "",
-          "values": false
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Test results",
+          "type": "stat"
         },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 50
+                  },
+                  {
+                    "color": "green",
+                    "value": 95
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 3,
+            "y": 1
+          },
+          "id": 303,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 260,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-intel",
+              "value": "ace-intel"
+            }
+          },
+          "targets": [
+            {
+              "expr": "avg(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "C"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Uptime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 1
+                  },
+                  {
+                    "color": "red",
+                    "value": 10
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 6,
+            "y": 1
+          },
+          "id": 304,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 262,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-intel",
+              "value": "ace-intel"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
+              "interval": "",
+              "legendFormat": "Unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
+              "interval": "",
+              "legendFormat": "Scheduled",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Downtime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "aliasColors": {
+            "Down, unsched": "red",
+            "Down: unscheduled": "red",
+            "Scheduled": "blue",
+            "Scheduled downtime": "blue",
+            "Test down": "yellow",
+            "Unscheduled": "red",
+            "Unscheduled downtime": "red"
+          },
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "Uptime and downtime over time",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 10,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 3,
+            "w": 15,
+            "x": 9,
+            "y": 1
+          },
+          "hiddenSeries": false,
+          "id": 305,
+          "legend": {
+            "alignAsTable": false,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 0,
+          "maxPerRow": 6,
+          "nullPointMode": "null",
+          "options": {
+            "alertThreshold": true
+          },
+          "percentage": false,
+          "pluginVersion": "7.1.5",
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 235,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-intel",
+              "value": "ace-intel"
+            }
+          },
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": true,
+          "targets": [
+            {
+              "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Up",
+              "refId": "D"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Down: unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Down: scheduled",
+              "refId": "B"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Test down",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:93",
+              "decimals": 0,
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": "1",
+              "min": "-1",
+              "show": true
+            },
+            {
+              "$$hashKey": "object:94",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": 1616774867835,
+      "repeatPanelId": 300,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "ace-cornell1-prd",
-          "value": "ace-cornell1-prd"
+          "text": "ace-intel",
+          "value": "ace-intel"
         }
       },
-      "targets": [
-        {
-          "expr": "sum(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "C"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Uptime",
-      "transformations": [],
-      "type": "stat"
+      "title": "$edge",
+      "type": "row"
     },
     {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 1
-              },
-              {
-                "color": "red",
-                "value": 10
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 2
+      },
+      "id": 306,
+      "panels": [
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 1,
+                  "operator": "",
+                  "text": "X",
+                  "to": "",
+                  "type": 1,
+                  "value": "-1"
+                },
+                {
+                  "from": "",
+                  "id": 2,
+                  "operator": "",
+                  "text": "fail",
+                  "to": "",
+                  "type": 1,
+                  "value": "0"
+                },
+                {
+                  "from": "",
+                  "id": 3,
+                  "operator": "",
+                  "text": "ok",
+                  "to": "",
+                  "type": 1,
+                  "value": "1"
+                },
+                {
+                  "from": "-100",
+                  "id": 4,
+                  "text": "maint",
+                  "to": "-6",
+                  "type": 2
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#6ED0E0",
+                    "value": -100
+                  },
+                  {
+                    "color": "red",
+                    "value": 0
+                  },
+                  {
+                    "color": "green",
+                    "value": 1
+                  }
+                ]
               }
-            ]
+            },
+            "overrides": []
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 6,
-        "y": 1
-      },
-      "id": 262,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 0,
+            "y": 1
+          },
+          "id": 307,
+          "links": [],
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "last"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 259,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-menlo-rasp-pi",
+              "value": "ace-menlo-rasp-pi"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Connect:",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Ping:",
+              "refId": "B"
+            }
           ],
-          "fields": "",
-          "values": false
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Test results",
+          "type": "stat"
         },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 50
+                  },
+                  {
+                    "color": "green",
+                    "value": 95
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 3,
+            "y": 1
+          },
+          "id": 308,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 260,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-menlo-rasp-pi",
+              "value": "ace-menlo-rasp-pi"
+            }
+          },
+          "targets": [
+            {
+              "expr": "avg(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "C"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Uptime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 1
+                  },
+                  {
+                    "color": "red",
+                    "value": 10
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 6,
+            "y": 1
+          },
+          "id": 309,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 262,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-menlo-rasp-pi",
+              "value": "ace-menlo-rasp-pi"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
+              "interval": "",
+              "legendFormat": "Unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
+              "interval": "",
+              "legendFormat": "Scheduled",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Downtime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "aliasColors": {
+            "Down, unsched": "red",
+            "Down: unscheduled": "red",
+            "Scheduled": "blue",
+            "Scheduled downtime": "blue",
+            "Test down": "yellow",
+            "Unscheduled": "red",
+            "Unscheduled downtime": "red"
+          },
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "Uptime and downtime over time",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 10,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 3,
+            "w": 15,
+            "x": 9,
+            "y": 1
+          },
+          "hiddenSeries": false,
+          "id": 310,
+          "legend": {
+            "alignAsTable": false,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 0,
+          "maxPerRow": 6,
+          "nullPointMode": "null",
+          "options": {
+            "alertThreshold": true
+          },
+          "percentage": false,
+          "pluginVersion": "7.1.5",
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 235,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-menlo-rasp-pi",
+              "value": "ace-menlo-rasp-pi"
+            }
+          },
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": true,
+          "targets": [
+            {
+              "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Up",
+              "refId": "D"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Down: unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Down: scheduled",
+              "refId": "B"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Test down",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:93",
+              "decimals": 0,
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": "1",
+              "min": "-1",
+              "show": true
+            },
+            {
+              "$$hashKey": "object:94",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": 1616774867835,
+      "repeatPanelId": 300,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "ace-cornell1-prd",
-          "value": "ace-cornell1-prd"
+          "text": "ace-menlo-rasp-pi",
+          "value": "ace-menlo-rasp-pi"
         }
       },
-      "targets": [
-        {
-          "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
-          "interval": "",
-          "legendFormat": "Unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
-          "interval": "",
-          "legendFormat": "Scheduled",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Downtime",
-      "transformations": [],
-      "type": "stat"
+      "title": "$edge",
+      "type": "row"
     },
     {
-      "aliasColors": {
-        "Down, unsched": "red",
-        "Down: unscheduled": "red",
-        "Scheduled": "blue",
-        "Scheduled downtime": "blue",
-        "Test down": "yellow",
-        "Unscheduled": "red",
-        "Unscheduled downtime": "red"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "Uptime and downtime over time",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 10,
-      "fillGradient": 0,
+      "collapsed": true,
+      "datasource": null,
       "gridPos": {
-        "h": 3,
-        "w": 15,
-        "x": 9,
-        "y": 1
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 3
       },
-      "hiddenSeries": false,
-      "id": 235,
-      "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 0,
-      "maxPerRow": 6,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.1.5",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeatDirection": "h",
+      "id": 311,
+      "panels": [
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 1,
+                  "operator": "",
+                  "text": "X",
+                  "to": "",
+                  "type": 1,
+                  "value": "-1"
+                },
+                {
+                  "from": "",
+                  "id": 2,
+                  "operator": "",
+                  "text": "fail",
+                  "to": "",
+                  "type": 1,
+                  "value": "0"
+                },
+                {
+                  "from": "",
+                  "id": 3,
+                  "operator": "",
+                  "text": "ok",
+                  "to": "",
+                  "type": 1,
+                  "value": "1"
+                },
+                {
+                  "from": "-100",
+                  "id": 4,
+                  "text": "maint",
+                  "to": "-6",
+                  "type": 2
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#6ED0E0",
+                    "value": -100
+                  },
+                  {
+                    "color": "red",
+                    "value": 0
+                  },
+                  {
+                    "color": "green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 0,
+            "y": 1
+          },
+          "id": 312,
+          "links": [],
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "last"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 259,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-nctu",
+              "value": "ace-nctu"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Connect:",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Ping:",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Test results",
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 50
+                  },
+                  {
+                    "color": "green",
+                    "value": 95
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 3,
+            "y": 1
+          },
+          "id": 313,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 260,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-nctu",
+              "value": "ace-nctu"
+            }
+          },
+          "targets": [
+            {
+              "expr": "avg(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "C"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Uptime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 1
+                  },
+                  {
+                    "color": "red",
+                    "value": 10
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 6,
+            "y": 1
+          },
+          "id": 314,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 262,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-nctu",
+              "value": "ace-nctu"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
+              "interval": "",
+              "legendFormat": "Unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
+              "interval": "",
+              "legendFormat": "Scheduled",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Downtime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "aliasColors": {
+            "Down, unsched": "red",
+            "Down: unscheduled": "red",
+            "Scheduled": "blue",
+            "Scheduled downtime": "blue",
+            "Test down": "yellow",
+            "Unscheduled": "red",
+            "Unscheduled downtime": "red"
+          },
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "Uptime and downtime over time",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 10,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 3,
+            "w": 15,
+            "x": 9,
+            "y": 1
+          },
+          "hiddenSeries": false,
+          "id": 315,
+          "legend": {
+            "alignAsTable": false,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 0,
+          "maxPerRow": 6,
+          "nullPointMode": "null",
+          "options": {
+            "alertThreshold": true
+          },
+          "percentage": false,
+          "pluginVersion": "7.1.5",
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 235,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-nctu",
+              "value": "ace-nctu"
+            }
+          },
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": true,
+          "targets": [
+            {
+              "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Up",
+              "refId": "D"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Down: unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Down: scheduled",
+              "refId": "B"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Test down",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:93",
+              "decimals": 0,
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": "1",
+              "min": "-1",
+              "show": true
+            },
+            {
+              "$$hashKey": "object:94",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": 1616774867835,
+      "repeatPanelId": 300,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "ace-cornell1-prd",
-          "value": "ace-cornell1-prd"
+          "text": "ace-nctu",
+          "value": "ace-nctu"
         }
       },
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Up",
-          "refId": "D"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Down: unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Down: scheduled",
-          "refId": "B"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Test down",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:93",
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "1",
-          "min": "-1",
-          "show": true
-        },
-        {
-          "$$hashKey": "object:94",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
+      "title": "$edge",
+      "type": "row"
     },
     {
+      "collapsed": true,
       "datasource": null,
       "gridPos": {
         "h": 1,
@@ -455,441 +1789,1775 @@
         "x": 0,
         "y": 4
       },
-      "id": 301,
-      "panels": [],
+      "id": 316,
+      "panels": [
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 1,
+                  "operator": "",
+                  "text": "X",
+                  "to": "",
+                  "type": 1,
+                  "value": "-1"
+                },
+                {
+                  "from": "",
+                  "id": 2,
+                  "operator": "",
+                  "text": "fail",
+                  "to": "",
+                  "type": 1,
+                  "value": "0"
+                },
+                {
+                  "from": "",
+                  "id": 3,
+                  "operator": "",
+                  "text": "ok",
+                  "to": "",
+                  "type": 1,
+                  "value": "1"
+                },
+                {
+                  "from": "-100",
+                  "id": 4,
+                  "text": "maint",
+                  "to": "-6",
+                  "type": 2
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#6ED0E0",
+                    "value": -100
+                  },
+                  {
+                    "color": "red",
+                    "value": 0
+                  },
+                  {
+                    "color": "green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 0,
+            "y": 1
+          },
+          "id": 317,
+          "links": [],
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "last"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 259,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-princeton1-dev",
+              "value": "ace-princeton1-dev"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Connect:",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Ping:",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Test results",
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 50
+                  },
+                  {
+                    "color": "green",
+                    "value": 95
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 3,
+            "y": 1
+          },
+          "id": 318,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 260,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-princeton1-dev",
+              "value": "ace-princeton1-dev"
+            }
+          },
+          "targets": [
+            {
+              "expr": "avg(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "C"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Uptime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 1
+                  },
+                  {
+                    "color": "red",
+                    "value": 10
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 6,
+            "y": 1
+          },
+          "id": 319,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 262,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-princeton1-dev",
+              "value": "ace-princeton1-dev"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
+              "interval": "",
+              "legendFormat": "Unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
+              "interval": "",
+              "legendFormat": "Scheduled",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Downtime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "aliasColors": {
+            "Down, unsched": "red",
+            "Down: unscheduled": "red",
+            "Scheduled": "blue",
+            "Scheduled downtime": "blue",
+            "Test down": "yellow",
+            "Unscheduled": "red",
+            "Unscheduled downtime": "red"
+          },
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "Uptime and downtime over time",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 10,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 3,
+            "w": 15,
+            "x": 9,
+            "y": 1
+          },
+          "hiddenSeries": false,
+          "id": 320,
+          "legend": {
+            "alignAsTable": false,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 0,
+          "maxPerRow": 6,
+          "nullPointMode": "null",
+          "options": {
+            "alertThreshold": true
+          },
+          "percentage": false,
+          "pluginVersion": "7.1.5",
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 235,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-princeton1-dev",
+              "value": "ace-princeton1-dev"
+            }
+          },
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": true,
+          "targets": [
+            {
+              "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Up",
+              "refId": "D"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Down: unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Down: scheduled",
+              "refId": "B"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Test down",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:93",
+              "decimals": 0,
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": "1",
+              "min": "-1",
+              "show": true
+            },
+            {
+              "$$hashKey": "object:94",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
       "repeat": null,
-      "repeatIteration": 1616543018514,
+      "repeatIteration": 1616774867835,
       "repeatPanelId": 300,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "ace-intel",
-          "value": "ace-intel"
+          "text": "ace-princeton1-dev",
+          "value": "ace-princeton1-dev"
         }
       },
       "title": "$edge",
       "type": "row"
     },
     {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [
-            {
-              "from": "",
-              "id": 1,
-              "operator": "",
-              "text": "X",
-              "to": "",
-              "type": 1,
-              "value": "-1"
-            },
-            {
-              "from": "",
-              "id": 2,
-              "operator": "",
-              "text": "fail",
-              "to": "",
-              "type": 1,
-              "value": "0"
-            },
-            {
-              "from": "",
-              "id": 3,
-              "operator": "",
-              "text": "ok",
-              "to": "",
-              "type": 1,
-              "value": "1"
-            },
-            {
-              "from": "-100",
-              "id": 4,
-              "text": "maint",
-              "to": "-6",
-              "type": 2
-            }
-          ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": -100
-              },
-              {
-                "color": "red",
-                "value": 0
-              },
-              {
-                "color": "green",
-                "value": 1
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
+      "collapsed": true,
+      "datasource": null,
       "gridPos": {
-        "h": 3,
-        "w": 3,
+        "h": 1,
+        "w": 24,
         "x": 0,
         "y": 5
       },
-      "id": 302,
-      "links": [],
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 259,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-intel",
-          "value": "ace-intel"
-        }
-      },
-      "targets": [
+      "id": 321,
+      "panels": [
         {
-          "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Connect:",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Ping:",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Test results",
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 50
-              },
-              {
-                "color": "green",
-                "value": 95
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 1,
+                  "operator": "",
+                  "text": "X",
+                  "to": "",
+                  "type": 1,
+                  "value": "-1"
+                },
+                {
+                  "from": "",
+                  "id": 2,
+                  "operator": "",
+                  "text": "fail",
+                  "to": "",
+                  "type": 1,
+                  "value": "0"
+                },
+                {
+                  "from": "",
+                  "id": 3,
+                  "operator": "",
+                  "text": "ok",
+                  "to": "",
+                  "type": 1,
+                  "value": "1"
+                },
+                {
+                  "from": "-100",
+                  "id": 4,
+                  "text": "maint",
+                  "to": "-6",
+                  "type": 2
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#6ED0E0",
+                    "value": -100
+                  },
+                  {
+                    "color": "red",
+                    "value": 0
+                  },
+                  {
+                    "color": "green",
+                    "value": 1
+                  }
+                ]
               }
-            ]
+            },
+            "overrides": []
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 3,
-        "y": 5
-      },
-      "id": 303,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 0,
+            "y": 1
+          },
+          "id": 322,
+          "links": [],
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "last"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 259,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-princeton1-prd",
+              "value": "ace-princeton1-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Connect:",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Ping:",
+              "refId": "B"
+            }
           ],
-          "fields": "",
-          "values": false
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Test results",
+          "type": "stat"
         },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 260,
-      "repeatedByRow": true,
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 50
+                  },
+                  {
+                    "color": "green",
+                    "value": 95
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 3,
+            "y": 1
+          },
+          "id": 323,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 260,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-princeton1-prd",
+              "value": "ace-princeton1-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "avg(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "C"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Uptime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 1
+                  },
+                  {
+                    "color": "red",
+                    "value": 10
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 6,
+            "y": 1
+          },
+          "id": 324,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 262,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-princeton1-prd",
+              "value": "ace-princeton1-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
+              "interval": "",
+              "legendFormat": "Unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
+              "interval": "",
+              "legendFormat": "Scheduled",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Downtime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "aliasColors": {
+            "Down, unsched": "red",
+            "Down: unscheduled": "red",
+            "Scheduled": "blue",
+            "Scheduled downtime": "blue",
+            "Test down": "yellow",
+            "Unscheduled": "red",
+            "Unscheduled downtime": "red"
+          },
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "Uptime and downtime over time",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 10,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 3,
+            "w": 15,
+            "x": 9,
+            "y": 1
+          },
+          "hiddenSeries": false,
+          "id": 325,
+          "legend": {
+            "alignAsTable": false,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 0,
+          "maxPerRow": 6,
+          "nullPointMode": "null",
+          "options": {
+            "alertThreshold": true
+          },
+          "percentage": false,
+          "pluginVersion": "7.1.5",
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 235,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-princeton1-prd",
+              "value": "ace-princeton1-prd"
+            }
+          },
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": true,
+          "targets": [
+            {
+              "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Up",
+              "refId": "D"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Down: unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Down: scheduled",
+              "refId": "B"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Test down",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:93",
+              "decimals": 0,
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": "1",
+              "min": "-1",
+              "show": true
+            },
+            {
+              "$$hashKey": "object:94",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": 1616774867835,
+      "repeatPanelId": 300,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "ace-intel",
-          "value": "ace-intel"
+          "text": "ace-princeton1-prd",
+          "value": "ace-princeton1-prd"
         }
       },
-      "targets": [
-        {
-          "expr": "sum(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "C"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Uptime",
-      "transformations": [],
-      "type": "stat"
+      "title": "$edge",
+      "type": "row"
     },
     {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 1
-              },
-              {
-                "color": "red",
-                "value": 10
+      "collapsed": true,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 6
+      },
+      "id": 326,
+      "panels": [
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 1,
+                  "operator": "",
+                  "text": "X",
+                  "to": "",
+                  "type": 1,
+                  "value": "-1"
+                },
+                {
+                  "from": "",
+                  "id": 2,
+                  "operator": "",
+                  "text": "fail",
+                  "to": "",
+                  "type": 1,
+                  "value": "0"
+                },
+                {
+                  "from": "",
+                  "id": 3,
+                  "operator": "",
+                  "text": "ok",
+                  "to": "",
+                  "type": 1,
+                  "value": "1"
+                },
+                {
+                  "from": "-100",
+                  "id": 4,
+                  "text": "maint",
+                  "to": "-6",
+                  "type": 2
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#6ED0E0",
+                    "value": -100
+                  },
+                  {
+                    "color": "red",
+                    "value": 0
+                  },
+                  {
+                    "color": "green",
+                    "value": 1
+                  }
+                ]
               }
-            ]
+            },
+            "overrides": []
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 6,
-        "y": 5
-      },
-      "id": 304,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 0,
+            "y": 1
+          },
+          "id": 327,
+          "links": [],
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "last"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 259,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-stanford1-prd",
+              "value": "ace-stanford1-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Connect:",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Ping:",
+              "refId": "B"
+            }
           ],
-          "fields": "",
-          "values": false
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Test results",
+          "type": "stat"
         },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 262,
-      "repeatedByRow": true,
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 50
+                  },
+                  {
+                    "color": "green",
+                    "value": 95
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 3,
+            "y": 1
+          },
+          "id": 328,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 260,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-stanford1-prd",
+              "value": "ace-stanford1-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "avg(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "C"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Uptime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 1
+                  },
+                  {
+                    "color": "red",
+                    "value": 10
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 6,
+            "y": 1
+          },
+          "id": 329,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 262,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-stanford1-prd",
+              "value": "ace-stanford1-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
+              "interval": "",
+              "legendFormat": "Unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
+              "interval": "",
+              "legendFormat": "Scheduled",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Downtime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "aliasColors": {
+            "Down, unsched": "red",
+            "Down: unscheduled": "red",
+            "Scheduled": "blue",
+            "Scheduled downtime": "blue",
+            "Test down": "yellow",
+            "Unscheduled": "red",
+            "Unscheduled downtime": "red"
+          },
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "Uptime and downtime over time",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 10,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 3,
+            "w": 15,
+            "x": 9,
+            "y": 1
+          },
+          "hiddenSeries": false,
+          "id": 330,
+          "legend": {
+            "alignAsTable": false,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 0,
+          "maxPerRow": 6,
+          "nullPointMode": "null",
+          "options": {
+            "alertThreshold": true
+          },
+          "percentage": false,
+          "pluginVersion": "7.1.5",
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 235,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-stanford1-prd",
+              "value": "ace-stanford1-prd"
+            }
+          },
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": true,
+          "targets": [
+            {
+              "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Up",
+              "refId": "D"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Down: unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Down: scheduled",
+              "refId": "B"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Test down",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:93",
+              "decimals": 0,
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": "1",
+              "min": "-1",
+              "show": true
+            },
+            {
+              "$$hashKey": "object:94",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": 1616774867835,
+      "repeatPanelId": 300,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "ace-intel",
-          "value": "ace-intel"
+          "text": "ace-stanford1-prd",
+          "value": "ace-stanford1-prd"
         }
       },
-      "targets": [
-        {
-          "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
-          "interval": "",
-          "legendFormat": "Unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
-          "interval": "",
-          "legendFormat": "Scheduled",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Downtime",
-      "transformations": [],
-      "type": "stat"
+      "title": "$edge",
+      "type": "row"
     },
     {
-      "aliasColors": {
-        "Down, unsched": "red",
-        "Down: unscheduled": "red",
-        "Scheduled": "blue",
-        "Scheduled downtime": "blue",
-        "Test down": "yellow",
-        "Unscheduled": "red",
-        "Unscheduled downtime": "red"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "Uptime and downtime over time",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 10,
-      "fillGradient": 0,
+      "collapsed": true,
+      "datasource": null,
       "gridPos": {
-        "h": 3,
-        "w": 15,
-        "x": 9,
-        "y": 5
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 7
       },
-      "hiddenSeries": false,
-      "id": 305,
-      "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 0,
-      "maxPerRow": 6,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.1.5",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 235,
-      "repeatedByRow": true,
+      "id": 331,
+      "panels": [
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 1,
+                  "operator": "",
+                  "text": "X",
+                  "to": "",
+                  "type": 1,
+                  "value": "-1"
+                },
+                {
+                  "from": "",
+                  "id": 2,
+                  "operator": "",
+                  "text": "fail",
+                  "to": "",
+                  "type": 1,
+                  "value": "0"
+                },
+                {
+                  "from": "",
+                  "id": 3,
+                  "operator": "",
+                  "text": "ok",
+                  "to": "",
+                  "type": 1,
+                  "value": "1"
+                },
+                {
+                  "from": "-100",
+                  "id": 4,
+                  "text": "maint",
+                  "to": "-6",
+                  "type": 2
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#6ED0E0",
+                    "value": -100
+                  },
+                  {
+                    "color": "red",
+                    "value": 0
+                  },
+                  {
+                    "color": "green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 0,
+            "y": 1
+          },
+          "id": 332,
+          "links": [],
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "last"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 259,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-stanford2-prd",
+              "value": "ace-stanford2-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Connect:",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Ping:",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Test results",
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 50
+                  },
+                  {
+                    "color": "green",
+                    "value": 95
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 3,
+            "y": 1
+          },
+          "id": 333,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 260,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-stanford2-prd",
+              "value": "ace-stanford2-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "avg(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "C"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Uptime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 1
+                  },
+                  {
+                    "color": "red",
+                    "value": 10
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 6,
+            "y": 1
+          },
+          "id": 334,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 262,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-stanford2-prd",
+              "value": "ace-stanford2-prd"
+            }
+          },
+          "targets": [
+            {
+              "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
+              "interval": "",
+              "legendFormat": "Unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
+              "interval": "",
+              "legendFormat": "Scheduled",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Downtime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "aliasColors": {
+            "Down, unsched": "red",
+            "Down: unscheduled": "red",
+            "Scheduled": "blue",
+            "Scheduled downtime": "blue",
+            "Test down": "yellow",
+            "Unscheduled": "red",
+            "Unscheduled downtime": "red"
+          },
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "Uptime and downtime over time",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 10,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 3,
+            "w": 15,
+            "x": 9,
+            "y": 1
+          },
+          "hiddenSeries": false,
+          "id": 335,
+          "legend": {
+            "alignAsTable": false,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 0,
+          "maxPerRow": 6,
+          "nullPointMode": "null",
+          "options": {
+            "alertThreshold": true
+          },
+          "percentage": false,
+          "pluginVersion": "7.1.5",
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 235,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-stanford2-prd",
+              "value": "ace-stanford2-prd"
+            }
+          },
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": true,
+          "targets": [
+            {
+              "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Up",
+              "refId": "D"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Down: unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Down: scheduled",
+              "refId": "B"
+            },
+            {
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Test down",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:93",
+              "decimals": 0,
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": "1",
+              "min": "-1",
+              "show": true
+            },
+            {
+              "$$hashKey": "object:94",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": 1616774867835,
+      "repeatPanelId": 300,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "ace-intel",
-          "value": "ace-intel"
+          "text": "ace-stanford2-prd",
+          "value": "ace-stanford2-prd"
         }
       },
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Up",
-          "refId": "D"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Down: unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Down: scheduled",
-          "refId": "B"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Test down",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:93",
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "1",
-          "min": "-1",
-          "show": true
-        },
-        {
-          "$$hashKey": "object:94",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
+      "title": "$edge",
+      "type": "row"
     },
     {
+      "collapsed": true,
       "datasource": null,
       "gridPos": {
         "h": 1,
@@ -897,2220 +3565,430 @@
         "x": 0,
         "y": 8
       },
-      "id": 306,
-      "panels": [],
-      "repeat": null,
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 300,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-menlo-rasp-pi",
-          "value": "ace-menlo-rasp-pi"
-        }
-      },
-      "title": "$edge",
-      "type": "row"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [
+      "id": 336,
+      "panels": [
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 1,
+                  "operator": "",
+                  "text": "X",
+                  "to": "",
+                  "type": 1,
+                  "value": "-1"
+                },
+                {
+                  "from": "",
+                  "id": 2,
+                  "operator": "",
+                  "text": "fail",
+                  "to": "",
+                  "type": 1,
+                  "value": "0"
+                },
+                {
+                  "from": "",
+                  "id": 3,
+                  "operator": "",
+                  "text": "ok",
+                  "to": "",
+                  "type": 1,
+                  "value": "1"
+                },
+                {
+                  "from": "-100",
+                  "id": 4,
+                  "text": "maint",
+                  "to": "-6",
+                  "type": 2
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#6ED0E0",
+                    "value": -100
+                  },
+                  {
+                    "color": "red",
+                    "value": 0
+                  },
+                  {
+                    "color": "green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 0,
+            "y": 1
+          },
+          "id": 337,
+          "links": [],
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "last"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 259,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-tucson",
+              "value": "ace-tucson"
+            }
+          },
+          "targets": [
             {
-              "from": "",
-              "id": 1,
-              "operator": "",
-              "text": "X",
-              "to": "",
-              "type": 1,
-              "value": "-1"
+              "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Connect:",
+              "refId": "A"
             },
             {
-              "from": "",
-              "id": 2,
-              "operator": "",
-              "text": "fail",
-              "to": "",
-              "type": 1,
-              "value": "0"
-            },
-            {
-              "from": "",
-              "id": 3,
-              "operator": "",
-              "text": "ok",
-              "to": "",
-              "type": 1,
-              "value": "1"
-            },
-            {
-              "from": "-100",
-              "id": 4,
-              "text": "maint",
-              "to": "-6",
-              "type": 2
+              "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Ping:",
+              "refId": "B"
             }
           ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": -100
-              },
-              {
-                "color": "red",
-                "value": 0
-              },
-              {
-                "color": "green",
-                "value": 1
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 0,
-        "y": 9
-      },
-      "id": 307,
-      "links": [],
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 259,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-menlo-rasp-pi",
-          "value": "ace-menlo-rasp-pi"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Connect:",
-          "refId": "A"
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Test results",
+          "type": "stat"
         },
         {
-          "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Ping:",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Test results",
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 50
+                  },
+                  {
+                    "color": "green",
+                    "value": 95
+                  }
+                ]
               },
-              {
-                "color": "#EAB839",
-                "value": 50
-              },
-              {
-                "color": "green",
-                "value": 95
-              }
-            ]
+              "unit": "percent"
+            },
+            "overrides": []
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 3,
-        "y": 9
-      },
-      "id": 308,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 260,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-menlo-rasp-pi",
-          "value": "ace-menlo-rasp-pi"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "C"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Uptime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 1
-              },
-              {
-                "color": "red",
-                "value": 10
-              }
-            ]
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 3,
+            "y": 1
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 6,
-        "y": 9
-      },
-      "id": 309,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 262,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-menlo-rasp-pi",
-          "value": "ace-menlo-rasp-pi"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
-          "interval": "",
-          "legendFormat": "Unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
-          "interval": "",
-          "legendFormat": "Scheduled",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Downtime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "aliasColors": {
-        "Down, unsched": "red",
-        "Down: unscheduled": "red",
-        "Scheduled": "blue",
-        "Scheduled downtime": "blue",
-        "Test down": "yellow",
-        "Unscheduled": "red",
-        "Unscheduled downtime": "red"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "Uptime and downtime over time",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 10,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 3,
-        "w": 15,
-        "x": 9,
-        "y": 9
-      },
-      "hiddenSeries": false,
-      "id": 310,
-      "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 0,
-      "maxPerRow": 6,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.1.5",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 235,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-menlo-rasp-pi",
-          "value": "ace-menlo-rasp-pi"
-        }
-      },
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Up",
-          "refId": "D"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Down: unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Down: scheduled",
-          "refId": "B"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Test down",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:93",
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "1",
-          "min": "-1",
-          "show": true
-        },
-        {
-          "$$hashKey": "object:94",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 12
-      },
-      "id": 311,
-      "panels": [],
-      "repeat": null,
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 300,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-princeton1-dev",
-          "value": "ace-princeton1-dev"
-        }
-      },
-      "title": "$edge",
-      "type": "row"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [
-            {
-              "from": "",
-              "id": 1,
-              "operator": "",
-              "text": "X",
-              "to": "",
-              "type": 1,
-              "value": "-1"
+          "id": 338,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
             },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 260,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-tucson",
+              "value": "ace-tucson"
+            }
+          },
+          "targets": [
             {
-              "from": "",
-              "id": 2,
-              "operator": "",
-              "text": "fail",
-              "to": "",
-              "type": 1,
-              "value": "0"
-            },
-            {
-              "from": "",
-              "id": 3,
-              "operator": "",
-              "text": "ok",
-              "to": "",
-              "type": 1,
-              "value": "1"
-            },
-            {
-              "from": "-100",
-              "id": 4,
-              "text": "maint",
-              "to": "-6",
-              "type": 2
+              "expr": "avg(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "C"
             }
           ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": -100
-              },
-              {
-                "color": "red",
-                "value": 0
-              },
-              {
-                "color": "green",
-                "value": 1
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 0,
-        "y": 13
-      },
-      "id": 312,
-      "links": [],
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 259,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-princeton1-dev",
-          "value": "ace-princeton1-dev"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Connect:",
-          "refId": "A"
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Uptime",
+          "transformations": [],
+          "type": "stat"
         },
         {
-          "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Ping:",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Test results",
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 1
+                  },
+                  {
+                    "color": "red",
+                    "value": 10
+                  }
+                ]
               },
-              {
-                "color": "#EAB839",
-                "value": 50
-              },
-              {
-                "color": "green",
-                "value": 95
-              }
-            ]
+              "unit": "percent"
+            },
+            "overrides": []
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 3,
-        "y": 13
-      },
-      "id": 313,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 260,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-princeton1-dev",
-          "value": "ace-princeton1-dev"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "C"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Uptime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 1
-              },
-              {
-                "color": "red",
-                "value": 10
-              }
-            ]
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 6,
+            "y": 1
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 6,
-        "y": 13
-      },
-      "id": 314,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 262,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-princeton1-dev",
-          "value": "ace-princeton1-dev"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
-          "interval": "",
-          "legendFormat": "Unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
-          "interval": "",
-          "legendFormat": "Scheduled",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Downtime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "aliasColors": {
-        "Down, unsched": "red",
-        "Down: unscheduled": "red",
-        "Scheduled": "blue",
-        "Scheduled downtime": "blue",
-        "Test down": "yellow",
-        "Unscheduled": "red",
-        "Unscheduled downtime": "red"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "Uptime and downtime over time",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 10,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 3,
-        "w": 15,
-        "x": 9,
-        "y": 13
-      },
-      "hiddenSeries": false,
-      "id": 315,
-      "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 0,
-      "maxPerRow": 6,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.1.5",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 235,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-princeton1-dev",
-          "value": "ace-princeton1-dev"
-        }
-      },
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Up",
-          "refId": "D"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Down: unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Down: scheduled",
-          "refId": "B"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Test down",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:93",
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "1",
-          "min": "-1",
-          "show": true
-        },
-        {
-          "$$hashKey": "object:94",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 16
-      },
-      "id": 316,
-      "panels": [],
-      "repeat": null,
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 300,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-princeton1-prd",
-          "value": "ace-princeton1-prd"
-        }
-      },
-      "title": "$edge",
-      "type": "row"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [
+          "id": 339,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 262,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-tucson",
+              "value": "ace-tucson"
+            }
+          },
+          "targets": [
             {
-              "from": "",
-              "id": 1,
-              "operator": "",
-              "text": "X",
-              "to": "",
-              "type": 1,
-              "value": "-1"
+              "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
+              "interval": "",
+              "legendFormat": "Unscheduled",
+              "refId": "A"
             },
             {
-              "from": "",
-              "id": 2,
-              "operator": "",
-              "text": "fail",
-              "to": "",
-              "type": 1,
-              "value": "0"
-            },
-            {
-              "from": "",
-              "id": 3,
-              "operator": "",
-              "text": "ok",
-              "to": "",
-              "type": 1,
-              "value": "1"
-            },
-            {
-              "from": "-100",
-              "id": 4,
-              "text": "maint",
-              "to": "-6",
-              "type": 2
+              "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
+              "interval": "",
+              "legendFormat": "Scheduled",
+              "refId": "B"
             }
           ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": -100
-              },
-              {
-                "color": "red",
-                "value": 0
-              },
-              {
-                "color": "green",
-                "value": 1
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 0,
-        "y": 17
-      },
-      "id": 317,
-      "links": [],
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 259,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-princeton1-prd",
-          "value": "ace-princeton1-prd"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Connect:",
-          "refId": "A"
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Downtime",
+          "transformations": [],
+          "type": "stat"
         },
         {
-          "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Ping:",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Test results",
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 50
-              },
-              {
-                "color": "green",
-                "value": 95
-              }
-            ]
+          "aliasColors": {
+            "Down, unsched": "red",
+            "Down: unscheduled": "red",
+            "Scheduled": "blue",
+            "Scheduled downtime": "blue",
+            "Test down": "yellow",
+            "Unscheduled": "red",
+            "Unscheduled downtime": "red"
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 3,
-        "y": 17
-      },
-      "id": 318,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 260,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-princeton1-prd",
-          "value": "ace-princeton1-prd"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "C"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Uptime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 1
-              },
-              {
-                "color": "red",
-                "value": 10
-              }
-            ]
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "Uptime and downtime over time",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 6,
-        "y": 17
-      },
-      "id": 319,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 262,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-princeton1-prd",
-          "value": "ace-princeton1-prd"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
-          "interval": "",
-          "legendFormat": "Unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
-          "interval": "",
-          "legendFormat": "Scheduled",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Downtime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "aliasColors": {
-        "Down, unsched": "red",
-        "Down: unscheduled": "red",
-        "Scheduled": "blue",
-        "Scheduled downtime": "blue",
-        "Test down": "yellow",
-        "Unscheduled": "red",
-        "Unscheduled downtime": "red"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "Uptime and downtime over time",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 10,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 3,
-        "w": 15,
-        "x": 9,
-        "y": 17
-      },
-      "hiddenSeries": false,
-      "id": 320,
-      "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 0,
-      "maxPerRow": 6,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.1.5",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 235,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-princeton1-prd",
-          "value": "ace-princeton1-prd"
-        }
-      },
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Up",
-          "refId": "D"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Down: unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Down: scheduled",
-          "refId": "B"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Test down",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:93",
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "1",
-          "min": "-1",
-          "show": true
-        },
-        {
-          "$$hashKey": "object:94",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 20
-      },
-      "id": 321,
-      "panels": [],
-      "repeat": null,
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 300,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-stanford1-prd",
-          "value": "ace-stanford1-prd"
-        }
-      },
-      "title": "$edge",
-      "type": "row"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [
+          "fill": 10,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 3,
+            "w": 15,
+            "x": 9,
+            "y": 1
+          },
+          "hiddenSeries": false,
+          "id": 340,
+          "legend": {
+            "alignAsTable": false,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 0,
+          "maxPerRow": 6,
+          "nullPointMode": "null",
+          "options": {
+            "alertThreshold": true
+          },
+          "percentage": false,
+          "pluginVersion": "7.1.5",
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "repeatDirection": "h",
+          "repeatIteration": 1616774867835,
+          "repeatPanelId": 235,
+          "repeatedByRow": true,
+          "scopedVars": {
+            "edge": {
+              "selected": false,
+              "text": "ace-tucson",
+              "value": "ace-tucson"
+            }
+          },
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": true,
+          "targets": [
             {
-              "from": "",
-              "id": 1,
-              "operator": "",
-              "text": "X",
-              "to": "",
-              "type": 1,
-              "value": "-1"
+              "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Up",
+              "refId": "D"
             },
             {
-              "from": "",
-              "id": 2,
-              "operator": "",
-              "text": "fail",
-              "to": "",
-              "type": 1,
-              "value": "0"
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
+              "interval": "",
+              "legendFormat": "Down: unscheduled",
+              "refId": "A"
             },
             {
-              "from": "",
-              "id": 3,
-              "operator": "",
-              "text": "ok",
-              "to": "",
-              "type": 1,
-              "value": "1"
+              "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Down: scheduled",
+              "refId": "B"
             },
             {
-              "from": "-100",
-              "id": 4,
-              "text": "maint",
-              "to": "-6",
-              "type": 2
+              "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
+              "interval": "",
+              "legendFormat": "Test down",
+              "refId": "C"
             }
           ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": -100
-              },
-              {
-                "color": "red",
-                "value": 0
-              },
-              {
-                "color": "green",
-                "value": 1
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 0,
-        "y": 21
-      },
-      "id": 322,
-      "links": [],
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 259,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-stanford1-prd",
-          "value": "ace-stanford1-prd"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Connect:",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Ping:",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Test results",
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 50
-              },
-              {
-                "color": "green",
-                "value": 95
-              }
-            ]
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 3,
-        "y": 21
-      },
-      "id": 323,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 260,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-stanford1-prd",
-          "value": "ace-stanford1-prd"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "C"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Uptime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 1
-              },
-              {
-                "color": "red",
-                "value": 10
-              }
-            ]
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 6,
-        "y": 21
-      },
-      "id": 324,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 262,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-stanford1-prd",
-          "value": "ace-stanford1-prd"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
-          "interval": "",
-          "legendFormat": "Unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
-          "interval": "",
-          "legendFormat": "Scheduled",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Downtime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "aliasColors": {
-        "Down, unsched": "red",
-        "Down: unscheduled": "red",
-        "Scheduled": "blue",
-        "Scheduled downtime": "blue",
-        "Test down": "yellow",
-        "Unscheduled": "red",
-        "Unscheduled downtime": "red"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "Uptime and downtime over time",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 10,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 3,
-        "w": 15,
-        "x": 9,
-        "y": 21
-      },
-      "hiddenSeries": false,
-      "id": 325,
-      "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 0,
-      "maxPerRow": 6,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.1.5",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 235,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-stanford1-prd",
-          "value": "ace-stanford1-prd"
-        }
-      },
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Up",
-          "refId": "D"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Down: unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Down: scheduled",
-          "refId": "B"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Test down",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:93",
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "1",
-          "min": "-1",
-          "show": true
-        },
-        {
-          "$$hashKey": "object:94",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 24
-      },
-      "id": 326,
-      "panels": [],
-      "repeat": null,
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 300,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-stanford2-prd",
-          "value": "ace-stanford2-prd"
-        }
-      },
-      "title": "$edge",
-      "type": "row"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [
+          "yaxes": [
             {
-              "from": "",
-              "id": 1,
-              "operator": "",
-              "text": "X",
-              "to": "",
-              "type": 1,
-              "value": "-1"
+              "$$hashKey": "object:93",
+              "decimals": 0,
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": "1",
+              "min": "-1",
+              "show": true
             },
             {
-              "from": "",
-              "id": 2,
-              "operator": "",
-              "text": "fail",
-              "to": "",
-              "type": 1,
-              "value": "0"
-            },
-            {
-              "from": "",
-              "id": 3,
-              "operator": "",
-              "text": "ok",
-              "to": "",
-              "type": 1,
-              "value": "1"
-            },
-            {
-              "from": "-100",
-              "id": 4,
-              "text": "maint",
-              "to": "-6",
-              "type": 2
+              "$$hashKey": "object:94",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
             }
           ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": -100
-              },
-              {
-                "color": "red",
-                "value": 0
-              },
-              {
-                "color": "green",
-                "value": 1
-              }
-            ]
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
           }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 0,
-        "y": 25
-      },
-      "id": 327,
-      "links": [],
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 259,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-stanford2-prd",
-          "value": "ace-stanford2-prd"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Connect:",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Ping:",
-          "refId": "B"
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Test results",
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 50
-              },
-              {
-                "color": "green",
-                "value": 95
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 3,
-        "y": 25
-      },
-      "id": 328,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 260,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-stanford2-prd",
-          "value": "ace-stanford2-prd"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "C"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Uptime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 1
-              },
-              {
-                "color": "red",
-                "value": 10
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 6,
-        "y": 25
-      },
-      "id": 329,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 262,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-stanford2-prd",
-          "value": "ace-stanford2-prd"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
-          "interval": "",
-          "legendFormat": "Unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
-          "interval": "",
-          "legendFormat": "Scheduled",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Downtime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "aliasColors": {
-        "Down, unsched": "red",
-        "Down: unscheduled": "red",
-        "Scheduled": "blue",
-        "Scheduled downtime": "blue",
-        "Test down": "yellow",
-        "Unscheduled": "red",
-        "Unscheduled downtime": "red"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "Uptime and downtime over time",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 10,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 3,
-        "w": 15,
-        "x": 9,
-        "y": 25
-      },
-      "hiddenSeries": false,
-      "id": 330,
-      "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 0,
-      "maxPerRow": 6,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.1.5",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 235,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-stanford2-prd",
-          "value": "ace-stanford2-prd"
-        }
-      },
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Up",
-          "refId": "D"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Down: unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Down: scheduled",
-          "refId": "B"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Test down",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:93",
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "1",
-          "min": "-1",
-          "show": true
-        },
-        {
-          "$$hashKey": "object:94",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 28
-      },
-      "id": 331,
-      "panels": [],
       "repeat": null,
-      "repeatIteration": 1616543018514,
+      "repeatIteration": 1616774867835,
       "repeatPanelId": 300,
       "scopedVars": {
         "edge": {
@@ -3121,425 +3999,6 @@
       },
       "title": "$edge",
       "type": "row"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [
-            {
-              "from": "",
-              "id": 1,
-              "operator": "",
-              "text": "X",
-              "to": "",
-              "type": 1,
-              "value": "-1"
-            },
-            {
-              "from": "",
-              "id": 2,
-              "operator": "",
-              "text": "fail",
-              "to": "",
-              "type": 1,
-              "value": "0"
-            },
-            {
-              "from": "",
-              "id": 3,
-              "operator": "",
-              "text": "ok",
-              "to": "",
-              "type": 1,
-              "value": "1"
-            },
-            {
-              "from": "-100",
-              "id": 4,
-              "text": "maint",
-              "to": "-6",
-              "type": 2
-            }
-          ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": -100
-              },
-              {
-                "color": "red",
-                "value": 0
-              },
-              {
-                "color": "green",
-                "value": 1
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 0,
-        "y": 29
-      },
-      "id": 332,
-      "links": [],
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "last"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 259,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-tucson",
-          "value": "ace-tucson"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(aetheredge_connect_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Connect:",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_ping_test_ok{endpoint=\"metrics80\",name=\"$edge\"} - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Ping:",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Test results",
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 50
-              },
-              {
-                "color": "green",
-                "value": 95
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 3,
-        "y": 29
-      },
-      "id": 333,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 260,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-tucson",
-          "value": "ace-tucson"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(avg_over_time(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}[$__interval]) * 100)",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "C"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Uptime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "decimals": 3,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 1
-              },
-              {
-                "color": "red",
-                "value": 10
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 3,
-        "x": 6,
-        "y": 29
-      },
-      "id": 334,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "7.1.5",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 262,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-tucson",
-          "value": "ace-tucson"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"})) * 100",
-          "interval": "",
-          "legendFormat": "Unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * 100",
-          "interval": "",
-          "legendFormat": "Scheduled",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Downtime",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "aliasColors": {
-        "Down, unsched": "red",
-        "Down: unscheduled": "red",
-        "Scheduled": "blue",
-        "Scheduled downtime": "blue",
-        "Test down": "yellow",
-        "Unscheduled": "red",
-        "Unscheduled downtime": "red"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "RANCHER_MONITORING_GLOBAL",
-      "description": "Uptime and downtime over time",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 10,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 3,
-        "w": 15,
-        "x": 9,
-        "y": 29
-      },
-      "hiddenSeries": false,
-      "id": 335,
-      "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 0,
-      "maxPerRow": 6,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.1.5",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeatDirection": "h",
-      "repeatIteration": 1616543018514,
-      "repeatPanelId": 235,
-      "repeatedByRow": true,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "ace-tucson",
-          "value": "ace-tucson"
-        }
-      },
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "sum(aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"} * (1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Up",
-          "refId": "D"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"}) * (1 - aetheredge_e2e_tests_ok{endpoint=\"metrics80\",name=\"$edge\"}))",
-          "interval": "",
-          "legendFormat": "Down: unscheduled",
-          "refId": "A"
-        },
-        {
-          "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Down: scheduled",
-          "refId": "B"
-        },
-        {
-          "expr": "-1 * sum((1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"$edge\"}) * aetheredge_e2e_tests_down{endpoint=\"metrics80\",name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Test down",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:93",
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "1",
-          "min": "-1",
-          "show": true
-        },
-        {
-          "$$hashKey": "object:94",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
     }
   ],
   "refresh": "5m",
@@ -3581,7 +4040,7 @@
     ]
   },
   "time": {
-    "from": "now-12h",
+    "from": "now-24h",
     "to": "now"
   },
   "timepicker": {
@@ -3600,5 +4059,5 @@
   "timezone": "",
   "title": "Edge E2E Tests",
   "uid": "XOeEp-QGk",
-  "version": 6
+  "version": 7
 }
\ No newline at end of file
diff --git a/monitoring/grafana-aether/dashboards/global-edge-status-production.json b/monitoring/grafana-aether/dashboards/global-edge-status-production.json
index 85765aa..f3cebd0 100644
--- a/monitoring/grafana-aether/dashboards/global-edge-status-production.json
+++ b/monitoring/grafana-aether/dashboards/global-edge-status-production.json
@@ -3560,7 +3560,7 @@
             "h": 3,
             "w": 3,
             "x": 0,
-            "y": 20
+            "y": 2
           },
           "id": 251,
           "links": [
@@ -3688,7 +3688,7 @@
             "h": 3,
             "w": 3,
             "x": 3,
-            "y": 20
+            "y": 2
           },
           "id": 241,
           "links": [],
@@ -3761,7 +3761,7 @@
             "h": 3,
             "w": 3,
             "x": 6,
-            "y": 20
+            "y": 2
           },
           "id": 242,
           "maxPerRow": 6,
@@ -3842,7 +3842,7 @@
             "h": 3,
             "w": 3,
             "x": 9,
-            "y": 20
+            "y": 2
           },
           "id": 243,
           "maxPerRow": 6,
@@ -3909,7 +3909,7 @@
             "h": 3,
             "w": 10,
             "x": 12,
-            "y": 20
+            "y": 2
           },
           "hiddenSeries": false,
           "id": 230,
@@ -4081,10 +4081,10 @@
             ]
           },
           "gridPos": {
-            "h": 2,
+            "h": 3,
             "w": 2,
             "x": 22,
-            "y": 20
+            "y": 2
           },
           "id": 298,
           "links": [],
@@ -4131,6 +4131,590 @@
           "title": "VPN",
           "transformations": [],
           "type": "stat"
+        },
+        {
+          "datasource": null,
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 0,
+            "y": 5
+          },
+          "id": 299,
+          "links": [
+            {
+              "targetBlank": true,
+              "title": "Drill down: cluster compute",
+              "url": "d/efa86fd1d0c121a26444b636a3f509a8/kubernetes-compute-resources-cluster?orgId=1&refresh=10s&var-datasource=ace-nctu&${__url_time_range}"
+            },
+            {
+              "targetBlank": true,
+              "title": "Drill down: cluster networking",
+              "url": "d/ff635a025bcfea7bc3dd4f508990a3e9/kubernetes-networking-cluster?orgId=1&refresh=10s&var-resolution=5m&var-interval=4h&var-datasource=ace-nctu&${__url_time_range}"
+            },
+            {
+              "targetBlank": true,
+              "title": "Drill down: nodes",
+              "url": "d/fa49a4706d07a042595b664c87fb33ea/nodes?orgId=1&var-datasource=ace-nctu&${__url_time_range}"
+            },
+            {
+              "targetBlank": true,
+              "title": "Drill down: logs",
+              "url": "d/e2QUYvPMk/kubernetes-logs-pod?orgId=1&refresh=10s&var-es_datasource=ace-nctu-es&var-es_namespace=omec&${__url_time_range}"
+            }
+          ],
+          "options": {
+            "content": "# NCTU",
+            "mode": "markdown"
+          },
+          "pluginVersion": "7.1.0",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "",
+          "type": "text"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 1,
+                  "operator": "",
+                  "text": "err",
+                  "to": "",
+                  "type": 1,
+                  "value": "-1"
+                },
+                {
+                  "from": "",
+                  "id": 2,
+                  "operator": "",
+                  "text": "fail",
+                  "to": "",
+                  "type": 1,
+                  "value": "0"
+                },
+                {
+                  "from": "",
+                  "id": 3,
+                  "operator": "",
+                  "text": "?",
+                  "to": "",
+                  "type": 1,
+                  "value": "1"
+                },
+                {
+                  "from": "",
+                  "id": 4,
+                  "operator": "",
+                  "text": "ok",
+                  "to": "",
+                  "type": 1,
+                  "value": "2"
+                },
+                {
+                  "from": "",
+                  "id": 5,
+                  "operator": "",
+                  "text": "X",
+                  "to": "",
+                  "type": 1,
+                  "value": "-2"
+                },
+                {
+                  "from": "-100",
+                  "id": 6,
+                  "operator": "",
+                  "text": "maint",
+                  "to": "-3",
+                  "type": 2
+                }
+              ],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#6ED0E0",
+                    "value": -100
+                  },
+                  {
+                    "color": "red",
+                    "value": -2
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 1
+                  },
+                  {
+                    "color": "green",
+                    "value": 2
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 3,
+            "y": 5
+          },
+          "id": 300,
+          "links": [],
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "last"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "targets": [
+            {
+              "expr": "sum(aetheredge_status_control_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-nctu\"}))",
+              "interval": "",
+              "legendFormat": "Connect:",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_status_user_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-nctu\"}))",
+              "interval": "",
+              "legendFormat": "Ping:",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Test results",
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 50
+                  },
+                  {
+                    "color": "green",
+                    "value": 95
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 6,
+            "y": 5
+          },
+          "id": 301,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "targets": [
+            {
+              "expr": "sum(clamp_min(aetheredge_status_control_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} - 1, 0) * 100)",
+              "hide": true,
+              "interval": "",
+              "legendFormat": "Control Plane",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(clamp_min(aetheredge_status_user_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} - 1, 0) * 100)",
+              "hide": true,
+              "interval": "",
+              "legendFormat": "User Plane",
+              "refId": "B"
+            },
+            {
+              "expr": "sum(clamp_min(aetheredge_status_control_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} + aetheredge_status_user_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} - 3, 0) * 100)",
+              "interval": "",
+              "legendFormat": "",
+              "refId": "C"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Uptime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "decimals": 3,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "#EAB839",
+                    "value": 1
+                  },
+                  {
+                    "color": "red",
+                    "value": 10
+                  }
+                ]
+              },
+              "unit": "percent"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 3,
+            "x": 9,
+            "y": 5
+          },
+          "id": 302,
+          "maxPerRow": 6,
+          "options": {
+            "colorMode": "background",
+            "graphMode": "none",
+            "justifyMode": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "mean"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "auto"
+          },
+          "pluginVersion": "7.1.5",
+          "repeatDirection": "h",
+          "targets": [
+            {
+              "expr": "sum(clamp_min(1 - (clamp_min(aetheredge_status_control_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} + aetheredge_status_user_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} - 3, 0) + aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-nctu\"}), 0)) * 100",
+              "interval": "",
+              "legendFormat": "Unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-nctu\"}) * 100",
+              "interval": "",
+              "legendFormat": "Scheduled",
+              "refId": "B"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Downtime",
+          "transformations": [],
+          "type": "stat"
+        },
+        {
+          "aliasColors": {
+            "Down, unsched": "red",
+            "Down: unscheduled": "red",
+            "Scheduled": "blue",
+            "Scheduled downtime": "blue",
+            "Test down": "yellow",
+            "Unscheduled": "red",
+            "Unscheduled downtime": "red"
+          },
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "RANCHER_MONITORING_GLOBAL",
+          "description": "Uptime and downtime over time",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "fill": 10,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 3,
+            "w": 10,
+            "x": 12,
+            "y": 5
+          },
+          "hiddenSeries": false,
+          "id": 303,
+          "legend": {
+            "alignAsTable": false,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 0,
+          "maxPerRow": 6,
+          "nullPointMode": "null",
+          "options": {
+            "alertThreshold": true
+          },
+          "percentage": false,
+          "pluginVersion": "7.1.5",
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "repeatDirection": "h",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": true,
+          "targets": [
+            {
+              "expr": "sum(clamp_min(aetheredge_status_control_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} + aetheredge_status_user_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} - 3, 0) - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-nctu\"})",
+              "interval": "",
+              "legendFormat": "Up",
+              "refId": "D"
+            },
+            {
+              "expr": "-1 * sum(clamp_min(1 - (clamp_min(aetheredge_status_control_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} + aetheredge_status_user_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} - 3, 0) + aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-nctu\"}), 0))",
+              "interval": "",
+              "legendFormat": "Down: unscheduled",
+              "refId": "A"
+            },
+            {
+              "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-nctu\"})",
+              "interval": "",
+              "legendFormat": "Down: scheduled",
+              "refId": "B"
+            },
+            {
+              "expr": "-1 * sum(clamp_min((aetheredge_status_control_plane{endpoint=\"metrics80\",name=\"ace-nctu\"} * -1) - 1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-nctu\"}, 0))",
+              "interval": "",
+              "legendFormat": "Test down",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:93",
+              "decimals": 0,
+              "format": "short",
+              "label": "",
+              "logBase": 1,
+              "max": "1",
+              "min": "-1",
+              "show": true
+            },
+            {
+              "$$hashKey": "object:94",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "datasource": "Google Cloud Monitoring",
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "mappings": [
+                {
+                  "from": "",
+                  "id": 0,
+                  "operator": "",
+                  "text": "down",
+                  "to": "",
+                  "type": 1,
+                  "value": "0"
+                },
+                {
+                  "from": "",
+                  "id": 1,
+                  "operator": "",
+                  "text": "up",
+                  "to": "",
+                  "type": 1,
+                  "value": "1"
+                }
+              ],
+              "max": 1,
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "green",
+                    "value": 1
+                  }
+                ]
+              }
+            },
+            "overrides": [
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "production-ace-nctu-1"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Link 1"
+                  }
+                ]
+              },
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "production-ace-nctu-2"
+                },
+                "properties": [
+                  {
+                    "id": "displayName",
+                    "value": "Link 2"
+                  }
+                ]
+              }
+            ]
+          },
+          "gridPos": {
+            "h": 3,
+            "w": 2,
+            "x": 22,
+            "y": 5
+          },
+          "id": 304,
+          "links": [],
+          "options": {
+            "colorMode": "background",
+            "graphMode": "area",
+            "justifyMode": "center",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "last"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "textMode": "name"
+          },
+          "pluginVersion": "7.1.5",
+          "targets": [
+            {
+              "metricQuery": {
+                "aliasBy": "{{ metric.label.tunnel_name }}",
+                "alignmentPeriod": "stackdriver-auto",
+                "crossSeriesReducer": "REDUCE_NONE",
+                "filters": [
+                  "metric.label.tunnel_name",
+                  "=",
+                  "production-ace-nctu*"
+                ],
+                "groupBys": [],
+                "metricKind": "GAUGE",
+                "metricType": "vpn.googleapis.com/tunnel_established",
+                "perSeriesAligner": "ALIGN_INTERPOLATE",
+                "projectName": "onf-vpn",
+                "unit": "1",
+                "valueType": "DOUBLE"
+              },
+              "queryType": "metrics",
+              "refId": "A"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "VPN",
+          "transformations": [],
+          "type": "stat"
         }
       ],
       "repeat": null,
@@ -4834,5 +5418,5 @@
   "timezone": "",
   "title": "Aether Connected Edge",
   "uid": "Y2z8vDtGz",
-  "version": 3
+  "version": 4
 }
\ No newline at end of file