Metrics improvement

[lorenzoronzani]

• Refactor of small things based on those discussed during the meeting.
• Updated dashboards according to those used in the published version of grafana