import quincy 17.2.0

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

diff --git a/ceph/monitoring/ceph-mixin/dashboards/osd.libsonnet b/ceph/monitoring/ceph-mixin/dashboards/osd.libsonnet
index 8b425fb395a37eabd598382f3010b7c7ff55cc0c..c5e614675e3f210d18cc2b21b4864dc4602409ba 100644 (file)
--- a/ceph/monitoring/ceph-mixin/dashboards/osd.libsonnet
+++ b/ceph/monitoring/ceph-mixin/dashboards/osd.libsonnet
@@ -35,7 +35,7 @@ local u = import 'utils.libsonnet';
                            1,
                            '$datasource')
         .addTargets(
-          [u.addTargetSchema(expr, 1, 'time_series', legendFormat1)]
+          [u.addTargetSchema(expr, legendFormat1)]
         ) + { gridPos: { x: x, y: y, w: w, h: h } };
       local OsdOverviewPieChartPanel(alias, description, title) =
         u.addPieChartSchema(alias,
@@ -56,7 +56,6 @@ local u = import 'utils.libsonnet';
                                        sparkLineShow,
                                        thresholds,
                                        expr,
-                                       targetFormat,
                                        x,
                                        y,
                                        w,
@@ -75,7 +74,7 @@ local u = import 'utils.libsonnet';
           thresholds
         )
         .addTarget(
-          u.addTargetSchema(expr, 1, targetFormat, '')
+          u.addTargetSchema(expr)
         ) + { gridPos: { x: x, y: y, w: w, h: h } };
 
       u.dashboardSchema(
@@ -137,12 +136,10 @@ local u = import 'utils.libsonnet';
           [
             u.addTargetSchema(
               'max (irate(ceph_osd_op_r_latency_sum[1m]) / on (ceph_daemon) irate(ceph_osd_op_r_latency_count[1m]) * 1000)',
-              1,
-              'time_series',
               'MAX read'
             ),
             u.addTargetSchema(
-              'quantile(0.95,\n  (irate(ceph_osd_op_r_latency_sum[1m]) / on (ceph_daemon) irate(ceph_osd_op_r_latency_count[1m]) * 1000)\n)', 1, 'time_series', '@95%ile'
+              'quantile(0.95,\n  (irate(ceph_osd_op_r_latency_sum[1m]) / on (ceph_daemon) irate(ceph_osd_op_r_latency_count[1m]) * 1000)\n)', '@95%ile'
             ),
           ],
         ),
@@ -160,7 +157,7 @@ local u = import 'utils.libsonnet';
         )
         .addTarget(
           u.addTargetSchema(
-            'topk(10,\n  (sort(\n    (irate(ceph_osd_op_r_latency_sum[1m]) / on (ceph_daemon) irate(ceph_osd_op_r_latency_count[1m]) * 1000)\n  ))\n)\n\n', 1, 'table', ''
+            'topk(10,\n  (sort(\n    (irate(ceph_osd_op_r_latency_sum[1m]) / on (ceph_daemon) irate(ceph_osd_op_r_latency_count[1m]) * 1000)\n  ))\n)\n\n', '', 'table', 1, true
           )
         ) + { gridPos: { x: 8, y: 0, w: 4, h: 8 } },
         OsdOverviewGraphPanel(
@@ -183,12 +180,10 @@ local u = import 'utils.libsonnet';
           [
             u.addTargetSchema(
               'max (irate(ceph_osd_op_w_latency_sum[1m]) / on (ceph_daemon) irate(ceph_osd_op_w_latency_count[1m]) * 1000)',
-              1,
-              'time_series',
               'MAX write'
             ),
             u.addTargetSchema(
-              'quantile(0.95,\n (irate(ceph_osd_op_w_latency_sum[1m]) / on (ceph_daemon) irate(ceph_osd_op_w_latency_count[1m]) * 1000)\n)', 1, 'time_series', '@95%ile write'
+              'quantile(0.95,\n (irate(ceph_osd_op_w_latency_sum[1m]) / on (ceph_daemon) irate(ceph_osd_op_w_latency_count[1m]) * 1000)\n)', '@95%ile write'
             ),
           ],
         ),
