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

Auto-merge for build 28

See merge request puppet/prometheus_cd!27

doc/puppet_classes/prometheus_cd_3A_3Aparams.html

@@ -304,6 +304,42 @@
         —
         <div class='inline'>
 <p>the password for authentication</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ps_retention_time</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;15d&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>tsdb retention time</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ps_retention_size</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;20GB&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>tsdb retention size</p>
 </div>
       
     </li>
@@ -319,8 +355,6 @@
         <pre class="lines">
 
 
-17
-18
 19
 20
 21
@@ -361,10 +395,16 @@
 56
 57
 58
-59</pre>
+59
+60
+61
+62
+63
+64
+65</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 17</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span>
 
 class prometheus_cd::params (
 
@@ -387,6 +427,10 @@ class prometheus_cd::params (
   String $ps_auth_user          = &#39;changeme&#39;,
   String $ps_auth_pass          = &#39;changeme&#39;,
 
+  # storage
+  String $ps_retention_time     = &#39;15d&#39;,
+  String $ps_retention_size     = &#39;20GB&#39;,
+
 ) {
   # defaults
   $fqdn                   = $facts[&#39;networking&#39;][&#39;fqdn&#39;]

manifests/params.pp

@@ -13,6 +13,8 @@
 # @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_retention_time tsdb retention time
+# @param [String] ps_retention_size tsdb retention size
 ##############################################################################
 class prometheus_cd::params (
 
@@ -35,6 +37,10 @@ class prometheus_cd::params (
   String $ps_auth_user          = 'changeme',
   String $ps_auth_pass          = 'changeme',
 
+  # storage
+  String $ps_retention_time     = '15d',
+  String $ps_retention_size     = '20GB',
+
 ) {
   # defaults
   $fqdn                   = $facts['networking']['fqdn']

templates/override.conf.erb

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