diff --git a/kubernetes/files/grafana_dashboards/kubernetes_influxdb.json b/kubernetes/files/grafana_dashboards/kubernetes_influxdb.json
index 0f57f9a..11dfb3a 100644
--- a/kubernetes/files/grafana_dashboards/kubernetes_influxdb.json
+++ b/kubernetes/files/grafana_dashboards/kubernetes_influxdb.json
@@ -166,6 +166,112 @@
           "valueName": "current"
         },
         {
+          "aliasColors": {},
+          "bars": false,
+          "fill": 1,
+          "id": 21,
+          "interval": ">60s",
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": false,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "span": 4,
+          "stack": false,
+          "steppedLine": true,
+          "targets": [
+            {
+              "dsType": "influxdb",
+              "groupBy": [
+                {
+                  "params": [
+                    "$interval"
+                  ],
+                  "type": "time"
+                },
+                {
+                  "params": [
+                    "null"
+                  ],
+                  "type": "fill"
+                }
+              ],
+              "measurement": "k8s_service_health_vip",
+              "policy": "default",
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                [
+                  {
+                    "params": [
+                      "value"
+                    ],
+                    "type": "field"
+                  },
+                  {
+                    "params": [],
+                    "type": "last"
+                  }
+                ]
+              ],
+              "tags": [
+                {
+                  "key": "service",
+                  "operator": "=",
+                  "value": "apiserver"
+                }
+              ]
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "API Availability",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": "1",
+              "min": "0",
+              "show": false
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ]
+        },
+        {
           "cacheTimeout": null,
           "colorBackground": true,
           "colorValue": false,
@@ -453,7 +559,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         },
         {
           "cacheTimeout": null,
@@ -558,7 +664,7 @@
               "value": "null"
             }
           ],
-          "valueName": "avg"
+          "valueName": "current"
         }
       ],
       "repeat": null,
@@ -2021,5 +2127,5 @@
   },
   "timezone": "browser",
   "title": "Kubernetes",
-  "version": 8
-}
+  "version": 9
+}
\ No newline at end of file
diff --git a/kubernetes/meta/grafana.yml b/kubernetes/meta/grafana.yml
index e42dd64..867ff99 100644
--- a/kubernetes/meta/grafana.yml
+++ b/kubernetes/meta/grafana.yml
@@ -19,7 +19,7 @@
             target:
               cluster_status:
                 rawQuery: true
-                query: SELECT last(value) FROM cluster_status WHERE cluster_name = 'k8s_master' AND environment_label = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)
+                query: SELECT last(value) FROM cluster_status WHERE cluster_name = 'k8s-master' AND environment_label = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)
       kubernetes-data-plane:
         title: Kubernetes Data Plane
         panel:
@@ -32,5 +32,5 @@
             target:
               cluster_status:
                 rawQuery: true
-                query: SELECT last(value) FROM cluster_status WHERE cluster_name = 'k8s_pool' AND environment_label = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)
+                query: SELECT last(value) FROM cluster_status WHERE cluster_name = 'k8s-pool' AND environment_label = '$environment' AND $timeFilter GROUP BY time($interval) fill(null)