import quincy 17.2.0

[ceph.git] / ceph / monitoring / ceph-mixin / dashboards / rbd.libsonnet

diff --git a/ceph/monitoring/ceph-mixin/dashboards/rbd.libsonnet b/ceph/monitoring/ceph-mixin/dashboards/rbd.libsonnet
index d464f889f54db1a332cd8b69c574f95294db4283..a4ca6982d3bb7b073d69d9323f0ff132f560e01d 100644 (file)
--- a/ceph/monitoring/ceph-mixin/dashboards/rbd.libsonnet
+++ b/ceph/monitoring/ceph-mixin/dashboards/rbd.libsonnet
@@ -20,10 +20,8 @@ local u = import 'utils.libsonnet';
         .addTargets(
           [
             u.addTargetSchema(expr1,
-                              1,
-                              'time_series',
                               '{{pool}} Write'),
-            u.addTargetSchema(expr2, 1, 'time_series', '{{pool}} Read'),
+            u.addTargetSchema(expr2, '{{pool}} Read'),
           ]
         ) + { gridPos: { x: x, y: y, w: w, h: h } };
 
@@ -151,12 +149,8 @@ local u = import 'utils.libsonnet';
         .addTargets(
           [
             u.addTargetSchema(expr1,
-                              1,
-                              'time_series',
                               legendFormat1),
             u.addTargetSchema(expr2,
-                              1,
-                              'time_series',
                               legendFormat2),
           ]
         ) + { gridPos: { x: x, y: y, w: w, h: h } };
@@ -257,9 +251,10 @@ local u = import 'utils.libsonnet';
         .addTarget(
           u.addTargetSchema(
             'topk(10, (sort((irate(ceph_rbd_write_ops[30s]) + on (image, pool, namespace) irate(ceph_rbd_read_ops[30s])))))',
-            1,
+            '',
             'table',
-            ''
+            1,
+            true
           )
         ) + { gridPos: { x: 0, y: 7, w: 8, h: 7 } },
         u.addTableSchema(
@@ -278,9 +273,10 @@ local u = import 'utils.libsonnet';
         .addTarget(
           u.addTargetSchema(
             'topk(10, sort(sum(irate(ceph_rbd_read_bytes[30s]) + irate(ceph_rbd_write_bytes[30s])) by (pool, image, namespace)))',
-            1,
+            '',
             'table',
-            ''
+            1,
+            true
           )
         ) + { gridPos: { x: 8, y: 7, w: 8, h: 7 } },
         u.addTableSchema(
@@ -299,9 +295,10 @@ local u = import 'utils.libsonnet';
         .addTarget(
           u.addTargetSchema(
             'topk(10,\n  sum(\n    irate(ceph_rbd_write_latency_sum[30s]) / clamp_min(irate(ceph_rbd_write_latency_count[30s]), 1) +\n    irate(ceph_rbd_read_latency_sum[30s]) / clamp_min(irate(ceph_rbd_read_latency_count[30s]), 1)\n  ) by (pool, image, namespace)\n)',
-            1,
+            '',
             'table',
-            ''
+            1,
+            true
           )
         ) + { gridPos: { x: 16, y: 7, w: 8, h: 7 } },
       ]),