Update Ceph dashboards to use ceph-mgr prometheus module

This updates the ceph dashboards in grafana to use the metrics
provided by the ceph-mgr prometheus module instead of the digital
ocean ceph exporter

Change-Id: I449bc924034f0beabca3c6e8aab17765a706fd50

grafana/values.yaml

@@ -452,7 +452,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: false
           targets:
-          - expr: ceph_monitor_quorum_count
+          - expr: ceph_mon_quorum_count
             interval: "$interval"
             intervalFactor: 1
             legendFormat: ''
@@ -513,7 +513,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: true
           targets:
-          - expr: count(ceph_pool_available_bytes)
+          - expr: count(ceph_pool_max_avail)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: ''
@@ -574,7 +574,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: true
           targets:
-          - expr: ceph_cluster_capacity_bytes
+          - expr: ceph_cluster_total_bytes
             interval: "$interval"
             intervalFactor: 1
             legendFormat: ''
@@ -635,7 +635,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: true
           targets:
-          - expr: ceph_cluster_used_bytes
+          - expr: ceph_cluster_total_used_bytes
             interval: "$interval"
             intervalFactor: 1
             legendFormat: ''
@@ -696,7 +696,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: false
           targets:
-          - expr: ceph_cluster_available_bytes/ceph_cluster_capacity_bytes
+          - expr: ceph_cluster_total_used_bytes/ceph_cluster_total_bytes
             interval: "$interval"
             intervalFactor: 1
             legendFormat: ''
@@ -762,7 +762,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: false
           targets:
-          - expr: ceph_osds_in
+          - expr: ceph_osd_in
             interval: "$interval"
             intervalFactor: 1
             legendFormat: ''
@@ -822,7 +822,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: false
           targets:
-          - expr: ceph_osds - ceph_osds_in
+          - expr: count(ceph_osd_metadata) - count(ceph_osd_in)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: ''
@@ -942,7 +942,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: false
           targets:
-          - expr: ceph_osds_down
+          - expr: count(ceph_osd_metadata) - count(count(ceph_osd_metadata) - count(ceph_osd_up))
             interval: "$interval"
             intervalFactor: 1
             legendFormat: ''
@@ -1002,14 +1002,14 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: true
           targets:
-          - expr: avg(ceph_osd_pgs)
+          - expr: avg(ceph_osd_numpg)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: ''
             refId: A
             step: 60
           thresholds: '250,300'
-          title: Agerage PGs per OSD
+          title: Average PGs per OSD
           type: singlestat
           valueFontSize: 80%
           valueMaps:
@@ -1017,188 +1017,6 @@ conf:
             text: N/A
             value: 'null'
           valueName: current
