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

Auto-merge for build 32

See merge request puppet/prometheus_cd!31

doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html

@@ -130,7 +130,19 @@
 32
 33
 34
-35</pre>
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -163,6 +175,18 @@ class prometheus_cd::main::files (
       content  =&gt; template(&#39;prometheus_cd/override.conf.erb&#39;),
       notify   =&gt; Service[$ps_prom_service],
     }
+    file { $ps_web_config_file:
+      ensure   =&gt; file,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; &#39;root&#39;,
+      mode     =&gt; &#39;0644&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; etc_t,
+      seluser  =&gt; system_u,
+      content  =&gt; template(&#39;prometheus_cd/web.yml.erb&#39;),
+      notify   =&gt; Service[$ps_prom_service],
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/prometheus_cd_3A_3Aparams.html

@@ -308,6 +308,24 @@
       
     </li>
   
+    <li>
+      
+        <span class='name'>ps_web_pass</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;changeme&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the password for web authentication</p>
+</div>
+      
+    </li>
+  
     <li>
       
         <span class='name'>ps_retention_time</span>
@@ -355,7 +373,6 @@
         <pre class="lines">
 
 
-19
 20
 21
 22
@@ -401,10 +418,13 @@
 62
 63
 64
-65</pre>
+65
+66
+67
+68</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 20</span>
 
 class prometheus_cd::params (
 
@@ -426,6 +446,7 @@ class prometheus_cd::params (
   # auth
   String $ps_auth_user          = &#39;changeme&#39;,
   String $ps_auth_pass          = &#39;changeme&#39;,
+  String $ps_web_pass           = &#39;changeme&#39;,
 
   # storage
   String $ps_retention_time     = &#39;15d&#39;,
@@ -444,6 +465,7 @@ class prometheus_cd::params (
 
   # files
   $ps_main_file           = &quot;${ps_main_dir}/prometheus.yml&quot;
+  $ps_web_config_file     = &quot;${ps_main_dir}/web.yml&quot;
   $ps_system_service_file = &quot;${ps_system_file_dir}/override.conf&quot;
 
   # services

manifests/main/files.pp

@@ -31,5 +31,17 @@ class prometheus_cd::main::files (
       content  => template('prometheus_cd/override.conf.erb'),
       notify   => Service[$ps_prom_service],
     }
+    file { $ps_web_config_file:
+      ensure   => file,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0644',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => etc_t,
+      seluser  => system_u,
+      content  => template('prometheus_cd/web.yml.erb'),
+      notify   => Service[$ps_prom_service],
+    }
   }
 }

manifests/params.pp

@@ -13,6 +13,7 @@
 # @param [String] ps_main_port the firewall main port for prometheus
 # @param [String] ps_auth_user the username for authentication
 # @param [String] ps_auth_pass the password for authentication
+# @param [String] ps_web_pass the password for web authentication
 # @param [String] ps_retention_time tsdb retention time
 # @param [String] ps_retention_size tsdb retention size
 ##############################################################################
@@ -36,6 +37,7 @@ class prometheus_cd::params (
   # auth
   String $ps_auth_user          = 'changeme',
   String $ps_auth_pass          = 'changeme',
+  String $ps_web_pass           = 'changeme',
 
   # storage
   String $ps_retention_time     = '15d',
@@ -54,6 +56,7 @@ class prometheus_cd::params (
 
   # files
   $ps_main_file           = "${ps_main_dir}/prometheus.yml"
+  $ps_web_config_file     = "${ps_main_dir}/web.yml"
   $ps_system_service_file = "${ps_system_file_dir}/override.conf"
 
   # services

templates/web.yml.erb

@@ -0,0 +1,5 @@
+##############################################################################
+#####    File created by Puppet - manual changes will be overwritten      #####
+###############################################################################
+basic_auth_users:
+    <%= @ps_auth_user %>: <%= @ps_web_pass %>