Merge branch 'jenkins-build-33' into 'master'

Auto-merge for build 33

See merge request puppet/prometheus_cd!32

templates/override.conf.erb

@@ -5,6 +5,7 @@
 ExecStart=
 ExecStart=/usr/bin/prometheus \
   --config.file=/etc/prometheus/prometheus.yml \
+  --web.config.file=/etc/prometheus/web.yml \
   --storage.tsdb.path=/var/lib/prometheus \
   --storage.tsdb.retention.time=<%= @ps_retention_time %> \
   --storage.tsdb.retention.size=<%= @ps_retention_size %> \