diff --git a/monitoring/grafana-aether/Chart.yaml b/monitoring/grafana-aether/Chart.yaml
index f8ba210..3727856 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.2.2
+version: 0.2.3
 
 appVersion: 0.1.0
diff --git a/monitoring/grafana-aether/dashboards/global-edge-status.json b/monitoring/grafana-aether/dashboards/global-edge-status.json
index 7ad3039..5e9aec3 100644
--- a/monitoring/grafana-aether/dashboards/global-edge-status.json
+++ b/monitoring/grafana-aether/dashboards/global-edge-status.json
@@ -16,7 +16,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1599668410701,
+  "iteration": 1601424820237,
   "links": [],
   "panels": [
     {
@@ -309,7 +309,7 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 6,
+        "w": 4.8,
         "x": 0,
         "y": 4
       },
@@ -334,8 +334,8 @@
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-intel",
-          "value": "production-edge-intel"
+          "text": "ace-argela",
+          "value": "ace-argela"
         }
       },
       "targets": [
@@ -448,8 +448,8 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 6,
-        "x": 6,
+        "w": 4.8,
+        "x": 4.8,
         "y": 4
       },
       "id": 34,
@@ -470,13 +470,13 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
+      "repeatIteration": 1601424820237,
       "repeatPanelId": 4,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-onf-menlo",
-          "value": "production-edge-onf-menlo"
+          "text": "ace-intel",
+          "value": "ace-intel"
         }
       },
       "targets": [
@@ -589,8 +589,8 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 6,
-        "x": 12,
+        "w": 4.8,
+        "x": 9.6,
         "y": 4
       },
       "id": 35,
@@ -611,13 +611,13 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
+      "repeatIteration": 1601424820237,
       "repeatPanelId": 4,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-onf-tucson",
-          "value": "production-edge-onf-tucson"
+          "text": "ace-menlo-pixel",
+          "value": "ace-menlo-pixel"
         }
       },
       "targets": [
@@ -730,8 +730,8 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 6,
-        "x": 18,
+        "w": 4.8,
+        "x": 14.399999999999999,
         "y": 4
       },
       "id": 36,
@@ -752,13 +752,154 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
+      "repeatIteration": 1601424820237,
       "repeatPanelId": 4,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-test",
