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

Auto-merge for build 17

See merge request puppet/prometheus_cd!16

doc/puppet_classes/prometheus_cd_3A_3Aparams.html

@@ -370,7 +370,8 @@
 52
 53
 54
-55</pre>
+55
+56</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 17</span>
@@ -407,6 +408,7 @@ class prometheus_cd::params (
   $ps_main_dir            = &#39;/etc/prometheus&#39;
 
   # files
+  $ps_main_file           = &quot;${ps_main_dir}/prometheus.yml&quot;
 
   # services
   $ps_prom_service        = &#39;prometheus&#39;

manifests/params.pp

@@ -46,6 +46,7 @@ class prometheus_cd::params (
   $ps_main_dir            = '/etc/prometheus'
 
   # files
+  $ps_main_file           = "${ps_main_dir}/prometheus.yml"
 
   # services
   $ps_prom_service        = 'prometheus'