monitoring: Fixes for smb overview

Fixes: https://tracker.ceph.com/issues/73535
Resolves: rhbz#2405692

Signed-off-by: Ankush Behl <cloudbehl@gmail.com>
(cherry picked from commit 39eabe530509312872a5cddd7ab180964a5996b9)
(cherry picked from commit 97002532ca93e8a714e9f7c736a84a1320bbc37a)

diff --git a/monitoring/ceph-mixin/dashboards_out/smb-overview.json b/monitoring/ceph-mixin/dashboards_out/smb-overview.json
index 178dec6c8c534f46bd99124be128fce0652ff8ac..63c5efc077318bd5939efa2f48418e7a9a66360b 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/smb-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/smb-overview.json
@@ -714,7 +714,7 @@
                   "mode": "absolute",
                   "steps": []
                },
-               "unit": "decbytes"
+               "unit": "bytes"
             },
             "overrides": []
          },
@@ -749,7 +749,7 @@
                   "uid": "${datasource}"
                },
                "editorMode": "code",
-               "expr": "rate(smb_smb2_request_inbytes{instance=~\"$hostname\", share=~\"$share\", client=~\"$client\"}[$__rate_interval])",
+               "expr": "sum by (operation) (rate(smb_smb2_request_inbytes{instance=~\"$hostname\", share=~\"$share\", client=~\"$client\"}[$__rate_interval]))",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -762,7 +762,7 @@
                   "uid": "${datasource}"
                },
                "editorMode": "code",
-               "expr": "rate(smb_smb2_request_outbytes{instance=~\"$hostname\", share=~\"$share\", client=~\"$client\"}[$__rate_interval])",
+               "expr": "sum by (operation) (rate(smb_smb2_request_outbytes{instance=~\"$hostname\", share=~\"$share\", client=~\"$client\"}[$__rate_interval]))",
                "format": "time_series",
                "hide": false,
                "instant": false,
@@ -858,7 +858,7 @@
                   "uid": "${datasource}"
                },
                "editorMode": "code",
-               "expr": "rate(smb_smb2_request_total{instance=~\"$hostname\", share=~\"$share\", client=~\"$client\"}[$__rate_interval])",
+               "expr": "sum by (operation) (rate(smb_smb2_request_total{instance=~\"$hostname\", share=~\"$share\", client=~\"$client\"}[$__rate_interval]))",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -953,7 +953,7 @@
                   "uid": "${datasource}"
                },
                "editorMode": "code",
-               "expr": "rate(smb_smb2_request_duration_microseconds_sum{instance=~\"$hostname\", share=~\"$share\", client=~\"$client\"}[$__rate_interval])",
+               "expr": "sum by (operation) (rate(smb_smb2_request_duration_microseconds_sum{instance=~\"$hostname\", share=~\"$share\", client=~\"$client\"}[$__rate_interval]))",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,