Merge "[CORD-3057] Charts for the hippie-oss service"