diff --git a/sysadmin/grid5000/cassandra/monitoring/grafana/dashboards/swh_objects_dashboard.json b/sysadmin/grid5000/cassandra/monitoring/grafana/dashboards/swh-storage-stats.json
similarity index 67%
copy from sysadmin/grid5000/cassandra/monitoring/grafana/dashboards/swh_objects_dashboard.json
copy to sysadmin/grid5000/cassandra/monitoring/grafana/dashboards/swh-storage-stats.json
index 5d6d979..4d84b96 100644
--- a/sysadmin/grid5000/cassandra/monitoring/grafana/dashboards/swh_objects_dashboard.json
+++ b/sysadmin/grid5000/cassandra/monitoring/grafana/dashboards/swh-storage-stats.json
@@ -1,404 +1,311 @@
 {
   "annotations": {
     "list": [
       {
         "builtIn": 1,
         "datasource": "-- Grafana --",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "limit": 100,
         "matchAny": true,
         "name": "Annotations & Alerts",
         "tags": [
           "configuration",
           "admin",
           "run"
         ],
         "type": "tags"
       }
     ]
   },
   "editable": true,
   "gnetId": null,
   "graphTooltip": 1,
-  "id": 1,
-  "iteration": 1625678740918,
+  "id": 20,
+  "iteration": 1631017061345,
   "links": [],
   "panels": [
     {
       "collapsed": false,
       "datasource": null,
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
         "y": 0
       },
       "id": 2,
       "panels": [],
       "repeat": "object",
       "title": "${object}",
       "type": "row"
     },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
-        "w": 12,
+        "w": 24,
         "x": 0,
         "y": 1
       },
       "hiddenSeries": false,
       "id": 5,
       "interval": "1m",
       "legend": {
         "avg": false,
         "current": false,
         "hideEmpty": false,
         "hideZero": false,
         "max": false,
         "min": false,
         "show": true,
         "total": false,
         "values": false
       },
       "lines": true,
       "linewidth": 1,
       "nullPointMode": "null",
       "options": {
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "8.0.4",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": false,
+      "stack": true,
       "steppedLine": false,
       "targets": [
         {
           "exemplar": true,
-          "expr": "avg(increase(swh_objects_total{instance=~\"${cassandra}\", type=~\"${object}\"}[$inter]))",
-          "instant": false,
+          "expr": "sum by (instance, endpoint) (rate(swh_storage_operations_total{object_type=~\"${object}\"}[$inter]))",
+          "hide": false,
           "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "",
+          "legendFormat": "{{instance}} - {{endpoint}}",
           "refId": "A"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
       "title": "Creation rate",
       "tooltip": {
         "shared": true,
         "sort": 0,
         "value_type": "individual"
       },
       "type": "graph",
       "xaxis": {
         "buckets": null,
         "mode": "time",
         "name": null,
         "show": true,
         "values": []
       },
       "yaxes": [
         {
           "$$hashKey": "object:57",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "$$hashKey": "object:58",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 1
-      },
-      "hiddenSeries": false,
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "8.0.4",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "exemplar": true,
-          "expr": "swh_objects_total{instance=~\"${cassandra}\", type=~\"${object}\"}",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Total",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:57",
-          "format": "short",
+          "format": "ops",
           "label": null,
           "logBase": 1,
           "max": null,
           "min": "0",
           "show": true
         },
         {
           "$$hashKey": "object:58",
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
           "min": null,
           "show": true
         }
       ],
       "yaxis": {
         "align": false,
         "alignLevel": null
       }
     }
   ],
   "refresh": "10s",
   "schemaVersion": 30,
   "style": "dark",
   "tags": [],
   "templating": {
     "list": [
       {
         "allValue": null,
         "current": {
           "selected": false,
-          "text": "parasilo-2.rennes.grid5000.fr:9100",
-          "value": "parasilo-2.rennes.grid5000.fr:9100"
+          "text": "All",
+          "value": "$__all"
         },
         "datasource": null,
-        "definition": "label_values(swh_objects_total, instance)",
+        "definition": "label_values(swh_storage_operations_total, instance)",
         "description": null,
         "error": null,
         "hide": 0,
-        "includeAll": false,
+        "includeAll": true,
         "label": null,
-        "multi": false,
+        "multi": true,
         "name": "cassandra",
         "options": [],
         "query": {
-          "query": "label_values(swh_objects_total, instance)",
+          "query": "label_values(swh_storage_operations_total, instance)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
-        "sort": 0,
+        "sort": 1,
         "tagValuesQuery": "",
         "tagsQuery": "",
         "type": "query",
         "useTags": false
       },
       {
         "allValue": null,
         "current": {
-          "selected": false,
+          "selected": true,
           "text": [
             "All"
           ],
           "value": [
             "$__all"
           ]
         },
         "datasource": null,
-        "definition": "label_values(swh_objects_total, type)",
+        "definition": "label_values(swh_storage_operations_total, object_type)",
         "description": null,
         "error": null,
         "hide": 2,
         "includeAll": true,
         "label": null,
         "multi": true,
         "name": "object",
         "options": [],
         "query": {
-          "query": "label_values(swh_objects_total, type)",
+          "query": "label_values(swh_storage_operations_total, object_type)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
         "sort": 0,
         "tagValuesQuery": "",
         "tagsQuery": "",
         "type": "query",
         "useTags": false
       },
       {
         "auto": false,
         "auto_count": 30,
         "auto_min": "10s",
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "2m",
           "value": "2m"
         },
         "description": null,
         "error": null,
         "hide": 0,
         "label": null,
         "name": "inter",
         "options": [
           {
             "selected": true,
             "text": "2m",
             "value": "2m"
           },
           {
             "selected": false,
             "text": "5m",
             "value": "5m"
           },
           {
             "selected": false,
             "text": "10m",
             "value": "10m"
           },
           {
             "selected": false,
             "text": "30m",
             "value": "30m"
           },
           {
             "selected": false,
             "text": "1h",
             "value": "1h"
           },
           {
             "selected": false,
             "text": "6h",
             "value": "6h"
           },
           {
             "selected": false,
             "text": "12h",
             "value": "12h"
           },
           {
             "selected": false,
             "text": "1d",
             "value": "1d"
           },
           {
             "selected": false,
             "text": "7d",
             "value": "7d"
           },
           {
             "selected": false,
             "text": "14d",
             "value": "14d"
           },
           {
             "selected": false,
             "text": "30d",
             "value": "30d"
           }
         ],
         "query": "2m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
         "queryValue": "",
         "refresh": 2,
         "skipUrlSync": false,
         "type": "interval"
       }
     ]
   },
   "time": {
-    "from": "now-12h",
+    "from": "now-6h",
     "to": "now"
   },
   "timepicker": {
     "refresh_intervals": [
       "10s",
       "30s",
       "1m",
       "5m",
       "15m",
       "30m",
       "1h",
       "2h",
       "1d"
     ]
   },
   "timezone": "",
-  "title": "SWH objects",
-  "uid": "8PmeIpz7z",
-  "version": 7
-}
+  "title": "SWH storage statsd",
+  "uid": "ydJXRa47z",
+  "version": 8
+}
\ No newline at end of file
diff --git a/sysadmin/grid5000/cassandra/monitoring/grafana/dashboards/swh_objects_dashboard.json b/sysadmin/grid5000/cassandra/monitoring/grafana/dashboards/swh_objects_dashboard.json
index 5d6d979..d54e8ee 100644
--- a/sysadmin/grid5000/cassandra/monitoring/grafana/dashboards/swh_objects_dashboard.json
+++ b/sysadmin/grid5000/cassandra/monitoring/grafana/dashboards/swh_objects_dashboard.json
@@ -1,404 +1,404 @@
 {
   "annotations": {
     "list": [
       {
         "builtIn": 1,
         "datasource": "-- Grafana --",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "limit": 100,
         "matchAny": true,
         "name": "Annotations & Alerts",
         "tags": [
           "configuration",
           "admin",
           "run"
         ],
         "type": "tags"
       }
     ]
   },
   "editable": true,
   "gnetId": null,
   "graphTooltip": 1,
   "id": 1,
-  "iteration": 1625678740918,
+  "iteration": 1631014090658,
   "links": [],
   "panels": [
     {
       "collapsed": false,
       "datasource": null,
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
         "y": 0
       },
       "id": 2,
       "panels": [],
       "repeat": "object",
       "title": "${object}",
       "type": "row"
     },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
         "x": 0,
         "y": 1
       },
       "hiddenSeries": false,
       "id": 5,
       "interval": "1m",
       "legend": {
         "avg": false,
         "current": false,
         "hideEmpty": false,
         "hideZero": false,
         "max": false,
         "min": false,
         "show": true,
         "total": false,
         "values": false
       },
       "lines": true,
       "linewidth": 1,
       "nullPointMode": "null",
       "options": {
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "8.0.4",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
           "exemplar": true,
-          "expr": "avg(increase(swh_objects_total{instance=~\"${cassandra}\", type=~\"${object}\"}[$inter]))",
+          "expr": "avg(rate(swh_objects_total{instance=~\"${cassandra}\", type=~\"${object}\"}[$inter]))",
           "instant": false,
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "",
           "refId": "A"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
       "title": "Creation rate",
       "tooltip": {
         "shared": true,
         "sort": 0,
         "value_type": "individual"
       },
       "type": "graph",
       "xaxis": {
         "buckets": null,
         "mode": "time",
         "name": null,
         "show": true,
         "values": []
       },
       "yaxes": [
         {
           "$$hashKey": "object:57",
-          "format": "short",
+          "format": "ops",
           "label": null,
           "logBase": 1,
           "max": null,
           "min": "0",
           "show": true
         },
         {
           "$$hashKey": "object:58",
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
           "min": null,
           "show": true
         }
       ],
       "yaxis": {
         "align": false,
         "alignLevel": null
       }
     },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
         "x": 12,
         "y": 1
       },
       "hiddenSeries": false,
       "id": 4,
       "legend": {
         "avg": false,
         "current": false,
         "max": false,
         "min": false,
         "show": true,
         "total": false,
         "values": false
       },
       "lines": true,
       "linewidth": 1,
       "nullPointMode": "null",
       "options": {
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "8.0.4",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
           "exemplar": true,
           "expr": "swh_objects_total{instance=~\"${cassandra}\", type=~\"${object}\"}",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
       "title": "Total",
       "tooltip": {
         "shared": true,
         "sort": 0,
         "value_type": "individual"
       },
       "type": "graph",
       "xaxis": {
         "buckets": null,
         "mode": "time",
         "name": null,
         "show": true,
         "values": []
       },
       "yaxes": [
         {
           "$$hashKey": "object:57",
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
           "min": "0",
           "show": true
         },
         {
           "$$hashKey": "object:58",
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
           "min": null,
           "show": true
         }
       ],
       "yaxis": {
         "align": false,
         "alignLevel": null
       }
     }
   ],
   "refresh": "10s",
   "schemaVersion": 30,
   "style": "dark",
   "tags": [],
   "templating": {
     "list": [
       {
         "allValue": null,
         "current": {
           "selected": false,
-          "text": "parasilo-2.rennes.grid5000.fr:9100",
-          "value": "parasilo-2.rennes.grid5000.fr:9100"
+          "text": "parasilo-3.rennes.grid5000.fr:9100",
+          "value": "parasilo-3.rennes.grid5000.fr:9100"
         },
         "datasource": null,
         "definition": "label_values(swh_objects_total, instance)",
         "description": null,
         "error": null,
         "hide": 0,
         "includeAll": false,
         "label": null,
         "multi": false,
         "name": "cassandra",
         "options": [],
         "query": {
           "query": "label_values(swh_objects_total, instance)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
         "sort": 0,
         "tagValuesQuery": "",
         "tagsQuery": "",
         "type": "query",
         "useTags": false
       },
       {
         "allValue": null,
         "current": {
-          "selected": false,
+          "selected": true,
           "text": [
             "All"
           ],
           "value": [
             "$__all"
           ]
         },
         "datasource": null,
         "definition": "label_values(swh_objects_total, type)",
         "description": null,
         "error": null,
         "hide": 2,
         "includeAll": true,
         "label": null,
         "multi": true,
         "name": "object",
         "options": [],
         "query": {
           "query": "label_values(swh_objects_total, type)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
         "sort": 0,
         "tagValuesQuery": "",
         "tagsQuery": "",
         "type": "query",
         "useTags": false
       },
       {
         "auto": false,
         "auto_count": 30,
         "auto_min": "10s",
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "2m",
           "value": "2m"
         },
         "description": null,
         "error": null,
         "hide": 0,
         "label": null,
         "name": "inter",
         "options": [
           {
             "selected": true,
             "text": "2m",
             "value": "2m"
           },
           {
             "selected": false,
             "text": "5m",
             "value": "5m"
           },
           {
             "selected": false,
             "text": "10m",
             "value": "10m"
           },
           {
             "selected": false,
             "text": "30m",
             "value": "30m"
           },
           {
             "selected": false,
             "text": "1h",
             "value": "1h"
           },
           {
             "selected": false,
             "text": "6h",
             "value": "6h"
           },
           {
             "selected": false,
             "text": "12h",
             "value": "12h"
           },
           {
             "selected": false,
             "text": "1d",
             "value": "1d"
           },
           {
             "selected": false,
             "text": "7d",
             "value": "7d"
           },
           {
             "selected": false,
             "text": "14d",
             "value": "14d"
           },
           {
             "selected": false,
             "text": "30d",
             "value": "30d"
           }
         ],
         "query": "2m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
         "queryValue": "",
         "refresh": 2,
         "skipUrlSync": false,
         "type": "interval"
       }
     ]
   },
   "time": {
-    "from": "now-12h",
+    "from": "now-30d",
     "to": "now"
   },
   "timepicker": {
     "refresh_intervals": [
       "10s",
       "30s",
       "1m",
       "5m",
       "15m",
       "30m",
       "1h",
       "2h",
       "1d"
     ]
   },
   "timezone": "",
   "title": "SWH objects",
   "uid": "8PmeIpz7z",
-  "version": 7
-}
+  "version": 15
+}
\ No newline at end of file