diff --git a/opencontrail/files/grafana_dashboards/cassandra_influxdb.json b/opencontrail/files/grafana_dashboards/cassandra_influxdb.json
index 4b55a51..34892aa 100644
--- a/opencontrail/files/grafana_dashboards/cassandra_influxdb.json
+++ b/opencontrail/files/grafana_dashboards/cassandra_influxdb.json
@@ -3,10 +3,10 @@
     "list": []
   },
   "editable": true,
+  "gnetId": null,
   "hideControls": false,
   "id": null,
   "links": [],
-  "originalTitle": "Cassandra",
   "refresh": "1m",
   "rows": [
     {
@@ -38,6 +38,17 @@
           "interval": ">90s",
           "isNew": true,
           "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
           "maxDataPoints": 100,
           "nullPointMode": "connected",
           "nullText": null,
@@ -45,12 +56,19 @@
           "postfixFontSize": "50%",
           "prefix": "",
           "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
           "span": 4,
           "sparkline": {
             "fillColor": "rgba(31, 118, 189, 0.18)",
             "full": false,
             "lineColor": "rgb(31, 120, 193)",
-            "show": false
+            "show": true
           },
           "targets": [
             {
@@ -69,7 +87,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "UpEndpointCount",
+              "measurement": "GenericJMX_cassandra_UpEndpointCount",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -87,7 +105,13 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "thresholds": "1,3",
@@ -164,7 +188,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "UpEndpointCount",
+              "measurement": "GenericJMX_cassandra_UpEndpointCount",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -182,7 +206,13 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             },
             {
               "alias": "Endpoint DOWN ($tag_hostname)",
@@ -207,7 +237,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "DownEndpointCount",
+              "measurement": "GenericJMX_cassandra_DownEndpointCount",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -225,15 +255,22 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Endpoint UP/DOWN",
+          "title": "Endpoints UP/DOWN",
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -330,7 +367,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "connectedNativeClients",
+              "measurement": "GenericJMX_cassandra_connectedNativeClients",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -348,15 +385,22 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Cassandra: Native Clients",
+          "title": "Native Clients",
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -445,7 +489,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "connectedThriftClients",
+              "measurement": "GenericJMX_cassandra_connectedThriftClients",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -463,15 +507,22 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Cassandra: Thrift Clients",
+          "title": "Thrift Clients",
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -569,7 +620,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "clientRequest_Read_Mean",
+              "measurement": "GenericJMX_cassandra_clientRequest_Read_Mean",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -587,7 +638,13 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
@@ -596,6 +653,7 @@
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -685,7 +743,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "clientRequest_Read_50thPercentile",
+              "measurement": "GenericJMX_cassandra_clientRequest_Read_50thPercentile",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -703,7 +761,13 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
@@ -712,6 +776,7 @@
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -809,7 +874,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "clientRequest_Write_Mean",
+              "measurement": "GenericJMX_cassandra_clientRequest_Write_Mean",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -827,7 +892,13 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
@@ -836,6 +907,7 @@
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -925,7 +997,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "clientRequest_Write_50thPercentile",
+              "measurement": "GenericJMX_cassandra_clientRequest_Write_50thPercentile",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -943,7 +1015,13 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
@@ -952,6 +1030,7 @@
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -1002,7 +1081,7 @@
           "interval": ">90s",
           "isNew": true,
           "legend": {
-            "alignAsTable": true,
+            "alignAsTable": false,
             "avg": false,
             "current": false,
             "max": false,
@@ -1047,7 +1126,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "CompactionCompletedTasks",
+              "measurement": "GenericJMX_cassandra_CompactionCompletedTasks",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -1065,7 +1144,13 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             },
             {
               "alias": "Pending Tasks ($tag_hostname)",
@@ -1090,7 +1175,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "CompactionPendingTasks",
+              "measurement": "GenericJMX_cassandra_CompactionPendingTasks",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -1108,15 +1193,22 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Cassandra Compaction Engine",
+          "title": "Compaction Engine",
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -1210,7 +1302,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "StorageDBLoad",
+              "measurement": "GenericJMX_cassandra_StorageDBLoad",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -1228,7 +1320,13 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
@@ -1237,6 +1335,7 @@
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -1322,7 +1421,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "StorageExceptionCount",
+              "measurement": "GenericJMX_cassandra_StorageExceptionCount",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -1340,7 +1439,13 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
@@ -1349,6 +1454,7 @@
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -1413,7 +1519,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "alias": "Heap usage max ($tag_hostname)",
+              "alias": "($tag_hostname)",
               "dsType": "influxdb",
               "groupBy": [
                 {
@@ -1435,7 +1541,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "memory-heap_usage_max",
+              "measurement": "GenericJMX_cassandra_memory_memory-heap_usage_max",
               "policy": "default",
               "query": "SELECT mean(\"value\") FROM \"memory-heap_usage_max\" WHERE $timeFilter GROUP BY time($interval), \"hostname\" fill(null)",
               "rawQuery": false,
@@ -1455,15 +1561,22 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Cassandra Heap Usage",
+          "title": "Heap Usage Max",
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -1550,7 +1663,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "CMSOldGen",
+              "measurement": "GenericJMX_cassandra_CMSOldGen",
               "policy": "default",
               "refId": "A",
               "resultFormat": "time_series",
@@ -1568,7 +1681,13 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             },
             {
               "alias": "PermGen ($tag_hostname)",
@@ -1593,7 +1712,7 @@
                   "type": "fill"
                 }
               ],
-              "measurement": "CMSPermGen",
+              "measurement": "GenericJMX_cassandra_CMSPermGen",
               "policy": "default",
               "refId": "B",
               "resultFormat": "time_series",
@@ -1611,7 +1730,13 @@
                   }
                 ]
               ],
-              "tags": []
+              "tags": [
+                {
+                  "key": "environment_label",
+                  "operator": "=~",
+                  "value": "/^$environment$/"
+                }
+              ]
             }
           ],
           "timeFrom": null,
@@ -1620,6 +1745,7 @@
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
@@ -1654,7 +1780,23 @@
   "style": "dark",
   "tags": [],
   "templating": {
-    "list": []
+    "enable": true,
+    "list": [
+      {
+        "allFormat": "regex values",
+        "current": {},
+        "datasource": null,
+        "hide": 0,
+        "includeAll": false,
+        "name": "environment",
+        "options": [],
+        "query": "show tag values from cpu_idle with key = environment_label",
+        "refresh": 1,
+        "refresh_on_load": true,
+        "regex": "",
+        "type": "query"
+      }
+    ]
   },
   "time": {
     "from": "now-1h",
@@ -1687,5 +1829,5 @@
   },
   "timezone": "browser",
   "title": "Cassandra",
-  "version": 8
-}
\ No newline at end of file
+  "version": 10
+}