Improved grafana dashboards