diff --git a/monitoring/grafana-aether/Chart.yaml b/monitoring/grafana-aether/Chart.yaml
index d34f620..4c2f296 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.18
+version: 0.6.0
 
 appVersion: 0.1.0
diff --git a/monitoring/grafana-aether/dashboards/global-edge-status-staging.json b/monitoring/grafana-aether/dashboards/global-edge-status-staging.json
index 43eec85..69a7801 100644
--- a/monitoring/grafana-aether/dashboards/global-edge-status-staging.json
+++ b/monitoring/grafana-aether/dashboards/global-edge-status-staging.json
@@ -18,6 +18,20 @@
   "links": [],
   "panels": [
     {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 291,
+      "panels": [],
+      "title": "Edge Status",
+      "type": "row"
+    },
+    {
       "datasource": null,
       "fieldConfig": {
         "defaults": {
@@ -29,7 +43,7 @@
         "h": 3,
         "w": 3,
         "x": 0,
-        "y": 0
+        "y": 1
       },
       "id": 251,
       "links": [
@@ -157,7 +171,7 @@
         "h": 3,
         "w": 3,
         "x": 3,
-        "y": 0
+        "y": 1
       },
       "id": 241,
       "links": [],
@@ -229,7 +243,7 @@
         "h": 3,
         "w": 3,
         "x": 6,
-        "y": 0
+        "y": 1
       },
       "id": 242,
       "maxPerRow": 6,
@@ -302,7 +316,7 @@
         "h": 3,
         "w": 3,
         "x": 9,
-        "y": 0
+        "y": 1
       },
       "id": 243,
       "maxPerRow": 6,
@@ -369,7 +383,7 @@
         "h": 3,
         "w": 12,
         "x": 12,
-        "y": 0
+        "y": 1
       },
       "hiddenSeries": false,
       "id": 230,
@@ -478,7 +492,199 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 3
+        "y": 4
+      },
+      "id": 293,
+      "panels": [],
+      "title": "Ping Latency - Results Over Time",
+      "type": "row"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 0,
+        "y": 5
+      },
+      "id": 295,
+      "links": [
+        {
+          "targetBlank": true,
+          "title": "Drill down: cluster compute",
+          "url": "d/efa86fd1d0c121a26444b636a3f509a8/kubernetes-compute-resources-cluster?orgId=1&refresh=10s&var-datasource=ace-menlo&${__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&${__url_time_range}"
+        },
+        {
+          "targetBlank": true,
+          "title": "Drill down: nodes",
+          "url": "d/fa49a4706d07a042595b664c87fb33ea/nodes?orgId=1&var-datasource=ace-menlo&${__url_time_range}"
+        },
+        {
+          "targetBlank": true,
+          "title": "Drill down: logs",
+          "url": "d/e2QUYvPMk/kubernetes-logs-pod?orgId=1&refresh=10s&var-es_datasource=ace-menlo-es&var-es_namespace=omec&${__url_time_range}"
+        }
+      ],
+      "options": {
+        "content": "# ONF\n### Menlo Park\n##### Staging",
+        "mode": "markdown"
+      },
+      "pluginVersion": "7.1.0",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "",
+      "type": "text"
+    },
+    {
+      "aliasColors": {
+        "Ping DNS Avg": "green",
+        "Ping Device Avg": "yellow",
+        "Ping onlab.us Avg": "semi-dark-purple",
+        "edgeDown": "red"
+      },
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 21,
+        "x": 3,
+        "y": 5
+      },
+      "hiddenSeries": false,
+      "id": 296,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "percentage": false,
+      "pluginVersion": "7.1.5",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [
+        {
+          "$$hashKey": "object:525",
+          "alias": "edgeDown",
+          "fill": 6,
+          "hideTooltip": true,
+          "legend": false,
+          "linewidth": 0,
+          "yaxis": 2
+        },
+        {
+          "$$hashKey": "object:542",
+          "alias": "edgeMainenance",
+          "fill": 2,
+          "hideTooltip": true,
+          "legend": false,
+          "linewidth": 0,
+          "yaxis": 2
+        }
+      ],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "aetheredge_ping_dns_test_avg{endpoint=\"metrics80\",name=\"ace-menlo\"} and (aetheredge_status_control_plane{endpoint=\"metrics80\",name=\"ace-menlo\"} * -1 + 1) - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-menlo\"} < 0",
+          "interval": "",
+          "legendFormat": "Ping DNS Avg",
+          "refId": "A"
+        },
+        {
+          "expr": "(aetheredge_status_control_plane{endpoint=\"metrics80\",name=\"ace-menlo\"} * -1 + 1) - aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-menlo\"}",
+          "interval": "",
+          "legendFormat": "edgeDown",
+          "refId": "B"
+        },
+        {
+          "expr": "aetheredge_in_maintenance_window{endpoint=\"metrics80\",name=\"ace-menlo\"}",
+          "interval": "",
+          "legendFormat": "edgeMainenance",
+          "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:263",
+          "format": "ms",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:264",
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": "0.011",
+          "min": "0.01",
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "collapsed": false,
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 9
       },
       "id": 289,
       "panels": [],
@@ -511,7 +717,7 @@
         "h": 7,
         "w": 4,
         "x": 0,
-        "y": 4
+        "y": 10
       },
       "id": 281,
       "links": [
@@ -589,7 +795,7 @@
         "h": 5,
         "w": 10,
         "x": 4,
-        "y": 4
+        "y": 10
       },
       "hiddenSeries": false,
       "id": 283,
@@ -693,7 +899,7 @@
         "h": 5,
         "w": 10,
         "x": 14,
-        "y": 4
+        "y": 10
       },
       "hiddenSeries": false,
       "id": 284,
@@ -797,7 +1003,7 @@
         "h": 5,
         "w": 10,
         "x": 4,
-        "y": 9
+        "y": 15
       },
       "hiddenSeries": false,
       "id": 286,
@@ -895,7 +1101,7 @@
         "h": 5,
         "w": 10,
         "x": 14,
-        "y": 9
+        "y": 15
       },
       "hiddenSeries": false,
       "id": 287,
@@ -1001,7 +1207,7 @@
         "h": 8,
         "w": 4,
         "x": 0,
-        "y": 11
+        "y": 17
       },
       "id": 279,
       "options": {
@@ -1052,7 +1258,7 @@
         "h": 5,
         "w": 20,
         "x": 4,
-        "y": 14
+        "y": 20
       },
       "hiddenSeries": false,
       "id": 285,
@@ -1146,7 +1352,7 @@
     "list": []
   },
   "time": {
-    "from": "now-6h",
+    "from": "now-12h",
     "to": "now"
   },
   "timepicker": {
@@ -1165,5 +1371,5 @@
   "timezone": "",
   "title": "Aether Connected Edge",
   "uid": "Y2z8vDtGz",
-  "version": 3
-}
\ No newline at end of file
+  "version": 2
+}