Merge "Fix Grafana dashboard with accurate HTTP 5xx rate"