Update Monitoring Dashboard to support new Persistent Disk FS-Cache Volumes

Change-Id: I4350635c74070dd66f92fe6bab6e69a308a72acf

Author: benjamin-maynard

deployment/metrics/dashboard/dashboard.json

@@ -17,7 +17,7 @@
       "labelKey": "backend_name"
     }
   ],
-  "displayName": "Knfsd Monitoring Dashboard (v35)",
+  "displayName": "Knfsd Monitoring Dashboard (v36)",
   "mosaicLayout": {
     "columns": 12,
     "tiles": [
@@ -84,7 +84,7 @@
                       ],
                       "perSeriesAligner": "ALIGN_MEAN"
                     },
-                    "filter": "metric.type=\"agent.googleapis.com/disk/percent_used\" resource.type=\"gce_instance\" metadata.user_labels.\"vm-type\"=\"nfs-proxy\" metric.label.\"device\"=\"/dev/md127\" metric.label.\"state\"=\"free\""
+                    "filter": "metric.type=\"agent.googleapis.com/disk/percent_used\" resource.type=\"gce_instance\" metadata.user_labels.\"vm-type\"=\"nfs-proxy\" metric.label.\"device\"=monitoring.regex.full_match(\"/dev/md127|/dev/sdb\") metric.label.\"state\"=\"free\""
                   }
                 }
               }
@@ -343,7 +343,7 @@
                       "alignmentPeriod": "60s",
                       "perSeriesAligner": "ALIGN_RATE"
                     },
-                    "filter": "metric.type=\"compute.googleapis.com/instance/disk/read_bytes_count\" resource.type=\"gce_instance\" metric.label.\"storage_type\"=\"local-ssd\" metadata.user_labels.\"vm-type\"=\"nfs-proxy\"",
+                    "filter": "metric.type=\"compute.googleapis.com/instance/disk/read_bytes_count\" resource.type=\"gce_instance\" metadata.user_labels.\"vm-type\"=\"nfs-proxy\"",
                     "secondaryAggregation": {
                       "alignmentPeriod": "60s",
                       "crossSeriesReducer": "REDUCE_SUM",
@@ -387,7 +387,7 @@
                       "alignmentPeriod": "60s",
                       "perSeriesAligner": "ALIGN_RATE"
                     },
-                    "filter": "metric.type=\"compute.googleapis.com/instance/disk/write_bytes_count\" resource.type=\"gce_instance\" metric.label.\"storage_type\"=\"local-ssd\" metadata.user_labels.\"vm-type\"=\"nfs-proxy\"",
+                    "filter": "metric.type=\"compute.googleapis.com/instance/disk/write_bytes_count\" resource.type=\"gce_instance\" metadata.user_labels.\"vm-type\"=\"nfs-proxy\"",
                     "secondaryAggregation": {
                       "alignmentPeriod": "60s",
                       "crossSeriesReducer": "REDUCE_SUM",
@@ -1066,4 +1066,4 @@
       }
     ]
   }
-}
+}

docs/changes/changelog.md

@@ -1,5 +1,11 @@
 # Next
 
+* Update Monitoring Dashboard to support new Persistent Disk FS-Cache Volumes
+
+## Update Monitoring Dashboard to support new Persistent Disk FS-Cache Volumes
+
+Updated the monitoring dashboard to corretly show FS-Cache usage, and read write throughput when using Persistent Disk for the FS-Cache volume.
+
 # v0.10.0
 
 * MIG scaler workflow and command line tool