diff --git a/grafana-dashboards/elasticsearch-dashboard.json b/grafana-dashboards/elasticsearch-dashboard.json
index 26f3628..2ece999 100644
--- a/grafana-dashboards/elasticsearch-dashboard.json
+++ b/grafana-dashboards/elasticsearch-dashboard.json
@@ -15,8 +15,8 @@
     "editable": true,
     "gnetId": null,
     "graphTooltip": 1,
-    "id": 16,
-    "iteration": 1551271295198,
+    "id": 19,
+    "iteration": 1551275508525,
     "links": [],
     "panels": [
       {
@@ -1394,14 +1394,14 @@
         ],
         "sparkline": {
           "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
+          "full": true,
           "lineColor": "rgb(31, 120, 193)",
           "show": true
         },
         "tableColumn": "",
         "targets": [
           {
-            "expr": "sum(node_memory_MemTotal_bytes)",
+            "expr": "sum(elasticsearch_jvm_memory_committed_bytes)",
             "format": "time_series",
             "intervalFactor": 2,
             "legendFormat": "",
@@ -1411,7 +1411,7 @@
           }
         ],
         "thresholds": "",
-        "title": "Total Memory",
+        "title": "Total Memory Available",
         "type": "singlestat",
         "valueFontSize": "80%",
         "valueMaps": [
@@ -1480,14 +1480,14 @@
         ],
         "sparkline": {
           "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
+          "full": true,
           "lineColor": "rgb(31, 120, 193)",
           "show": true
         },
         "tableColumn": "",
         "targets": [
           {
-            "expr": "sum(node_memory_MemFree_bytes)",
+            "expr": "sum(elasticsearch_jvm_memory_used_bytes)",
             "format": "time_series",
             "intervalFactor": 2,
             "legendFormat": "",
@@ -1496,7 +1496,7 @@
           }
         ],
         "thresholds": "",
-        "title": "Total Memory Free",
+        "title": "Memory Usage",
         "type": "singlestat",
         "valueFontSize": "80%",
         "valueMaps": [
@@ -1565,14 +1565,14 @@
         ],
         "sparkline": {
           "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
+          "full": true,
           "lineColor": "rgb(31, 120, 193)",
           "show": true
         },
         "tableColumn": "",
         "targets": [
           {
-            "expr": "sum(node_memory_MemAvailable_bytes)",
+            "expr": "sum(elasticsearch_jvm_memory_committed_bytes)-sum(elasticsearch_jvm_memory_used_bytes)",
             "format": "time_series",
             "intervalFactor": 2,
             "legendFormat": "",
@@ -1581,7 +1581,7 @@
           }
         ],
         "thresholds": "",
-        "title": "Total Memory Available",
+        "title": "Free Memory",
         "type": "singlestat",
         "valueFontSize": "80%",
         "valueMaps": [
@@ -2192,7 +2192,7 @@
             "value": "$__all"
           },
           "datasource": "$server",
-          "definition": "",
+          "definition": "label_values(elasticsearch_cluster_health_status,cluster)",
           "hide": 0,
           "includeAll": true,
           "label": null,
@@ -2242,7 +2242,7 @@
       ]
     },
     "timezone": "utc",
-    "title": "ElasticSearch Cluster",
-    "uid": "n_nxrE_mk78",
+    "title": "ElasticSearch Cluster 2",
+    "uid": "n_nxrE_mk7",
     "version": 1
   }
\ No newline at end of file