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

Auto-merge for build 19

See merge request puppet/prometheus_cd!18

doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html

@@ -116,7 +116,9 @@
 18
 19
 20
-21</pre>
+21
+22
+23</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -124,17 +126,19 @@
 class prometheus_cd::main::files (
 ) inherits prometheus_cd::params {
   require prometheus_cd::main::dirs
-  file { $ps_main_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/prometheus.yml.erb&#39;),
-    notify   =&gt; Service[$ps_prom_service],
+  if $ps_prom_host == fqdn {
+    file { $ps_main_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/prometheus.yml.erb&#39;),
+      notify   =&gt; Service[$ps_prom_service],
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/prometheus_cd_3A_3Aparams.html

@@ -292,7 +292,7 @@
   
     <li>
       
-        <span class='name'>ps_auth_user</span>
+        <span class='name'>ps_auth_pass</span>
       
       
         <span class='type'>(<tt>String</tt>)</span>
@@ -308,19 +308,6 @@
       
     </li>
   
-    <li>
-      
-        <span class='name'>ps_auth_pass</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;changeme&#39;</tt>)</em>
-      
-      
-    </li>
-  
 </ul>
 
 
@@ -371,7 +358,8 @@
 53
 54
 55
-56</pre>
+56
+57</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 17</span>
@@ -413,6 +401,7 @@ class prometheus_cd::params (
   # services
   $ps_prom_service        = &#39;prometheus&#39;
   $ps_ne_service          = &#39;node_exporter&#39;
+
   # includes must be last
   include prometheus_cd::main::config
 }</pre>

manifests/main/files.pp

@@ -6,16 +6,18 @@
 class prometheus_cd::main::files (
 ) inherits prometheus_cd::params {
   require prometheus_cd::main::dirs
-  file { $ps_main_file:
-    ensure   => file,
-    owner    => 'root',
-    group    => 'root',
-    mode     => '0644',
-    selrange => s0,
-    selrole  => object_r,
-    seltype  => etc_t,
-    seluser  => system_u,
-    content  => template('prometheus_cd/prometheus.yml.erb'),
-    notify   => Service[$ps_prom_service],
+  if $ps_prom_host == fqdn {
+    file { $ps_main_file:
+      ensure   => file,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0644',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => etc_t,
+      seluser  => system_u,
+      content  => template('prometheus_cd/prometheus.yml.erb'),
+      notify   => Service[$ps_prom_service],
+    }
   }
 }

manifests/params.pp

@@ -12,7 +12,7 @@
 # @param [String] ps_fw_prefix the firewall rule prefix
 # @param [String] ps_main_port the firewall main port for prometheus
 # @param [String] ps_auth_user the username for authentication
-# @param [String] ps_auth_user the password for authentication
+# @param [String] ps_auth_pass the password for authentication
 ##############################################################################
 class prometheus_cd::params (
 
@@ -51,6 +51,7 @@ class prometheus_cd::params (
   # services
   $ps_prom_service        = 'prometheus'
   $ps_ne_service          = 'node_exporter'
+
   # includes must be last
   include prometheus_cd::main::config
 }