Merge "Day2 configs for Prometheus and Collectd"