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

Auto-merge for build 35

See merge request puppet/prometheus_cd!34

README.md

@@ -31,6 +31,7 @@ CONFIGURATION
 Configurable options:
 - --storage.tsdb.retention.time via `$ps_retention_time`
 - --storage.tsdb.retention.size via `$ps_retention_size`
+- --storage.tsdb.wal-segment-size via `ps_wal_seg_size`
 - authentication user via `$ps_auth_user`
 - authentication password via `$ps_auth_pass`
 - web authentication password via `$ps_web_pass` ( different format required)

doc/file.README.html

@@ -92,7 +92,7 @@
 <p>manage service</p>
 </li></ul>
 
-<p>Configurable options: - –storage.tsdb.retention.time via <code>$ps_retention_time</code> - –storage.tsdb.retention.size via <code>$ps_retention_size</code> - authentication user via <code>$ps_auth_user</code> - authentication password via <code>$ps_auth_pass</code> - web authentication password via <code>$ps_web_pass</code> ( different format required)</p>
+<p>Configurable options: - –storage.tsdb.retention.time via <code>$ps_retention_time</code> - –storage.tsdb.retention.size via <code>$ps_retention_size</code> - –storage.tsdb.wal-segment-size via <code>ps_wal_seg_size</code> - authentication user via <code>$ps_auth_user</code> - authentication password via <code>$ps_auth_pass</code> - web authentication password via <code>$ps_web_pass</code> ( different format required)</p>
 
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
 

doc/index.html

@@ -92,7 +92,7 @@
 <p>manage service</p>
 </li></ul>
 
-<p>Configurable options: - –storage.tsdb.retention.time via <code>$ps_retention_time</code> - –storage.tsdb.retention.size via <code>$ps_retention_size</code> - authentication user via <code>$ps_auth_user</code> - authentication password via <code>$ps_auth_pass</code> - web authentication password via <code>$ps_web_pass</code> ( different format required)</p>
+<p>Configurable options: - –storage.tsdb.retention.time via <code>$ps_retention_time</code> - –storage.tsdb.retention.size via <code>$ps_retention_size</code> - –storage.tsdb.wal-segment-size via <code>ps_wal_seg_size</code> - authentication user via <code>$ps_auth_user</code> - authentication password via <code>$ps_auth_pass</code> - web authentication password via <code>$ps_web_pass</code> ( different format required)</p>
 
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
 

doc/puppet_classes/prometheus_cd_3A_3Aparams.html

@@ -358,6 +358,24 @@
         —
         <div class='inline'>
 <p>tsdb retention size</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ps_wal_seg_size</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;50MB&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>WAL segment size</p>
 </div>
       
     </li>
@@ -373,7 +391,6 @@
         <pre class="lines">
 
 
-20
 21
 22
 23
@@ -421,10 +438,12 @@
 65
 66
 67
-68</pre>
+68
+69
+70</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 20</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 21</span>
 
 class prometheus_cd::params (
 
@@ -451,6 +470,7 @@ class prometheus_cd::params (
   # storage
   String $ps_retention_time     = &#39;15d&#39;,
   String $ps_retention_size     = &#39;20GB&#39;,
+  String $ps_wal_seg_size       = &#39;50MB&#39;,
 
 ) {
   # defaults

manifests/params.pp

@@ -16,6 +16,7 @@
 # @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
+# @param [String] ps_wal_seg_size WAL segment size
 ##############################################################################
 class prometheus_cd::params (
 
@@ -42,6 +43,7 @@ class prometheus_cd::params (
   # storage
   String $ps_retention_time     = '15d',
   String $ps_retention_size     = '20GB',
+  String $ps_wal_seg_size       = '50MB',
 
 ) {
   # defaults

templates/override.conf.erb

@@ -9,6 +9,7 @@ ExecStart=/usr/bin/prometheus \
   --storage.tsdb.path=/var/lib/prometheus \
   --storage.tsdb.retention.time=<%= @ps_retention_time %> \
   --storage.tsdb.retention.size=<%= @ps_retention_size %> \
+  --storage.tsdb.wal-segment-size=<%= @psps_wal_seg_size %> \
   --web.enable-remote-write-receiver \
   --web.enable-lifecycle \
   --storage.tsdb.wal-compression