-        - cacheTimeout:
-          colorBackground: false
-          colorValue: true
-          colors:
-          - rgba(50, 172, 45, 0.97)
-          - rgba(237, 129, 40, 0.89)
-          - rgba(245, 54, 54, 0.9)
-          datasource: prometheus
-          editable: true
-          error: false
-          format: s
-          gauge:
-            maxValue: 100
-            minValue: 0
-            show: false
-            thresholdLabels: false
-            thresholdMarkers: true
-          id: 31
-          interval:
-          isNew: true
-          links: []
-          mappingType: 1
-          mappingTypes:
-          - name: value to text
-            value: 1
-          - name: range to text
-            value: 2
-          maxDataPoints: 100
-          nullPointMode: connected
-          nullText:
-          postfix: ''
-          postfixFontSize: 50%
-          prefix: ''
-          prefixFontSize: 50%
-          rangeMaps:
-          - from: 'null'
-            text: N/A
-            to: 'null'
-          span: 2
-          sparkline:
-            fillColor: rgba(31, 118, 189, 0.18)
-            full: true
-            lineColor: rgb(31, 120, 193)
-            show: true
-          targets:
-          - expr: avg(ceph_osd_perf_apply_latency_seconds)
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: ''
-            refId: A
-            step: 60
-          thresholds: 0.01,0.05
-          title: Agerage OSD Apply Latency
-          type: singlestat
-          valueFontSize: 80%
-          valueMaps:
-          - op: "="
-            text: N/A
-            value: 'null'
-          valueName: avg
-        - cacheTimeout:
-          colorBackground: false
-          colorValue: true
-          colors:
-          - rgba(50, 172, 45, 0.97)
-          - rgba(237, 129, 40, 0.89)
-          - rgba(245, 54, 54, 0.9)
-          datasource: prometheus
-          editable: true
-          error: false
-          format: s
-          gauge:
-            maxValue: 100
-            minValue: 0
-            show: false
-            thresholdLabels: false
-            thresholdMarkers: true
-          id: 32
-          interval:
-          isNew: true
-          links: []
-          mappingType: 1
-          mappingTypes:
-          - name: value to text
-            value: 1
-          - name: range to text
-            value: 2
-          maxDataPoints: 100
-          nullPointMode: connected
-          nullText:
-          postfix: ''
-          postfixFontSize: 50%
-          prefix: ''
-          prefixFontSize: 50%
-          rangeMaps:
-          - from: 'null'
-            text: N/A
-            to: 'null'
-          span: 2
-          sparkline:
-            fillColor: rgba(31, 118, 189, 0.18)
-            full: true
-            lineColor: rgb(31, 120, 193)
-            show: true
-          targets:
-          - expr: avg(ceph_osd_perf_commit_latency_seconds)
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: ''
-            refId: A
-            step: 60
-          thresholds: 0.01,0.05
-          title: Agerage OSD Commit Latency
-          type: singlestat
-          valueFontSize: 80%
-          valueMaps:
-          - op: "="
-            text: N/A
-            value: 'null'
-          valueName: avg
-        - cacheTimeout:
-          colorBackground: false
-          colorValue: true
-          colors:
-          - rgba(50, 172, 45, 0.97)
-          - rgba(237, 129, 40, 0.89)
-          - rgba(245, 54, 54, 0.9)
-          datasource: prometheus
-          editable: true
-          error: false
-          format: s
-          gauge:
-            maxValue: 100
-            minValue: 0
-            show: false
-            thresholdLabels: false
-            thresholdMarkers: true
-          id: 24
-          interval: 1m
-          isNew: true
-          links: []
-          mappingType: 1
-          mappingTypes:
-          - name: value to text
-            value: 1
-          - name: range to text
-            value: 2
-          maxDataPoints: 100
-          nullPointMode: connected
-          nullText:
-          postfix: ''
-          postfixFontSize: 50%
-          prefix: ''
-          prefixFontSize: 50%
-          rangeMaps:
-          - from: 'null'
-            text: N/A
-            to: 'null'
-          repeat:
-          span: 2
-          sparkline:
-            fillColor: rgba(31, 118, 189, 0.18)
-            full: true
-            lineColor: rgb(31, 120, 193)
-            show: true
-          targets:
-          - expr: avg(ceph_monitor_latency_seconds)
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: ''
-            refId: A
-            step: 60
-          thresholds: '70,80'
-          title: Average Monitor Latency
-          transparent: false
-          type: singlestat
-          valueFontSize: 100%
-          valueMaps:
-          - op: "="
-            text: N/A
-            value: 'null'
-          valueName: current
         title: New row
       - collapse: false
         editable: true
@@ -1252,19 +1070,19 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: ceph_cluster_available_bytes
+          - expr: ceph_cluster_total_bytes - ceph_cluster_total_used_bytes
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Available
             refId: A
             step: 60
-          - expr: ceph_cluster_used_bytes
+          - expr: ceph_cluster_total_used_bytes
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Used
             refId: B
             step: 60
-          - expr: ceph_cluster_capacity_bytes
+          - expr: ceph_cluster_total_bytes
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Total Capacity
@@ -1339,13 +1157,13 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: ceph_client_io_write_ops
+          - expr: sum(ceph_osd_op_w)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Write
             refId: A
             step: 60
-          - expr: ceph_client_io_read_ops
+          - expr: sum(ceph_osd_op_r)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Read
@@ -1412,13 +1230,13 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: ceph_client_io_write_bytes
+          - expr: sum(ceph_osd_op_in_bytes)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Write
             refId: A
             step: 60
-          - expr: ceph_client_io_read_bytes
+          - expr: sum(ceph_osd_op_out_bytes)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Read
@@ -1493,24 +1311,12 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: ceph_cluster_objects
+          - expr: ceph_cluster_total_objects
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Total
             refId: A
             step: 60
-          - expr: ceph_degraded_objects
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: Degraded
-            refId: B
-            step: 60
-          - expr: ceph_misplaced_objects
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: Misplaced
-            refId: C
-            step: 60
           timeFrom:
           timeShift:
           title: Objects in the Cluster
