diff --git a/monitoring/grafana-aether/dashboards/global-edge-status-production.json b/monitoring/grafana-aether/dashboards/global-edge-status-production.json
index 46af3fc..41d1ebb 100644
--- a/monitoring/grafana-aether/dashboards/global-edge-status-production.json
+++ b/monitoring/grafana-aether/dashboards/global-edge-status-production.json
@@ -612,576 +612,6 @@
             "x": 0,
             "y": 4
           },
-          "id": 252,
-          "links": [
-            {
-              "targetBlank": true,
-              "title": "Drill down: cluster compute",
-              "url": "d/efa86fd1d0c121a26444b636a3f509a8/kubernetes-compute-resources-cluster?orgId=1&refresh=10s&var-datasource=ace-menlo-pixel&${__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-menlo-pixel&${__url_time_range}"
-            },
-            {
-              "targetBlank": true,
-              "title": "Drill down: nodes",
-              "url": "d/fa49a4706d07a042595b664c87fb33ea/nodes?orgId=1&var-datasource=ace-menlo-pixel&${__url_time_range}"
-            }
-          ],
-          "options": {
-            "content": "# ONF\n### Menlo Park\n##### Pixel phone test",
-            "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": 4
-          },
-          "id": 227,
-          "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-menlo-pixel\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"}))",
-              "interval": "",
-              "legendFormat": "Connect:",
-              "refId": "A"
-            },
-            {
-              "expr": "sum(aetheredge_status_user_plane{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"} - (10*aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"}))",
-              "interval": "",
-              "legendFormat": "Ping:",
-              "refId": "B"
-            }
-          ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Test results",
-          "type": "stat"
-        },
-        {
-          "datasource": "RANCHER_MONITORING_GLOBAL",
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "custom": {},
-              "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": 4
-          },
-          "id": 228,
-          "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-menlo-pixel\"} - 1, 0) * 100)",
-              "interval": "",
-              "legendFormat": "Control Plane",
-              "refId": "A"
-            },
-            {
-              "expr": "sum(clamp_min(aetheredge_status_user_plane{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"} - 1, 0) * 100)",
-              "interval": "",
-              "legendFormat": "User Plane",
-              "refId": "B"
-            }
-          ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Uptime",
-          "transformations": [],
-          "type": "stat"
-        },
-        {
-          "datasource": "RANCHER_MONITORING_GLOBAL",
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "custom": {},
-              "decimals": 0,
-              "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": 4
-          },
-          "id": 229,
-          "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-menlo-pixel\"} + aetheredge_status_user_plane{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"} - 3, 0) + aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"}), 0)) * 100",
-              "interval": "",
-              "legendFormat": "Unscheduled",
-              "refId": "A"
-            },
-            {
-              "expr": "sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"}) * 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": 4
-          },
-          "hiddenSeries": false,
-          "id": 244,
-          "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-menlo-pixel\"} + aetheredge_status_user_plane{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"} - 3, 0) - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"})",
-              "interval": "",
-              "legendFormat": "Up",
-              "refId": "D"
-            },
-            {
-              "expr": "-1 * sum(clamp_min(1 - (clamp_min(aetheredge_status_control_plane{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"} + aetheredge_status_user_plane{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"} - 3, 0) + aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"}), 0))",
-              "interval": "",
-              "legendFormat": "Down: unscheduled",
-              "refId": "A"
-            },
-            {
-              "expr": "-1 * sum(aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"})",
-              "interval": "",
-              "legendFormat": "Down: scheduled",
-              "refId": "B"
-            },
-            {
-              "expr": "-1 * sum(clamp_min((aetheredge_status_control_plane{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"} * -1) - 1 - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-menlo-pixel\"}, 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-menlo-1"
-                },
-                "properties": [
-                  {
-                    "id": "displayName",
-                    "value": "Link 1"
-                  }
-                ]
-              },
-              {
-                "matcher": {
-                  "id": "byName",
-                  "options": "production-ace-menlo-2"
-                },
-                "properties": [
-                  {
-                    "id": "displayName",
-                    "value": "Link 2"
-                  }
-                ]
-              }
-            ]
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 2,
-            "x": 22,
-            "y": 4
-          },
-          "id": 292,
-          "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-menlo*"
-                ],
-                "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"
-        },
-        {
-          "datasource": null,
-          "fieldConfig": {
-            "defaults": {
-              "custom": {}
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 3,
-            "x": 0,
-            "y": 7
-          },
           "id": 253,
           "links": [
             {
@@ -1303,7 +733,7 @@
             "h": 3,
             "w": 3,
             "x": 3,
-            "y": 7
+            "y": 4
           },
           "id": 232,
           "links": [],
@@ -1375,7 +805,7 @@
             "h": 3,
             "w": 3,
             "x": 6,
-            "y": 7
+            "y": 4
           },
           "id": 233,
           "maxPerRow": 6,
@@ -1448,7 +878,7 @@
             "h": 3,
             "w": 3,
             "x": 9,
-            "y": 7
+            "y": 4
           },
           "id": 234,
           "maxPerRow": 6,
@@ -1515,7 +945,7 @@
             "h": 3,
             "w": 10,
             "x": 12,
-            "y": 7
+            "y": 4
           },
           "hiddenSeries": false,
           "id": 235,
