From 7ba73d9074b160013884871c69d3dc7c4846bcc2 Mon Sep 17 00:00:00 2001
From: Maha Benzekri <maha.benzekri@scality.com>
Date: Thu, 16 May 2024 18:04:31 +0200
Subject: [PATCH] wip

---
 .../__pycache__/dashboard.cpython-311.pyc     | Bin 4260 -> 2952 bytes
 monitoring/dashboard.json                     | 120 ++----------------
 2 files changed, 12 insertions(+), 108 deletions(-)

diff --git a/monitoring/__pycache__/dashboard.cpython-311.pyc b/monitoring/__pycache__/dashboard.cpython-311.pyc
index 199baac6ac7db53caf2128a7790cf3ea571f04c8..249313ffe8044c5b093f333b68a3faf92c5ed031 100644
GIT binary patch
delta 638
zcma)2J5SqC6!yJw>@;yq8c3W6kOXLpX`x7^Dg$CkcnG1^YPPBi<lGuZO@eG!imFOk
z*(!7=HipVns<-?J#vn0yW2%_S&ccBR#B1nx^j+!R?>xSHewB7K^&lRP3W(EJ%U}LQ
zchwACq`Q;t4n(NH((nYLe$1nS@CVt4NqohV@CDh&rwrz55Qi{GATza|y;iPzs4(y!
zJ#v_vgakZ=Bn+Aza%F(R5TqatDPQwM9Et1$lPP2%3pvO>q7ler48w>&`k;<L0iy_|
zN3}5+gK?PX+!xI-j!e|^w+u+|%zy3?w1vE}m8cJ2-&ls_ObRdj$$J~5cdLBeld%i3
zkNpvW%b^n8ALUYLTrR*=RnTAZ+0b9!mP-7cSP%o@yUBlsHEziZ{7hO;>ogEqd)p3_
zugqjkSZ>*k4VS-_%H1E4k94}+`qp%dmdhGWvB6y1syRBbFTZmd!9yp3w8boQ%hhE&
z&(EXtq{!!DdxcbMv(9R+VYh0`ajd3U-DV5|xw=&T@V-*zGs^GS8aB9GfpbK=CyGe8
jp{{fX2i}n6bnkVgr!5_B^c3SrF^(03e@;}yRZPABL41Y;

delta 1602
zcmbVLOK2Ns5Z;&de%Z3Mdib%joz}AKIIa8gr8KeRgapTFl^*JgkTic}sg~AgS0$AZ
zy5^8W%ztSQg+Pm1s15~R13mN-$Yl#9EP_IAC6I$ced(d4vk#>~b|GYz8MOb*H{Un&
zukMK7B?I64{T>GGFJbG}qtH<x$_f0@((MijRHMeZVH`su-~xBg)8!cEM|8`~b1(Qt
z&&yoT-*sRmx@EgDtQ8>uW8eTM1WjZJ#!n$x8`=2}8pq-=Ou(243d7_Xps6m8bm%r+
z!o);uj0n+Jz)T}XgqS7q^!#y1oY7=-&KYbn0n;!8voKd?%}F_sAPMu3>@9Q!l!<N`
z)^e~2=im)EH<G(-ES-fn@mYdYZ}}9Eg)}}ZuzF_hJe-F$xX@ds_t~k9*_Q|%@K*2b
zE{ihIU&shm=Z0@2M&cw<=3%|}4t>VXjlbJ<Vl}#D_a%Cf3)3|&#3t=uLD%j)yq9BA
z@6#&xM`y0sEPYN?X}_YVm3mn!d_fw8GLfL!D5w>=-U=-qW^(x(pX_XBZ(hlMnrrtR
zN==s4y^8cR$F%-bnzbb?B}>YBz9cv6YDFbAC2zIO+imm1c6o)A<T@yMgdNrkHTny`
zu_3KVuh)fYLZ-8P(UzRCB}=Q)q0yTt2Za)8x6SveTx_>fTwfr!4;p>nJ}HwrY{`vU
zL2Z5cdhFJ?^s(^aO8R=URwNBcz9n5U_o@892zpi6q#yH1dc=P_+Y)ceYGGfJi&aum
z73rWMmx!VeXzidV`VD_AoNA?aMzS;}Okd?2alGV4!U)C(F>GaRezeud^{57`eMt(g
zam}C^N*{_qn#A#4A;+!Wuw)q@$Z*Rk*5rTcLh2OTckGc$c~4C_8*%D$e!wo!tn=#`
zXD++Bb3K#mhb>i`#s@O&K!0~eSEfuQ_JB4Gf&Qd<YzcaCO8<8L;N3<(<KLh>;E#WD
z32aA9-mB`Kv>r_Aky$+;>h8eZnJ2Em9mjxUCN2wlEISzE-Ja(Rh7%(UT#P$trMEdf
zwl$jex`U2^KO}O`84M>z(3tRGk%=vQ<<UJWFHw1)(1-5zPIUfWOZO~b!X(zmi)Xau
z$NY|g(;daO7*33!F;jyGV@>dCXhW3S5QRZwCJ~LIj{k9AU?XX5^^%tPOcQst5@<g1
RtB?HVBlIJ0M!1Fx`xn7ixcLA8

diff --git a/monitoring/dashboard.json b/monitoring/dashboard.json
index 92eda0bf..de208eda 100644
--- a/monitoring/dashboard.json
+++ b/monitoring/dashboard.json
@@ -72,7 +72,7 @@
       "maxDataPoints": 100,
       "panels": [],
       "targets": [],
-      "title": "Processing Duration",
+      "title": "Count items metrics",
       "transformations": [],
       "transparent": false,
       "type": "row"
@@ -117,13 +117,13 @@
             "mode": "absolute",
             "steps": []
           },
