From: Aashish Sharma <66050535+aaSharma14@users.noreply.github.com>
Date: Tue, 11 Mar 2025 12:30:26 +0000 (+0530)
Subject: Merge pull request #61210 from piyushagarwal1411/cephfs
X-Git-Tag: testing/wip-vshankar-testing-20250311.124427-debug~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca651ae006aa0d14198d0a2defe4aee57d41c68e;p=ceph-ci.git

Merge pull request #61210 from piyushagarwal1411/cephfs

mgr/dashboard: Changing SimpleGraphPanel to TimeSeries Panel in cephfs.libsonnet to fix inconsistency in Line Graphs

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
---

ca651ae006aa0d14198d0a2defe4aee57d41c68e
diff --cc monitoring/ceph-mixin/dashboards/cephfs.libsonnet
index 508ab185fcf,8d386e0df19..ae5dea6076e
--- a/monitoring/ceph-mixin/dashboards/cephfs.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/cephfs.libsonnet
@@@ -45,40 -45,27 +45,41 @@@ local g = import 'grafonnet/grafana.lib
                            'MDS Server',
                            '')
      )
 +    .addLinks([
 +      $.addLinkSchema(
 +        asDropdown=true,
 +        icon='external link',
 +        includeVars=true,
 +        keepTime=true,
 +        tags=[],
 +        targetBlank=false,
 +        title='Browse Dashboards',
 +        tooltip='',
 +        type='dashboards',
 +        url=''
 +      ),
 +    ])
      .addPanels([
        $.addRowSchema(false, true, 'MDS Performance') + { gridPos: { x: 0, y: 0, w: 24, h: 1 } },
-       $.simpleGraphPanel(
-         {},
-         'MDS Workload - $mds_servers',
-         '',
-         'none',
-         'Reads(-) / Writes (+)',
-         0,
-         'sum(rate(ceph_objecter_op_r{ceph_daemon=~"($mds_servers).*", %(matchers)s}[$__rate_interval]))' % $.matchers(),
-         'Read Ops',
-         0,
-         1,
-         12,
-         9
+       $.timeSeriesPanel(
+         title='MDS Workload - $mds_servers',
+         datasource='$datasource',
+         gridPosition={ x: 0, y: 1, w: 12, h: 9 },
+         axisLabel='Reads(-) / Writes (+)',
+         showPoints='never',
+         min=0,
+         spanNulls=true,
        )
-       .addTarget($.addTargetSchema(
-         'sum(rate(ceph_objecter_op_w{ceph_daemon=~"($mds_servers).*", %(matchers)s}[$__rate_interval]))' % $.matchers(),
-         'Write Ops'
-       ))
+       .addTargets([
+         $.addTargetSchema(
+           'sum(rate(ceph_objecter_op_r{ceph_daemon=~"($mds_servers).*", %(matchers)s}[$__rate_interval]))' % $.matchers(),
+           'Read Ops'
+         ),
+         $.addTargetSchema(
+           'sum(rate(ceph_objecter_op_w{ceph_daemon=~"($mds_servers).*", %(matchers)s}[$__rate_interval]))' % $.matchers(),
+           'Write Ops'
+         ),
+       ])
        .addSeriesOverride(
          { alias: '/.*Reads/', transform: 'negative-Y' }
        ),