@@ -1573,41 +1379,40 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: sum(ceph_osd_pgs)
+          - expr: sum(ceph_osd_numpg)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Total
             refId: A
             step: 60
-          - expr: ceph_degraded_pgs
+          - expr: sum(ceph_pg_active)
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Degraded
+            legendFormat: Active
             refId: B
             step: 60
-          - expr: ceph_stale_pgs
+          - expr: sum(ceph_pg_inconsistent)
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Stale
+            legendFormat: Inconsistent
             refId: C
             step: 60
-          - expr: ceph_unclean_pgs
+          - expr: sum(ceph_pg_creating)
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Unclean
+            legendFormat: Creating
             refId: D
             step: 60
-          - expr: ceph_undersized_pgs
+          - expr: sum(ceph_pg_recovering)
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Undersized
+            legendFormat: Recovering
             refId: E
             step: 60
-          - expr: ceph_stuck_degraded_pgs + ceph_stuck_stale_pgs + ceph_stuck_unclean_pgs
-              + ceph_stuck_undersized_pgs
+          - expr: sum(ceph_pg_down)
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Stuck
+            legendFormat: Down
             refId: F
             step: 60
           timeFrom:
@@ -1672,25 +1477,19 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: ceph_stuck_degraded_pgs
+          - expr: sum(ceph_pg_degraded)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Degraded
-            refId: F
+            refId: A
             step: 60
-          - expr: ceph_stuck_stale_pgs
+          - expr: sum(ceph_pg_stale)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Stale
-            refId: A
-            step: 60
-          - expr: ceph_stuck_unclean_pgs
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: Unclean
             refId: B
             step: 60
-          - expr: ceph_stuck_undersized_pgs
+          - expr: sum(ceph_pg_undersized)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Undersized
@@ -1721,208 +1520,6 @@ conf:
             min:
             show: true
         title: New row
-      - collapse: false
-        editable: true
-        height: 150px
-        panels:
-        - aliasColors: {}
-          bars: false
-          datasource: prometheus
-          editable: true
-          error: false
-          fill: 1
-          grid:
-            threshold1:
-            threshold1Color: rgba(216, 200, 27, 0.27)
-            threshold2:
-            threshold2Color: rgba(234, 112, 112, 0.22)
-          id: 15
-          isNew: true
-          legend:
-            avg: false
-            current: false
-            max: false
-            min: false
-            show: false
-            total: false
-            values: false
-          lines: true
-          linewidth: 2
-          links: []
-          nullPointMode: connected
-          percentage: false
-          pointradius: 5
-          points: false
-          renderer: flot
-          seriesOverrides: []
-          span: 4
-          stack: false
-          steppedLine: false
-          targets:
-          - expr: ceph_recovery_io_bytes
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: Bytes
-            refId: A
-            step: 60
-          timeFrom:
-          timeShift:
-          title: Bytes
-          tooltip:
-            msResolution: false
-            shared: true
-            sort: 0
-            value_type: cumulative
-          type: graph
-          xaxis:
-            show: true
-          yaxes:
-          - format: short
-            label:
-            logBase: 1
-            max:
-            min: 0
-            show: true
-          - format: short
-            label:
-            logBase: 1
-            max:
-            min:
-            show: true
-        - aliasColors: {}
-          bars: false
-          datasource: prometheus
-          editable: true
-          error: false
-          fill: 1
-          grid:
-            threshold1:
-            threshold1Color: rgba(216, 200, 27, 0.27)
-            threshold2:
-            threshold2Color: rgba(234, 112, 112, 0.22)
-          id: 16
-          isNew: true
-          legend:
-            avg: false
-            current: false
-            max: false
-            min: false
-            show: false
-            total: false
-            values: false
-          lines: true
-          linewidth: 2
-          links: []
-          nullPointMode: connected
-          percentage: false
-          pointradius: 5
-          points: false
-          renderer: flot
-          seriesOverrides:
-          - alias: "/^.*/"
-            color: "#E0752D"
-          span: 4
-          stack: false
-          steppedLine: false
-          targets:
-          - expr: ceph_recovery_io_keys
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: Keys
-            refId: A
-            step: 60
-          timeFrom:
-          timeShift:
-          title: Keys
-          tooltip:
-            msResolution: false
-            shared: true
-            sort: 0
-            value_type: cumulative
-          type: graph
-          xaxis:
-            show: true
-          yaxes:
-          - format: short
-            label:
-            logBase: 1
-            max:
-            min: 0
-            show: true
-          - format: short
-            label:
-            logBase: 1
-            max:
-            min:
-            show: true
-        - aliasColors: {}
-          bars: false
-          datasource: prometheus
-          editable: true
-          error: false
-          fill: 1
-          grid:
-            threshold1:
-            threshold1Color: rgba(216, 200, 27, 0.27)
-            threshold2:
-            threshold2Color: rgba(234, 112, 112, 0.22)
-          id: 17
-          isNew: true
-          legend:
-            avg: false
-            current: false
-            max: false
-            min: false
-            show: false
-            total: false
-            values: false
-          lines: true
-          linewidth: 2
-          links: []
-          nullPointMode: connected
-          percentage: false
-          pointradius: 5
-          points: false
-          renderer: flot
-          seriesOverrides:
-          - alias: "/^.*$/"
-            color: "#890F02"
-          span: 4
-          stack: false
-          steppedLine: false
-          targets:
-          - expr: ceph_recovery_io_objects
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: Objects
-            refId: A
-            step: 60
-          timeFrom:
-          timeShift:
-          title: Objects
-          tooltip:
-            msResolution: false
-            shared: true
-            sort: 0
-            value_type: cumulative
-          type: graph
-          xaxis:
-            show: true
-          yaxes:
-          - format: short
-            label:
-            logBase: 1
-            max:
-            min: 0
-            show: true
-          - format: short
-            label:
-            logBase: 1
-            max:
-            min:
-            show: true
-        showTitle: true
-        title: Recovery
       time:
         from: now-1h
         to: now