-          "value": "production-edge-test"
+          "text": "ace-menlo-rasp-pi",
+          "value": "ace-menlo-rasp-pi"
+        }
+      },
+      "targets": [
+        {
+          "expr": "sum(aetheredge_status_control_plane{name=\"$edge\"} - (10*aetheredge_in_maintenance_window{name=\"$edge\"}))",
+          "interval": "",
+          "legendFormat": "Control Plane",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(aetheredge_status_user_plane{name=\"$edge\"} - (10*aetheredge_in_maintenance_window{name=\"$edge\"}))",
+          "interval": "",
+          "legendFormat": "User Plane",
+          "refId": "B"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Current: $edge",
+      "type": "stat"
+    },
+    {
+      "datasource": null,
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "mappings": [
+            {
+              "from": "",
+              "id": 1,
+              "operator": "",
+              "text": "error",
+              "to": "",
+              "type": 1,
+              "value": "-1"
+            },
+            {
+              "from": "",
+              "id": 2,
+              "operator": "",
+              "text": "disconnected",
+              "to": "",
+              "type": 1,
+              "value": "0"
+            },
+            {
+              "from": "",
+              "id": 3,
+              "operator": "",
+              "text": "connecting",
+              "to": "",
+              "type": 1,
+              "value": "1"
+            },
+            {
+              "from": "",
+              "id": 4,
+              "operator": "",
+              "text": "connected",
+              "to": "",
+              "type": 1,
+              "value": "2"
+            },
+            {
+              "from": "",
+              "id": 5,
+              "operator": "",
+              "text": "no result",
+              "to": "",
+              "type": 1,
+              "value": "-2"
+            },
+            {
+              "from": "-100",
+              "id": 6,
+              "operator": "",
+              "text": "scheduled downtime",
+              "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": 4,
+        "w": 4.8,
+        "x": 19.2,
+        "y": 4
+      },
+      "id": 37,
+      "maxPerRow": 6,
+      "options": {
+        "colorMode": "background",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "last"
+          ],
+          "fields": "",
+          "values": false
+        }
+      },
+      "pluginVersion": "7.0.5",
+      "repeat": null,
+      "repeatDirection": "h",
+      "repeatIteration": 1601424820237,
+      "repeatPanelId": 4,
+      "scopedVars": {
+        "edge": {
+          "selected": false,
+          "text": "ace-tucson",
+          "value": "ace-tucson"
         }
       },
       "targets": [
@@ -809,7 +950,7 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 6,
+        "w": 4.8,
         "x": 0,
         "y": 8
       },
@@ -834,8 +975,8 @@
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-intel",
-          "value": "production-edge-intel"
+          "text": "ace-argela",
+          "value": "ace-argela"
         }
       },
       "targets": [
@@ -887,88 +1028,8 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 6,
-        "x": 6,
-        "y": 8
-      },
-      "id": 37,
-      "maxPerRow": 6,
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "fields": "",
-          "values": false
-        }
-      },
-      "pluginVersion": "7.0.5",
-      "repeat": null,
-      "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
-      "repeatPanelId": 5,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "production-edge-onf-menlo",
-          "value": "production-edge-onf-menlo"
-        }
-      },
-      "targets": [
-        {
-          "expr": "sum(clamp_min(aetheredge_status_control_plane{name=\"$edge\"} - 1, 0) * 100)",
-          "interval": "",
-          "legendFormat": "Control Plane",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(clamp_min(aetheredge_status_user_plane{name=\"$edge\"} - 1, 0) * 100)",
-          "interval": "",
-          "legendFormat": "User Plane",
-          "refId": "B"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Uptime: $edge",
-      "transformations": [],
-      "type": "stat"
-    },
-    {
-      "datasource": null,
-      "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": 4,
-        "w": 6,
-        "x": 12,
+        "w": 4.8,
+        "x": 4.8,
         "y": 8
       },
       "id": 38,
@@ -989,13 +1050,13 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
+      "repeatIteration": 1601424820237,
       "repeatPanelId": 5,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-onf-tucson",
-          "value": "production-edge-onf-tucson"
+          "text": "ace-intel",
+          "value": "ace-intel"
         }
       },
       "targets": [
@@ -1047,8 +1108,8 @@
       },
       "gridPos": {
         "h": 4,
-        "w": 6,
-        "x": 18,
+        "w": 4.8,
+        "x": 9.6,
         "y": 8
       },
       "id": 39,
@@ -1069,13 +1130,173 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
+      "repeatIteration": 1601424820237,
       "repeatPanelId": 5,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-test",
-          "value": "production-edge-test"
+          "text": "ace-menlo-pixel",
+          "value": "ace-menlo-pixel"
+        }
+      },
+      "targets": [
+        {
+          "expr": "sum(clamp_min(aetheredge_status_control_plane{name=\"$edge\"} - 1, 0) * 100)",
+          "interval": "",
+          "legendFormat": "Control Plane",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(clamp_min(aetheredge_status_user_plane{name=\"$edge\"} - 1, 0) * 100)",
+          "interval": "",
+          "legendFormat": "User Plane",
+          "refId": "B"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Uptime: $edge",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": null,
+      "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": 4,
+        "w": 4.8,
+        "x": 14.399999999999999,
+        "y": 8
+      },
+      "id": 40,
+      "maxPerRow": 6,
+      "options": {
+        "colorMode": "background",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        }
+      },
+      "pluginVersion": "7.0.5",
+      "repeat": null,
+      "repeatDirection": "h",
+      "repeatIteration": 1601424820237,
+      "repeatPanelId": 5,
+      "scopedVars": {
+        "edge": {
+          "selected": false,
+          "text": "ace-menlo-rasp-pi",
+          "value": "ace-menlo-rasp-pi"
+        }
+      },
+      "targets": [
+        {
+          "expr": "sum(clamp_min(aetheredge_status_control_plane{name=\"$edge\"} - 1, 0) * 100)",
+          "interval": "",
+          "legendFormat": "Control Plane",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(clamp_min(aetheredge_status_user_plane{name=\"$edge\"} - 1, 0) * 100)",
+          "interval": "",
+          "legendFormat": "User Plane",
+          "refId": "B"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Uptime: $edge",
+      "transformations": [],
+      "type": "stat"
+    },
+    {
+      "datasource": null,
+      "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": 4,
+        "w": 4.8,
+        "x": 19.2,
+        "y": 8
+      },
+      "id": 41,
+      "maxPerRow": 6,
+      "options": {
+        "colorMode": "background",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        }
+      },
+      "pluginVersion": "7.0.5",
+      "repeat": null,
+      "repeatDirection": "h",
+      "repeatIteration": 1601424820237,
+      "repeatPanelId": 5,
+      "scopedVars": {
+        "edge": {
+          "selected": false,
+          "text": "ace-tucson",
+          "value": "ace-tucson"
         }
       },
       "targets": [
@@ -1128,7 +1349,7 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 5,
-        "w": 6,
+        "w": 4.8,
         "x": 0,
         "y": 12
       },
@@ -1160,8 +1381,8 @@
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-intel",
-          "value": "production-edge-intel"
+          "text": "ace-argela",
+          "value": "ace-argela"
         }
       },
       "seriesOverrides": [],
@@ -1256,268 +1477,8 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 5,
-        "w": 6,
-        "x": 6,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 40,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 0,
-      "maxPerRow": 6,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pluginVersion": "7.0.5",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeat": null,
-      "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
-      "repeatPanelId": 23,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "production-edge-onf-menlo",
-          "value": "production-edge-onf-menlo"
-        }
-      },
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "sum(clamp_min(aetheredge_status_control_plane{name=\"$edge\"} + aetheredge_status_user_plane{name=\"$edge\"} - 3, 0))",
-          "interval": "",
-          "legendFormat": "Edge is up",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_in_maintenance_window{name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Scheduled downtime",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Status: ${edge}",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:453",
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "1",
-          "min": "0",
-          "show": true
-        },
-        {
-          "$$hashKey": "object:454",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "fill": 5,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 5,
-        "w": 6,
-        "x": 12,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 41,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 0,
-      "maxPerRow": 6,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pluginVersion": "7.0.5",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "repeat": null,
-      "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
-      "repeatPanelId": 23,
-      "scopedVars": {
-        "edge": {
-          "selected": false,
-          "text": "production-edge-onf-tucson",
-          "value": "production-edge-onf-tucson"
-        }
-      },
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": true,
-      "targets": [
-        {
-          "expr": "sum(clamp_min(aetheredge_status_control_plane{name=\"$edge\"} + aetheredge_status_user_plane{name=\"$edge\"} - 3, 0))",
-          "interval": "",
-          "legendFormat": "Edge is up",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(aetheredge_in_maintenance_window{name=\"$edge\"})",
-          "interval": "",
-          "legendFormat": "Scheduled downtime",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Status: ${edge}",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:453",
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": "1",
-          "min": "0",
-          "show": true
-        },
-        {
-          "$$hashKey": "object:454",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "fill": 5,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 5,
-        "w": 6,
-        "x": 18,
+        "w": 4.8,
+        "x": 4.8,
         "y": 12
       },
       "hiddenSeries": false,
@@ -1545,13 +1506,403 @@
       "renderer": "flot",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
+      "repeatIteration": 1601424820237,
       "repeatPanelId": 23,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-test",
-          "value": "production-edge-test"
+          "text": "ace-intel",
+          "value": "ace-intel"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": true,
+      "targets": [
+        {
+          "expr": "sum(clamp_min(aetheredge_status_control_plane{name=\"$edge\"} + aetheredge_status_user_plane{name=\"$edge\"} - 3, 0))",
+          "interval": "",
+          "legendFormat": "Edge is up",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(aetheredge_in_maintenance_window{name=\"$edge\"})",
+          "interval": "",
+          "legendFormat": "Scheduled downtime",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Status: ${edge}",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:453",
+          "decimals": 0,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": "1",
+          "min": "0",
+          "show": true
+        },
+        {
+          "$$hashKey": "object:454",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "fill": 5,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 5,
+        "w": 4.8,
+        "x": 9.6,
+        "y": 12
+      },
+      "hiddenSeries": false,
+      "id": 43,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 0,
+      "maxPerRow": 6,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pluginVersion": "7.0.5",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatDirection": "h",
+      "repeatIteration": 1601424820237,
+      "repeatPanelId": 23,
+      "scopedVars": {
+        "edge": {
+          "selected": false,
+          "text": "ace-menlo-pixel",
+          "value": "ace-menlo-pixel"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": true,
+      "targets": [
+        {
+          "expr": "sum(clamp_min(aetheredge_status_control_plane{name=\"$edge\"} + aetheredge_status_user_plane{name=\"$edge\"} - 3, 0))",
+          "interval": "",
+          "legendFormat": "Edge is up",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(aetheredge_in_maintenance_window{name=\"$edge\"})",
+          "interval": "",
+          "legendFormat": "Scheduled downtime",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Status: ${edge}",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:453",
+          "decimals": 0,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": "1",
+          "min": "0",
+          "show": true
+        },
+        {
+          "$$hashKey": "object:454",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "fill": 5,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 5,
+        "w": 4.8,
+        "x": 14.399999999999999,
+        "y": 12
+      },
+      "hiddenSeries": false,
+      "id": 44,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 0,
+      "maxPerRow": 6,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pluginVersion": "7.0.5",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatDirection": "h",
+      "repeatIteration": 1601424820237,
+      "repeatPanelId": 23,
+      "scopedVars": {
+        "edge": {
+          "selected": false,
+          "text": "ace-menlo-rasp-pi",
+          "value": "ace-menlo-rasp-pi"
+        }
+      },
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": true,
+      "targets": [
+        {
+          "expr": "sum(clamp_min(aetheredge_status_control_plane{name=\"$edge\"} + aetheredge_status_user_plane{name=\"$edge\"} - 3, 0))",
+          "interval": "",
+          "legendFormat": "Edge is up",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(aetheredge_in_maintenance_window{name=\"$edge\"})",
+          "interval": "",
+          "legendFormat": "Scheduled downtime",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Status: ${edge}",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:453",
+          "decimals": 0,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": "1",
+          "min": "0",
+          "show": true
+        },
+        {
+          "$$hashKey": "object:454",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "fill": 5,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 5,
+        "w": 4.8,
+        "x": 19.2,
+        "y": 12
+      },
+      "hiddenSeries": false,
+      "id": 45,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 0,
+      "maxPerRow": 6,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pluginVersion": "7.0.5",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "repeat": null,
+      "repeatDirection": "h",
+      "repeatIteration": 1601424820237,
+      "repeatPanelId": 23,
+      "scopedVars": {
+        "edge": {
+          "selected": false,
+          "text": "ace-tucson",
+          "value": "ace-tucson"
         }
       },
       "seriesOverrides": [],
@@ -1641,7 +1992,7 @@
       },
       "gridPos": {
         "h": 5,
-        "w": 6,
+        "w": 4.8,
         "x": 0,
         "y": 17
       },
@@ -1665,8 +2016,8 @@
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-intel",
-          "value": "production-edge-intel"
+          "text": "ace-argela",
+          "value": "ace-argela"
         }
       },
       "targets": [
@@ -1707,11 +2058,11 @@
       },
       "gridPos": {
         "h": 5,
-        "w": 6,
-        "x": 6,
+        "w": 4.8,
+        "x": 4.8,
         "y": 17
       },
-      "id": 43,
+      "id": 46,
       "maxPerRow": 6,
       "options": {
         "orientation": "auto",
@@ -1728,13 +2079,13 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
+      "repeatIteration": 1601424820237,
       "repeatPanelId": 13,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-onf-menlo",
-          "value": "production-edge-onf-menlo"
+          "text": "ace-intel",
+          "value": "ace-intel"
         }
       },
       "targets": [
@@ -1775,11 +2126,11 @@
       },
       "gridPos": {
         "h": 5,
-        "w": 6,
-        "x": 12,
+        "w": 4.8,
+        "x": 9.6,
         "y": 17
       },
-      "id": 44,
+      "id": 47,
       "maxPerRow": 6,
       "options": {
         "orientation": "auto",
@@ -1796,13 +2147,13 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
+      "repeatIteration": 1601424820237,
       "repeatPanelId": 13,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-onf-tucson",
-          "value": "production-edge-onf-tucson"
+          "text": "ace-menlo-pixel",
+          "value": "ace-menlo-pixel"
         }
       },
       "targets": [
@@ -1843,11 +2194,11 @@
       },
       "gridPos": {
         "h": 5,
-        "w": 6,
-        "x": 18,
+        "w": 4.8,
+        "x": 14.399999999999999,
         "y": 17
       },
-      "id": 45,
+      "id": 48,
       "maxPerRow": 6,
       "options": {
         "orientation": "auto",
@@ -1864,13 +2215,81 @@
       "pluginVersion": "7.0.5",
       "repeat": null,
       "repeatDirection": "h",
-      "repeatIteration": 1599668410701,
+      "repeatIteration": 1601424820237,
       "repeatPanelId": 13,
       "scopedVars": {
         "edge": {
           "selected": false,
-          "text": "production-edge-test",
-          "value": "production-edge-test"
+          "text": "ace-menlo-rasp-pi",
+          "value": "ace-menlo-rasp-pi"
+        }
+      },
+      "targets": [
+        {
+          "expr": "sum(time() - aetheredge_last_update{name=\"$edge\"})",
+          "interval": "",
+          "legendFormat": "{{name}}",
+          "refId": "A"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Seconds since last update",
+      "type": "gauge"
+    },
+    {
+      "datasource": "RANCHER_MONITORING_GLOBAL",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "mappings": [],
+          "max": 1000,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 750
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 4.8,
+        "x": 19.2,
+        "y": 17
+      },
+      "id": 49,
+      "maxPerRow": 6,
+      "options": {
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "last"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true
+      },
+      "pluginVersion": "7.0.5",
+      "repeat": null,
+      "repeatDirection": "h",
+      "repeatIteration": 1601424820237,
+      "repeatPanelId": 13,
+      "scopedVars": {
+        "edge": {
+          "selected": false,
+          "text": "ace-tucson",
+          "value": "ace-tucson"
         }
       },
       "targets": [
@@ -1936,7 +2355,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(time() - aetheredge_last_update) by (name)",
+          "expr": "sum(time() - aetheredge_last_update{name!~\"production.*|.*dongle\"}) by (name)",
           "interval": "",
           "legendFormat": "{{name}}",
           "refId": "A"
@@ -1996,7 +2415,6 @@
         "allValue": null,
         "current": {
           "selected": true,
-          "tags": [],
           "text": "All",
           "value": [
             "$__all"
@@ -2012,7 +2430,7 @@
         "options": [],
         "query": "aetheredge_status_control_plane",
         "refresh": 1,
-        "regex": "/.*,name=\"(.*)\",namespace.*/",
+        "regex": "/.*,name=\"(?!ace-menlo-dongle)(ace-.*)\",namespace.*/",
         "skipUrlSync": false,
         "sort": 1,
         "tagValuesQuery": "",
@@ -2044,4 +2462,4 @@
   "title": "Aether Connected Edge",
   "uid": "AIKTPZVMk",
   "version": 1
-}
+}
\ No newline at end of file
diff --git a/monitoring/grafana-aether/templates/dashboard-configmap.yaml b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
index 7792ce1..22cf549 100644
--- a/monitoring/grafana-aether/templates/dashboard-configmap.yaml
+++ b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
@@ -8,9 +8,19 @@
   labels:
      grafana_dashboard: "1"
 data:
+{{- if .Values.globalDashboard }}
 {{- if and .Values.edgeServerDatasourceURL .Values.googleCloudMonitoring }}
 {{ (.Files.Glob "dashboards/global*.json").AsConfig | indent 2 }}
 {{- end }}
+{{- end }}
+{{- if .Values.multiSiteDashboard }}
 {{- if and .Values.edgeServerDatasourceURL .Values.clusterDatasources }}
 {{ (.Files.Glob "dashboards/multi*.json").AsConfig | indent 2 }}
 {{- end }}
+{{- end }}
+{{- if .Values.enterpriseDashboard }}
+{{- if and .Values.edgeServerDatasourceURL .Values.clusterDatasources }}
+{{- $path := printf "dashboards/%s*.json" .Values.enterpriseDashboard }}
+{{ (.Files.Glob $path).AsConfig | indent 2 }}
+{{- end }}
+{{- end }}
diff --git a/monitoring/grafana-aether/values.yaml b/monitoring/grafana-aether/values.yaml
index f7053ff..9d8ad47 100644
--- a/monitoring/grafana-aether/values.yaml
+++ b/monitoring/grafana-aether/values.yaml
@@ -8,6 +8,12 @@
 nameOverride: ""
 fullnameOverride: ""
 
+globalDashboard: true
+multiSiteDashboard: true
+
+# Specify an enterprise to deploy its dashboard, i.e., "telefonica"
+enterpriseDashboard: ""
+
 # URL of Prometheus that collects E2E test results from edge monitoring server
 edgeServerDatasourceURL: ""