Merge branch 'develop' into tom/saa/template

Author: tomashley

ansible/files/postgres_exporter.service.j2

@@ -4,6 +4,7 @@ Description=Postgres Exporter
 [Service]
 Type=simple
 ExecStart=/opt/postgres_exporter/postgres_exporter --disable-settings-metrics --extend.query-path="/opt/postgres_exporter/queries.yml" --disable-default-metrics --no-collector.locks --no-collector.replication --no-collector.replication_slot --no-collector.stat_bgwriter --no-collector.stat_database --no-collector.stat_user_tables --no-collector.statio_user_tables --no-collector.wal {% if qemu_mode is defined and qemu_mode %}--no-collector.database {% endif %}
+
 User=postgres
 Group=postgres
 Restart=always