Merge "Fix alertmanager dashboard"