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

Auto-merge for build 38

See merge request puppet/prometheus_cd!37

doc/puppet_classes/prometheus_cd_3A_3Aparams.html

@@ -380,6 +380,42 @@
       
     </li>
   
+    <li>
+      
+        <span class='name'>ps_min_block_dur</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;2h&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>tsdb minimum block duration</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ps_max_block_dur</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;2h&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>tsdb maximum block duration</p>
+</div>
+      
+    </li>
+  
     <li>
       
         <span class='name'>ps_max_mem</span>
@@ -481,8 +517,6 @@
         <pre class="lines">
 
 
-26
-27
 28
 29
 30
@@ -537,10 +571,14 @@
 79
 80
 81
-82</pre>
+82
+83
+84
+85
+86</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 26</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 28</span>
 
 class prometheus_cd::params (
 
@@ -568,6 +606,8 @@ class prometheus_cd::params (
   String $ps_retention_time     = &#39;15d&#39;,
   String $ps_retention_size     = &#39;20GB&#39;,
   String $ps_wal_seg_size       = &#39;50MB&#39;,
+  String $ps_min_block_dur      = &#39;2h&#39;,
+  String $ps_max_block_dur      = &#39;2h&#39;,
 
   # service
   String $ps_max_mem            = &#39;6G&#39;,

manifests/params.pp

@@ -17,6 +17,8 @@
 # @param [String] ps_retention_time tsdb retention time
 # @param [String] ps_retention_size tsdb retention size
 # @param [String] ps_wal_seg_size WAL segment size
+# @param [String] ps_min_block_dur tsdb minimum block duration
+# @param [String] ps_max_block_dur tsdb maximum block duration
 # @param [String] ps_max_mem hard memory ceiling
 # @param [String] ps_high_mem soft limit to make kernel reclaim earlier
 # @param [String] ps_swap_mem allow swap, but limit it
@@ -49,6 +51,8 @@ class prometheus_cd::params (
   String $ps_retention_time     = '15d',
   String $ps_retention_size     = '20GB',
   String $ps_wal_seg_size       = '50MB',
+  String $ps_min_block_dur      = '2h',
+  String $ps_max_block_dur      = '2h',
 
   # service
   String $ps_max_mem            = '6G',

templates/override.conf.erb

@@ -18,4 +18,6 @@ ExecStart=/usr/bin/prometheus \
   --storage.tsdb.wal-segment-size=<%= @ps_wal_seg_size %> \
   --web.enable-remote-write-receiver \
   --web.enable-lifecycle \
-  --storage.tsdb.wal-compression
+  --storage.tsdb.wal-compression \
+  --storage.tsdb.min-block-duration=<%= @ps_min_block_dur %> \
+  --storage.tsdb.max-block-duration=<%= @ps_max_block_dur %>