@@ -1690,7 +1120,7 @@
             "h": 3,
             "w": 2,
             "x": 22,
-            "y": 7
+            "y": 4
           },
           "id": 293,
           "links": [],
@@ -1750,7 +1180,7 @@
             "h": 3,
             "w": 3,
             "x": 0,
-            "y": 10
+            "y": 7
           },
           "id": 254,
           "links": [
@@ -1873,7 +1303,7 @@
             "h": 3,
             "w": 3,
             "x": 3,
-            "y": 10
+            "y": 7
           },
           "id": 237,
           "links": [],
@@ -1945,7 +1375,7 @@
             "h": 3,
             "w": 3,
             "x": 6,
-            "y": 10
+            "y": 7
           },
           "id": 238,
           "maxPerRow": 6,
@@ -2018,7 +1448,7 @@
             "h": 3,
             "w": 3,
             "x": 9,
-            "y": 10
+            "y": 7
           },
           "id": 239,
           "maxPerRow": 6,
@@ -2085,7 +1515,7 @@
             "h": 3,
             "w": 10,
             "x": 12,
-            "y": 10
+            "y": 7
           },
           "hiddenSeries": false,
           "id": 240,
@@ -2260,7 +1690,7 @@
             "h": 3,
             "w": 2,
             "x": 22,
-            "y": 10
+            "y": 7
           },
           "id": 294,
           "links": [],
@@ -2320,7 +1750,7 @@
             "h": 3,
             "w": 3,
             "x": 0,
-            "y": 13
+            "y": 10
           },
           "id": 255,
           "links": [
@@ -2443,7 +1873,7 @@
             "h": 3,
             "w": 3,
             "x": 3,
-            "y": 13
+            "y": 10
           },
           "id": 266,
           "links": [],
@@ -2515,7 +1945,7 @@
             "h": 3,
             "w": 3,
             "x": 6,
-            "y": 13
+            "y": 10
           },
           "id": 269,
           "maxPerRow": 6,
@@ -2588,7 +2018,7 @@
             "h": 3,
             "w": 3,
             "x": 9,
-            "y": 13
+            "y": 10
           },
           "id": 272,
           "maxPerRow": 6,
@@ -2655,7 +2085,7 @@
             "h": 3,
             "w": 10,
             "x": 12,
-            "y": 13
+            "y": 10
           },
           "hiddenSeries": false,
           "id": 275,
@@ -2830,7 +2260,7 @@
             "h": 3,
             "w": 2,
             "x": 22,
-            "y": 13
+            "y": 10
           },
           "id": 297,
           "links": [],
@@ -2890,7 +2320,7 @@
             "h": 3,
             "w": 3,
             "x": 0,
-            "y": 16
+            "y": 13
           },
           "id": 256,
           "links": [
@@ -3013,7 +2443,7 @@
             "h": 3,
             "w": 3,
             "x": 3,
-            "y": 16
+            "y": 13
           },
           "id": 267,
           "links": [],
@@ -3085,7 +2515,7 @@
             "h": 3,
             "w": 3,
             "x": 6,
-            "y": 16
+            "y": 13
           },
           "id": 270,
           "maxPerRow": 6,
@@ -3158,7 +2588,7 @@
             "h": 3,
             "w": 3,
             "x": 9,
-            "y": 16
+            "y": 13
           },
           "id": 273,
           "maxPerRow": 6,
@@ -3225,7 +2655,7 @@
             "h": 3,
             "w": 10,
             "x": 12,
-            "y": 16
+            "y": 13
           },
           "hiddenSeries": false,
           "id": 276,
@@ -3400,7 +2830,7 @@
             "h": 3,
             "w": 2,
             "x": 22,
-            "y": 16
+            "y": 13
           },
           "id": 296,
           "links": [],
@@ -3460,7 +2890,7 @@
             "h": 3,
             "w": 3,
             "x": 0,
-            "y": 19
+            "y": 16
           },
           "id": 257,
           "links": [
@@ -3583,7 +3013,7 @@
             "h": 3,
             "w": 3,
             "x": 3,
-            "y": 19
+            "y": 16
           },
           "id": 268,
           "links": [],
@@ -3655,7 +3085,7 @@
             "h": 3,
             "w": 3,
             "x": 6,
-            "y": 19
+            "y": 16
           },
           "id": 271,
           "maxPerRow": 6,
@@ -3728,7 +3158,7 @@
             "h": 3,
             "w": 3,
             "x": 9,
-            "y": 19
+            "y": 16
           },
           "id": 274,
           "maxPerRow": 6,
@@ -3795,7 +3225,7 @@
             "h": 3,
             "w": 10,
             "x": 12,
-            "y": 19
+            "y": 16
           },
           "hiddenSeries": false,
           "id": 277,
@@ -3970,7 +3400,7 @@
             "h": 3,
             "w": 2,
             "x": 22,
-            "y": 19
+            "y": 16
           },
           "id": 295,
           "links": [],