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

Auto-merge for build 25

See merge request puppet/prometheus_cd!24

doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html

@@ -117,18 +117,7 @@
 19
 20
 21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33</pre>
+22</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -148,17 +137,6 @@ class prometheus_cd::main::dirs (
       seltype  =&gt; etc_t,
       seluser  =&gt; system_u,
     }
-    # data directory
-    file { $ps_data_dir:
-      ensure   =&gt; directory,
-      owner    =&gt; &#39;prometheus&#39;,
-      group    =&gt; &#39;prometheus&#39;,
-      mode     =&gt; &#39;0750&#39;,
-      selrange =&gt; s0,
-      selrole  =&gt; object_r,
-      seltype  =&gt; default_t,
-      seluser  =&gt; system_u,
-    }
   }
 }</pre>
       </td>

doc/puppet_classes/prometheus_cd_3A_3Aparams.html

@@ -304,24 +304,6 @@
         —
         <div class='inline'>
 <p>the password for authentication</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ps_data_dir</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;/data/prometheus&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>the data directory for prometheus</p>
 </div>
       
     </li>
@@ -337,6 +319,7 @@
         <pre class="lines">
 
 
+17
 18
 19
 20
@@ -376,12 +359,10 @@
 54
 55
 56
-57
-58
-59</pre>
+57</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 18</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 17</span>
 
 class prometheus_cd::params (
 
@@ -395,7 +376,6 @@ class prometheus_cd::params (
   Boolean $manage_node_exporter = false,
   Boolean $ps_manage_fw         = false,
   String $ps_prom_host          = &#39;prometheus.example.net&#39;,
-  String $ps_data_dir           = &#39;/data/prometheus&#39;,
 
   # firewall
   String $ps_fw_prefix          = &#39;50&#39;,

manifests/main/dirs.pp

@@ -18,16 +18,5 @@ class prometheus_cd::main::dirs (
       seltype  => etc_t,
       seluser  => system_u,
     }
-    # data directory
-    file { $ps_data_dir:
-      ensure   => directory,
-      owner    => 'prometheus',
-      group    => 'prometheus',
-      mode     => '0750',
-      selrange => s0,
-      selrole  => object_r,
-      seltype  => default_t,
-      seluser  => system_u,
-    }
   }
 }

manifests/params.pp

@@ -13,7 +13,6 @@
 # @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_data_dir the data directory for prometheus
 ##############################################################################
 class prometheus_cd::params (
 
@@ -27,7 +26,6 @@ class prometheus_cd::params (
   Boolean $manage_node_exporter = false,
   Boolean $ps_manage_fw         = false,
   String $ps_prom_host          = 'prometheus.example.net',
-  String $ps_data_dir           = '/data/prometheus',
 
   # firewall
   String $ps_fw_prefix          = '50',

templates/prometheus.yml.erb

@@ -9,7 +9,6 @@ global:
 storage:
   tsdb:
     out_of_order_time_window: 5m
-    path: <%= @ps_data_dir %>
 alerting:
   alertmanagers:
   - follow_redirects: true