mgr/dashboard: Fixing RGW graph panels

- Fixing grafana panels for rgw dashboards
- Fixing RGW overview dashboard queries

fixes https://tracker.ceph.com/issues/64177

Signed-off-by: cloudbehl <cloudbehl@gmail.com>

diff --git a/monitoring/ceph-mixin/dashboards/rgw.libsonnet b/monitoring/ceph-mixin/dashboards/rgw.libsonnet
index 932eb2122ca72853d1c6576c87139f4e2f47c298..a660f870a0f305657ffc0c619930971ea8f99905 100644 (file)
--- a/monitoring/ceph-mixin/dashboards/rgw.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/rgw.libsonnet
@@ -263,8 +263,8 @@ local u = import 'utils.libsonnet';
         'short',
         |||
           label_replace(
-            rate(ceph_rgw_get_initial_lat_sum{%(matchers)s}[$__rate_interval]) /
-              rate(ceph_rgw_get_initial_lat_count{%(matchers)s}[$__rate_interval]) *
+            rate(ceph_rgw_op_get_obj_lat_sum{%(matchers)s}[$__rate_interval]) /
+              rate(ceph_rgw_op_get_obj_lat_count{%(matchers)s}[$__rate_interval]) *
               on (instance_id) group_left (ceph_daemon) ceph_rgw_metadata{%(matchers)s},
             "rgw_host", "$1", "ceph_daemon", "rgw.(.*)"
           )
