Resolve "Upgrade Grafana and its dashboards"

Closes #1322 (closed)

The MR is small. It just re-order a lot of lines in the Grafana dashboards. #huge-sorry