From: Volker Theile <vtheile@suse.com>
Date: Thu, 19 Nov 2020 15:27:24 +0000 (+0100)
Subject: mgr/dashboard: The performance 'Client Read/Write' widget shows incorrect write values
X-Git-Tag: v15.2.8~19^2~1^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=48ceb4ca132c18cdaf6d59bbdf7461ff6b069fe0;p=ceph.git

mgr/dashboard: The performance 'Client Read/Write' widget shows incorrect write values

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

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit d66e684b9ec83cca8a58b0a7b8661c568eb0cf6d)

Conflicts:
	src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss
	src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts
	src/pybind/mgr/dashboard/frontend/src/styles/defaults/_bootstrap-defaults.scss
Discarded all changes except the relevant code part. The rest was sucessfully backported by b2360b1a6101b5cc61c236047ce7c757fd02c93d.
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts
index 11c048374dedb..f58dbb1390a37 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts
@@ -95,7 +95,11 @@ export class HealthComponent implements OnInit, OnDestroy {
       )} ${this.i18n(`/s`)}`
     );
     ratioData.push(this.healthData.client_perf.read_op_per_sec);
-    ratioLabels.push(this.healthData.client_perf.write_op_per_sec);
+    ratioLabels.push(
+      `${this.i18n(`Writes`)}: ${this.dimless.transform(
+        this.healthData.client_perf.write_op_per_sec
+      )} ${this.i18n(`/s`)}`
+    );
     ratioData.push(this.calcPercentage(this.healthData.client_perf.write_op_per_sec, total));
 
     chart.labels = ratioLabels;