@@ -279,8 +279,8 @@ local u = import 'utils.libsonnet';
           $.addTargetSchema(
             |||
               label_replace(
-                rate(ceph_rgw_put_initial_lat_sum{%(matchers)s}[$__rate_interval]) /
-                  rate(ceph_rgw_put_initial_lat_count{%(matchers)s}[$__rate_interval]) *
+                rate(ceph_rgw_op_put_obj_lat_sum{%(matchers)s}[$__rate_interval]) /
+                  rate(ceph_rgw_op_put_obj_lat_count{%(matchers)s}[$__rate_interval]) *
                   on (instance_id) group_left (ceph_daemon) ceph_rgw_metadata{%(matchers)s},
                 "rgw_host", "$1", "ceph_daemon", "rgw.(.*)"
               )
@@ -316,8 +316,8 @@ local u = import 'utils.libsonnet';
         'short',
         |||
           label_replace(
-            rate(ceph_rgw_get_initial_lat_sum{%(matchers)s}[$__rate_interval]) /
-              rate(ceph_rgw_get_initial_lat_count{%(matchers)s}[$__rate_interval]) *
+            rate(ceph_rgw_op_get_obj_lat_sum{%(matchers)s}[$__rate_interval]) /
+              rate(ceph_rgw_op_get_obj_lat_count{%(matchers)s}[$__rate_interval]) *
               on (instance_id) group_left (ceph_daemon) ceph_rgw_metadata{%(matchers)s},
             "rgw_host", "$1", "ceph_daemon", "rgw.(.*)"
           )
@@ -333,14 +333,14 @@ local u = import 'utils.libsonnet';
         'Total bytes transferred in/out of all radosgw instances within the cluster',
         'bytes',
         'short',
-        'sum(rate(ceph_rgw_get_b{%(matchers)s}[$__rate_interval]))' % $.matchers(),
+        'sum(rate(ceph_rgw_op_get_obj_bytes{%(matchers)s}[$__rate_interval]))' % $.matchers(),
         'GETs',
         0,
         8,
         8,
         6
       ).addTargets(
-        [$.addTargetSchema('sum(rate(ceph_rgw_put_b{%(matchers)s}[$__rate_interval]))' % $.matchers(),
+        [$.addTargetSchema('sum(rate(ceph_rgw_op_put_obj_bytes{%(matchers)s}[$__rate_interval]))' % $.matchers(),
                            'PUTs')]
       ),
       RgwOverviewPanel(
@@ -350,8 +350,8 @@ local u = import 'utils.libsonnet';
         'short',
         |||
           label_replace(sum by (instance_id) (
-            rate(ceph_rgw_get_b{%(matchers)s}[$__rate_interval]) +
-              rate(ceph_rgw_put_b{%(matchers)s}[$__rate_interval])) *
+            rate(ceph_rgw_op_get_obj_bytes{%(matchers)s}[$__rate_interval]) +
+              rate(ceph_rgw_op_put_obj_bytes{%(matchers)s}[$__rate_interval])) *
               on (instance_id) group_left (ceph_daemon) ceph_rgw_metadata{%(matchers)s},
             "rgw_host", "$1", "ceph_daemon", "rgw.(.*)"
           )
@@ -369,8 +369,8 @@ local u = import 'utils.libsonnet';
         'short',
         |||
           label_replace(
-            rate(ceph_rgw_put_initial_lat_sum{%(matchers)s}[$__rate_interval]) /
-              rate(ceph_rgw_put_initial_lat_count{%(matchers)s}[$__rate_interval]) *
+            rate(ceph_rgw_op_put_obj_lat_sum{%(matchers)s}[$__rate_interval]) /
+              rate(ceph_rgw_op_put_obj_lat_count{%(matchers)s}[$__rate_interval]) *
               on (instance_id) group_left (ceph_daemon) ceph_rgw_metadata{%(matchers)s},
             "rgw_host", "$1", "ceph_daemon", "rgw.(.*)"
           )
@@ -736,14 +736,14 @@ local u = import 'utils.libsonnet';
         'short',
         |||
           sum by (instance_id) (
-            rate(ceph_rgw_get_initial_lat_sum{%(matchers)s}[$__rate_interval]) /
-              rate(ceph_rgw_get_initial_lat_count{%(matchers)s}[$__rate_interval])
+            rate(ceph_rgw_op_get_obj_lat_sum{%(matchers)s}[$__rate_interval]) /
+              rate(ceph_rgw_op_get_obj_lat_count{%(matchers)s}[$__rate_interval])
           ) * on (instance_id) group_left (ceph_daemon) ceph_rgw_metadata{%(matchers)s, ceph_daemon=~"$rgw_servers"}
         ||| % $.matchers(),
         |||
           sum by (instance_id) (
-            rate(ceph_rgw_put_initial_lat_sum{%(matchers)s}[$__rate_interval]) /
-              rate(ceph_rgw_put_initial_lat_count{%(matchers)s}[$__rate_interval])
+            rate(ceph_rgw_op_put_obj_lat_sum{%(matchers)s}[$__rate_interval]) /
+              rate(ceph_rgw_op_put_obj_lat_count{%(matchers)s}[$__rate_interval])
           ) * on (instance_id) group_left (ceph_daemon) ceph_rgw_metadata{%(matchers)s, ceph_daemon=~"$rgw_servers"}
         ||| % $.matchers(),
         'GET {{ceph_daemon}}',
@@ -760,11 +760,11 @@ local u = import 'utils.libsonnet';
         'bytes',
         'short',
         |||
-          rate(ceph_rgw_get_b{%(matchers)s}[$__rate_interval]) *
+          rate(ceph_rgw_op_get_obj_bytes{%(matchers)s}[$__rate_interval]) *
             on (instance_id) group_left (ceph_daemon) ceph_rgw_metadata{%(matchers)s, ceph_daemon=~"$rgw_servers"}
         ||| % $.matchers(),
         |||
-          rate(ceph_rgw_put_b{%(matchers)s}[$__rate_interval]) *
+          rate(ceph_rgw_op_put_obj_bytes{%(matchers)s}[$__rate_interval]) *
             on (instance_id) group_left (ceph_daemon)
             ceph_rgw_metadata{%(matchers)s, ceph_daemon=~"$rgw_servers"}
         ||| % $.matchers(),

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/dashboard-promqls.enum.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/dashboard-promqls.enum.ts
index 515fefcdb6107ff88a496b55050c558b78593447..2d8aa22819dc4fee5f12c92e0b0a0f6b5aba3372 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/dashboard-promqls.enum.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/dashboard-promqls.enum.ts
@@ -11,8 +11,8 @@ export enum Promqls {
 
 export enum RgwPromqls {
   RGW_REQUEST_PER_SECOND = 'sum(rate(ceph_rgw_req[1m]))',
-  AVG_GET_LATENCY = 'sum(rate(ceph_rgw_get_initial_lat_sum[1m])) / sum(rate(ceph_rgw_get_initial_lat_count[1m]))',
-  AVG_PUT_LATENCY = 'sum(rate(ceph_rgw_put_initial_lat_sum[1m])) / sum(rate(ceph_rgw_put_initial_lat_count[1m]))',
-  GET_BANDWIDTH = 'sum(rate(ceph_rgw_get_b[1m]))',
-  PUT_BANDWIDTH = 'sum(rate(ceph_rgw_put_b[1m]))'
+  AVG_GET_LATENCY = 'sum(rate(ceph_rgw_op_get_obj_lat_sum[1m])) / sum(rate(ceph_rgw_op_get_obj_lat_count[1m]))',
+  AVG_PUT_LATENCY = 'sum(rate(ceph_rgw_op_put_obj_lat_sum[1m])) / sum(rate(ceph_rgw_op_put_obj_lat_count[1m]))',
+  GET_BANDWIDTH = 'sum(rate(ceph_rgw_op_get_obj_bytes[1m]))',
+  PUT_BANDWIDTH = 'sum(rate(ceph_rgw_op_put_obj_bytes[1m]))'
 }