@@ -2099,7 +1696,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: false
           targets:
-          - expr: ceph_osd_up{osd="$osd"}
+          - expr: ceph_osd_up{ceph_daemon="osd.$osd"}
             interval: "$interval"
             intervalFactor: 1
             refId: A
@@ -2172,7 +1769,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: false
           targets:
-          - expr: ceph_osd_in{osd="$osd"}
+          - expr: ceph_osd_in{ceph_daemon="osd.$osd"}
             interval: "$interval"
             intervalFactor: 1
             refId: A
@@ -2239,7 +1836,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: false
           targets:
-          - expr: ceph_osds
+          - expr: count(ceph_osd_metadata)
             interval: "$interval"
             intervalFactor: 1
             refId: A
@@ -2307,13 +1904,13 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: ceph_osd_pgs{osd=~"$osd"}
+          - expr: ceph_osd_numpg{ceph_daemon=~"osd.$osd"}
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Number of PGs - {{ osd }}
+            legendFormat: Number of PGs - {{ osd.$osd }}
             refId: A
             step: 60
-          - expr: avg(ceph_osd_pgs)
+          - expr: avg(ceph_osd_numpg)
             interval: "$interval"
             intervalFactor: 1
             legendFormat: Average Number of PGs in the Cluster
@@ -2388,7 +1985,7 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: true
           targets:
-          - expr: ceph_osd_utilization{osd="$osd"}
+          - expr: (ceph_osd_stat_bytes_used{ceph_daemon=~"osd.$osd"}/ceph_osd_stat_bytes{ceph_daemon=~"osd.$osd"})*100
             interval: "$interval"
             intervalFactor: 1
             legendFormat: ''
@@ -2411,80 +2008,6 @@ conf:
         editable: true
         height: 250px
         panels:
