Merge "Fix Grafana data path for Docker stack"