From: Tiago Melo <tmelo@suse.com>
Date: Mon, 4 Nov 2019 16:18:27 +0000 (-0100)
Subject: mgr/dashboard: Display the aggregated number of request
X-Git-Tag: v15.1.0~707^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1dc483e8d9699a57ef61ea77d4a54ce93b341b17;p=ceph.git

mgr/dashboard: Display the aggregated number of request

convertTimeSeries will now calculate the aggregated total number of client
request made in the last seconds, instead of the number of request per second.

Fixes: https://tracker.ceph.com/issues/42622

Signed-off-by: Tiago Melo <tmelo@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts
index 786076125a0..cbc11dfbd47 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts
@@ -62,11 +62,11 @@ describe('CephfsChartComponent', () => {
       },
       {
         x: 10000,
-        y: 2
+        y: 10
       },
       {
         x: 15000,
-        y: 5
+        y: 25
       }
     ]);
   });
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts
index b7809c4c72c..a5e83071b51 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts
@@ -177,13 +177,10 @@ export class CephfsChartComponent implements OnChanges, OnInit {
     const result = [];
     for (i = 1; i < sourceSeries.length; i++) {
       const cur = sourceSeries[i];
-      const tdelta = cur[0] - prev[0];
-      const vdelta = cur[1] - prev[1];
-      const rate = vdelta / tdelta;
 
       result.push({
         x: cur[0] * 1000,
-        y: rate
+        y: cur[1] - prev[1]
       });
 
       prev = cur;