-        - aliasColors: {}
-          bars: false
-          datasource: prometheus
-          decimals: 2
-          editable: true
-          error: false
-          fill: 1
-          grid:
-            threshold1:
-            threshold1Color: rgba(216, 200, 27, 0.27)
-            threshold2:
-            threshold2Color: rgba(234, 112, 112, 0.22)
-            thresholdLine: false
-          id: 4
-          interval: "$interval"
-          isNew: true
-          legend:
-            alignAsTable: true
-            avg: true
-            current: true
-            max: true
-            min: true
-            show: true
-            total: false
-            values: true
-          lines: false
-          linewidth: 2
-          links: []
-          nullPointMode: connected
-          percentage: false
-          pointradius: 2
-          points: true
-          renderer: flot
-          seriesOverrides: []
-          span: 4
-          stack: false
-          steppedLine: false
-          targets:
-          - expr: ceph_osd_perf_apply_latency_seconds{osd=~"$osd"}
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: Apply Latency (s) - {{ osd }}
-            refId: A
-            step: 60
-          - expr: ceph_osd_perf_commit_latency_seconds{osd=~"$osd"}
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: Commit Latency (s) - {{ osd }}
-            refId: B
-            step: 60
-          timeFrom:
-          timeShift:
-          title: Latency
-          tooltip:
-            msResolution: false
-            shared: true
-            sort: 0
-            value_type: individual
-          type: graph
-          xaxis:
-            show: true
-          yaxes:
-          - format: s
-            label:
-            logBase: 1
-            max:
-            min: 0
-            show: true
-          - format: s
-            label:
-            logBase: 1
-            max:
-            min: 0
-            show: true
         - aliasColors: {}
           bars: false
           datasource: prometheus
@@ -2518,22 +2041,22 @@ conf:
           points: false
           renderer: flot
           seriesOverrides: []
-          span: 4
+          span: 6
           stack: true
           steppedLine: false
           targets:
-          - expr: ceph_osd_avail_bytes{osd=~"$osd"}
+          - expr: ceph_osd_stat_bytes_used{ceph_daemon=~"osd.$osd"}
+            interval: "$interval"
+            intervalFactor: 1
+            legendFormat: Used - {{ osd.$osd }}
+            metric: ceph_osd_used_bytes
+            refId: A
+            step: 60
+          - expr: ceph_osd_stat_bytes{ceph_daemon=~"osd.$osd"} - ceph_osd_stat_bytes_used{ceph_daemon=~"osd.$osd"}
             hide: false
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Available - {{ osd }}
-            metric: ceph_osd_avail_bytes
-            refId: A
-            step: 60
-          - expr: ceph_osd_used_bytes{osd=~"$osd"}
-            interval: "$interval"
-            intervalFactor: 1
-            legendFormat: Used - {{ osd }}
+            legendFormat: Available - {{ osd.$osd }}
             metric: ceph_osd_avail_bytes
             refId: B
             step: 60
@@ -2594,14 +2117,14 @@ conf:
           points: true
           renderer: flot
           seriesOverrides: []
-          span: 4
+          span: 6
           stack: false
           steppedLine: false
           targets:
-          - expr: ceph_osd_variance{osd=~"$osd"}
+          - expr: (ceph_osd_stat_bytes_used{ceph_daemon=~"osd.$osd"}/ceph_osd_stat_bytes{ceph_daemon=~"osd.$osd"})
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Available - {{ osd }}
+            legendFormat: Available - {{ osd.$osd }}
             metric: ceph_osd_avail_bytes
             refId: A
             step: 60
@@ -2629,7 +2152,6 @@ conf:
             max:
             min:
             show: true
-        title: New row
       time:
         from: now-1h
         to: now
@@ -2715,7 +2237,7 @@ conf:
           multi: false
           name: osd
           options: []
-          query: label_values(ceph_osd_up, osd)
+          query: 	label_values(ceph_osd_metadata, id)
           refresh: 1
           regex: ''
           type: query
@@ -2814,37 +2336,33 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: ceph_pool_available_bytes{pool=~"$pool"}
+          - expr: ceph_pool_max_avail{pool_id=~"$pool"}
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Avilable - {{ pool }}
-            metric: ceph_pool_available_bytes
+            legendFormat: Total - {{ $pool }}
             refId: A
             step: 60
-          - expr: ceph_pool_used_bytes{pool=~"$pool"}
+          - expr: ceph_pool_bytes_used{pool_id=~"$pool"}
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Used - {{ pool }}
-            metric: ceph_pool
+            legendFormat: Used - {{ $pool }}
             refId: B
             step: 60
-          - expr: ceph_pool_used_bytes{pool=~"$pool"} + ceph_pool_available_bytes{pool=~"$pool"}
+          - expr: ceph_pool_max_avail{pool_id=~"$pool"} - ceph_pool_bytes_used{pool_id=~"$pool"}
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Total - {{ pool }}
-            metric: ceph_pool
+            legendFormat: Available - {{ $pool }}
             refId: C
             step: 60