-          "unit": "s"
+          "unit": ""
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
-        "w": 8,
+        "w": 12,
         "x": 0,
         "y": 1
       },
@@ -144,34 +144,20 @@
       "targets": [
         {
           "datasource": null,
-          "expr": "sum(rate(s3_countitems_bucket_listing_duration_seconds_sum{namespace=\"${namespace}\", job=~\"${job}\"}[$__rate_interval])) / sum(rate(s3_countitems_bucket_listing_duration_seconds_count{namespace=\"${namespace}\", job=~\"${job}\"}[$__rate_interval]))",
-          "format": "time_series",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "Average Duration - {{namespace}} - {{job}}",
-          "metric": "",
-          "refId": "",
-          "step": 10,
-          "target": ""
-        },
-        {
-          "datasource": null,
-          "expr": "sum(rate(s3_countitems_bucket_listing_duration_seconds_count{namespace=\"${namespace}\", job=~\"${job}\"}[$__rate_interval]))",
+          "expr": "sum(rate(s3_countitems_total_objects_count{namespace=\"${namespace}\", job=~\"${job}\"}[$__rate_interval]))",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Number of Buckets - {{namespace}} - {{job}}",
+          "legendFormat": "Objects processed per second - \"${namespace}\" - ${job}",
           "metric": "",
           "refId": "",
           "step": 10,
           "target": ""
         }
       ],
-      "title": "bucket listing average duration",
+      "title": "Rate of the S3 objects processed",
       "transformations": [],
       "transparent": false,
       "type": "timeseries"
@@ -216,14 +202,14 @@
             "mode": "absolute",
             "steps": []
           },
-          "unit": ""
+          "unit": "s"
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
-        "w": 8,
-        "x": 8,
+        "w": 12,
+        "x": 12,
         "y": 1
       },
       "hideTimeOverride": false,
@@ -243,105 +229,23 @@
       "targets": [
         {
           "datasource": null,
-          "expr": "sum(rate(s3_countitems_total_objects_count{namespace=\"${namespace}\", job=~\"${job}\"}[$__rate_interval]))",
+          "expr": "sum(rate(count_items_consolidationDuration_count{namespace=\"${namespace}\", job=~\"${job}\"}[$__rate_interval]))",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
           "intervalFactor": 1,
-          "legendFormat": "Objects processed per second - \"${namespace}\" - ${job}",
+          "legendFormat": "{{namespace}} - {{job}}",
           "metric": "",
           "refId": "",
           "step": 10,
           "target": ""
         }
       ],
-      "title": "Rate of the S3 objects processed",
+      "title": "consolidation duration",
       "transformations": [],
       "transparent": false,
       "type": "timeseries"
-    },
-    {
-      "datasource": "${DS_PROMETHEUS}",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "calcs": [
-            "mean"
-          ],
-          "decimals": null,
-          "limit": null,
-          "links": [],
-          "mappings": [],
-          "max": 100,
-          "min": 0,
-          "override": {},
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "index": 0,
-                "line": true,
-                "op": "gt",
-                "value": "null",
-                "yaxis": "left"
-              },
-              {
-                "color": "red",
-                "index": 1,
-                "line": true,
-                "op": "gt",
-                "value": 80.0,
-                "yaxis": "left"
-              }
-            ]
-          },
-          "title": null,
-          "unit": "none",
-          "values": false
-        },
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 16,
-        "y": 1
-      },
-      "hideTimeOverride": false,
-      "id": 4,
-      "links": [],
-      "maxDataPoints": 100,
-      "options": {
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ]
-        }
-      },
-      "targets": [
-        {
-          "datasource": null,
-          "expr": "sum(s3_countitems_total_objects_count{namespace=\"${namespace}\", job=~\"${job}\"})",
-          "format": "time_series",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "Objects processed - \"${namespace}\" - ${job}",
-          "metric": "",
-          "refId": "",
-          "step": 10,
-          "target": ""
-        }
-      ],
-      "title": "Total objects processed",
-      "transformations": [],
-      "transparent": false,
-      "type": "gauge"
     }
   ],
   "refresh": "30s",