@@ -209,59 +204,60 @@ local u = import 'utils.libsonnet';
         .addTarget(
           u.addTargetSchema(
             'topk(10,\n  (sort(\n    (irate(ceph_osd_op_w_latency_sum[1m]) / on (ceph_daemon) irate(ceph_osd_op_w_latency_count[1m]) * 1000)\n  ))\n)\n\n',
-            1,
+            '',
             'table',
-            ''
+            1,
+            true
           )
         ) + { gridPos: { x: 20, y: 0, w: 4, h: 8 } },
         OsdOverviewPieChartPanel(
           {}, '', 'OSD Types Summary'
         )
         .addTarget(
-          u.addTargetSchema('count by (device_class) (ceph_osd_metadata)', 1, 'time_series', '{{device_class}}')
+          u.addTargetSchema('count by (device_class) (ceph_osd_metadata)', '{{device_class}}')
         ) + { gridPos: { x: 0, y: 8, w: 4, h: 8 } },
         OsdOverviewPieChartPanel(
           { 'Non-Encrypted': '#E5AC0E' }, '', 'OSD Objectstore Types'
         )
         .addTarget(
           u.addTargetSchema(
-            'count(ceph_bluefs_wal_total_bytes)', 1, 'time_series', 'bluestore'
+            'count(ceph_bluefs_wal_total_bytes)', 'bluestore', 'time_series', 2
           )
         )
         .addTarget(
           u.addTargetSchema(
-            'absent(ceph_bluefs_wal_total_bytes)*count(ceph_osd_metadata)', 1, 'time_series', 'filestore'
+            'absent(ceph_bluefs_wal_total_bytes)*count(ceph_osd_metadata)', 'filestore', 'time_series', 2
           )
         ) + { gridPos: { x: 4, y: 8, w: 4, h: 8 } },
         OsdOverviewPieChartPanel(
           {}, 'The pie chart shows the various OSD sizes used within the cluster', 'OSD Size Summary'
         )
         .addTarget(u.addTargetSchema(
-          'count(ceph_osd_stat_bytes < 1099511627776)', 1, 'time_series', '<1TB'
+          'count(ceph_osd_stat_bytes < 1099511627776)', '<1TB', 'time_series', 2
         ))
         .addTarget(u.addTargetSchema(
-          'count(ceph_osd_stat_bytes >= 1099511627776 < 2199023255552)', 1, 'time_series', '<2TB'
+          'count(ceph_osd_stat_bytes >= 1099511627776 < 2199023255552)', '<2TB', 'time_series', 2
         ))
         .addTarget(u.addTargetSchema(
-          'count(ceph_osd_stat_bytes >= 2199023255552 < 3298534883328)', 1, 'time_series', '<3TB'
+          'count(ceph_osd_stat_bytes >= 2199023255552 < 3298534883328)', '<3TB', 'time_series', 2
         ))
         .addTarget(u.addTargetSchema(
-          'count(ceph_osd_stat_bytes >= 3298534883328 < 4398046511104)', 1, 'time_series', '<4TB'
+          'count(ceph_osd_stat_bytes >= 3298534883328 < 4398046511104)', '<4TB', 'time_series', 2
         ))
         .addTarget(u.addTargetSchema(
-          'count(ceph_osd_stat_bytes >= 4398046511104 < 6597069766656)', 1, 'time_series', '<6TB'
+          'count(ceph_osd_stat_bytes >= 4398046511104 < 6597069766656)', '<6TB', 'time_series', 2
         ))
         .addTarget(u.addTargetSchema(
-          'count(ceph_osd_stat_bytes >= 6597069766656 < 8796093022208)', 1, 'time_series', '<8TB'
+          'count(ceph_osd_stat_bytes >= 6597069766656 < 8796093022208)', '<8TB', 'time_series', 2
         ))
         .addTarget(u.addTargetSchema(
-          'count(ceph_osd_stat_bytes >= 8796093022208 < 10995116277760)', 1, 'time_series', '<10TB'
+          'count(ceph_osd_stat_bytes >= 8796093022208 < 10995116277760)', '<10TB', 'time_series', 2
         ))
         .addTarget(u.addTargetSchema(
-          'count(ceph_osd_stat_bytes >= 10995116277760 < 13194139533312)', 1, 'time_series', '<12TB'
+          'count(ceph_osd_stat_bytes >= 10995116277760 < 13194139533312)', '<12TB', 'time_series', 2
         ))
         .addTarget(u.addTargetSchema(
-          'count(ceph_osd_stat_bytes >= 13194139533312)', 1, 'time_series', '<12TB+'
+          'count(ceph_osd_stat_bytes >= 13194139533312)', '<12TB+', 'time_series', 2
         )) + { gridPos: { x: 8, y: 8, w: 4, h: 8 } },
         g.graphPanel.new(bars=true,
                          datasource='$datasource',
@@ -275,7 +271,7 @@ local u = import 'utils.libsonnet';
                          min='0',
                          nullPointMode='null')
         .addTarget(u.addTargetSchema(
-          'ceph_osd_numpg\n', 1, 'time_series', 'PGs per OSD'
+          'ceph_osd_numpg\n', 'PGs per OSD', 'time_series', 1, true
         )) + { gridPos: { x: 12, y: 8, w: 8, h: 8 } },
         OsdOverviewSingleStatPanel(
           ['#d44a3a', '#299c46'],
@@ -289,7 +285,6 @@ local u = import 'utils.libsonnet';
           false,
           '.75',
           'sum(ceph_bluestore_onode_hits)/(sum(ceph_bluestore_onode_hits) + sum(ceph_bluestore_onode_misses))',
-          'time_series',
           20,
           8,
           4,
@@ -313,7 +308,7 @@ local u = import 'utils.libsonnet';
           8
         )
         .addTargets([u.addTargetSchema(
-          'round(sum(irate(ceph_pool_wr[30s])))', 1, 'time_series', 'Writes'
+          'round(sum(irate(ceph_pool_wr[30s])))', 'Writes'
         )]),
       ]),
     'osd-device-details.json':
@@ -344,10 +339,8 @@ local u = import 'utils.libsonnet';
         .addTargets(
           [
             u.addTargetSchema(expr1,
-                              1,
-                              'time_series',
                               legendFormat1),
-            u.addTargetSchema(expr2, 1, 'time_series', legendFormat2),
+            u.addTargetSchema(expr2, legendFormat2),
           ]
         ) + { gridPos: { x: x, y: y, w: w, h: h } };
 
@@ -524,8 +517,6 @@ local u = import 'utils.libsonnet';
         )
         .addTarget(u.addTargetSchema(
           'label_replace(irate(node_disk_io_time_seconds_total[1m]), "instance", "$1", "instance", "([^:.]*).*") and on (instance, device) label_replace(label_replace(ceph_disk_occupation_human{ceph_daemon=~"$osd"}, "device", "$1", "device", "/dev/(.*)"), "instance", "$1", "instance", "([^:.]*).*")',
-          1,
-          'time_series',
           '{{device}} on {{instance}}'
         )) + { gridPos: { x: 18, y: 11, w: 6, h: 9 } },
       ]),