-          - expr: ceph_pool_raw_used_bytes{pool=~"$pool"}
+          - expr: ceph_pool_raw_bytes_used{pool_id=~"$pool"}
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Raw - {{ pool }}
-            metric: ceph_pool
+            legendFormat: Raw - {{ $pool }}
             refId: D
             step: 60
           timeFrom:
           timeShift:
-          title: Pool Storage
+          title: "[[pool_name]] Pool Storage"
           tooltip:
             msResolution: false
             shared: true
@@ -2912,14 +2430,13 @@ conf:
             lineColor: rgb(31, 120, 193)
             show: false
           targets:
-          - expr: ' ceph_pool_used_bytes{pool="$pool"} / (ceph_pool_available_bytes{pool="$pool"}
-              + ceph_pool_used_bytes{pool="$pool"})'
+          - expr: (ceph_pool_bytes_used{pool_id=~"$pool"} / ceph_pool_max_avail{pool_id=~"$pool"}) * 100
             interval: "$interval"
             intervalFactor: 1
             refId: A
             step: 60
           thresholds: ''
-          title: Usage
+          title: "[[pool_name]] Pool Usage"
           type: singlestat
           valueFontSize: 80%
           valueMaps:
@@ -2968,21 +2485,21 @@ conf:
           stack: false
           steppedLine: false
           targets:
-          - expr: ceph_pool_objects_total{pool=~"$pool"}
+          - expr: ceph_pool_objects{pool_id=~"$pool"}
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Objects - {{ pool }}
+            legendFormat: Objects - {{ $pool_name }}
             refId: A
             step: 60
-          - expr: ceph_pool_dirty_objects_total{pool=~"$pool"}
+          - expr: ceph_pool_dirty{pool_id=~"$pool"}
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Dirty Objects - {{ pool }}
+            legendFormat: Dirty Objects - {{ $pool_name }}
             refId: B
             step: 60
           timeFrom:
           timeShift:
-          title: Objects in Pool
+          title: Objects in Pool [[pool_name]]
           tooltip:
             msResolution: false
             shared: true
@@ -3042,21 +2559,21 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: irate(ceph_pool_read_total{pool=~"$pool"}[3m])
+          - expr: irate(ceph_pool_rd{pool_id=~"$pool"}[3m])
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Read - {{ pool }}
+            legendFormat: Read - {{ $pool_name}}
             refId: B
             step: 60
-          - expr: irate(ceph_pool_write_total{pool=~"$pool"}[3m])
+          - expr: irate(ceph_pool_wr{pool_id=~"$pool"}[3m])
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Write - {{ pool }}
+            legendFormat: Write - {{ $pool_name }}
             refId: A
             step: 60
           timeFrom:
           timeShift:
-          title: IOPS
+          title: "[[pool_name]] Pool IOPS"
           tooltip:
             msResolution: false
             shared: true
@@ -3115,21 +2632,21 @@ conf:
           stack: true
           steppedLine: false
           targets:
-          - expr: irate(ceph_pool_read_bytes_total{pool="$pool"}[3m])
+          - expr: irate(ceph_pool_rd_bytes{pool_id="$pool"}[3m])
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Read Bytes - {{ pool }}
+            legendFormat: Read Bytes - {{ $pool_name }}
             refId: A
             step: 60
-          - expr: irate(ceph_pool_write_bytes_total{pool="$pool"}[3m])
+          - expr: irate(ceph_pool_wr_bytes{pool_id="$pool"}[3m])
             interval: "$interval"
             intervalFactor: 1
-            legendFormat: Written Bytes - {{ pool }}
+            legendFormat: Written Bytes - {{ $pool_name }}
             refId: B
             step: 60
           timeFrom:
           timeShift:
-          title: Throughput
+          title: "[[pool_name]] Pool Throughput"
           tooltip:
             msResolution: false
             shared: true
@@ -3237,7 +2754,19 @@ conf:
           multi: false
           name: pool
           options: []
-          query: label_values(ceph_pool_objects_total, pool)
+          query: label_values(ceph_pool_objects, pool_id)
+          refresh: 1
+          regex: ''
+          type: query
+        - current: {}
+          datasource: prometheus
+          hide: 0
+          includeAll: false
+          label: Pool
+          multi: false
+          name: pool_name
+          options: []
+          query: label_values(ceph_pool_metadata{pool_id="[[pool]]" }, name)
           refresh: 1
           regex: ''
           type: query