Recommit for updates in build 57

doc/file.README.html

@@ -90,12 +90,16 @@
 <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> - –storage.tsdb.wal-segment-size via <code>ps_wal_seg_size</code> - –storage.tsdb.min-block-duration via <code>ps_min_block_dur</code> - –storage.tsdb.max-block-duration via <code>ps_max_block_dur</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) - external remote write ( writing to a remote instance like pg-adapter):  - <code>ps_write_external</code> true enables it  - <code>ps_external_url</code> must be a valid full url  - <code>ps_auth_ext_user</code>must be a valid user  - <code>ps_auth_ext_pass</code>must be a valid password</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> - –storage.tsdb.min-block-duration via <code>ps_min_block_dur</code> - –storage.tsdb.max-block-duration via <code>ps_max_block_dur</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) - external remote write ( writing to a remote instance like pg-adapter):  - <code>ps_write_external</code> true enables it  - <code>ps_external_url</code> must be a valid full url  - <code>ps_auth_ext_user</code>must be a valid user  - <code>ps_auth_ext_pass</code>must be a valid password - pruning local blocks  - <code>ps_enable_pruning</code> true enables it  - <code>ps_pruning_dir</code> the directory where the pruning script should live</p>
 
 <h2 id="label-Puppet+Documentation">Puppet Documentation</h2>
 
 <p>See the full Puppet documentation including parameters in <code>docs/index.html</code></p>
 
+<h1 id="label-Wiki">Wiki</h1>
+
+<p><a href="/wiki/pruning_md.html">Pruning process</a></p>
+
 <h2 id="label-Dependencies">Dependencies</h2>
 
 <p>All dependencies must be included in the catalogue.</p>

doc/index.html

@@ -90,12 +90,16 @@
 <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> - –storage.tsdb.wal-segment-size via <code>ps_wal_seg_size</code> - –storage.tsdb.min-block-duration via <code>ps_min_block_dur</code> - –storage.tsdb.max-block-duration via <code>ps_max_block_dur</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) - external remote write ( writing to a remote instance like pg-adapter):  - <code>ps_write_external</code> true enables it  - <code>ps_external_url</code> must be a valid full url  - <code>ps_auth_ext_user</code>must be a valid user  - <code>ps_auth_ext_pass</code>must be a valid password</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> - –storage.tsdb.min-block-duration via <code>ps_min_block_dur</code> - –storage.tsdb.max-block-duration via <code>ps_max_block_dur</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) - external remote write ( writing to a remote instance like pg-adapter):  - <code>ps_write_external</code> true enables it  - <code>ps_external_url</code> must be a valid full url  - <code>ps_auth_ext_user</code>must be a valid user  - <code>ps_auth_ext_pass</code>must be a valid password - pruning local blocks  - <code>ps_enable_pruning</code> true enables it  - <code>ps_pruning_dir</code> the directory where the pruning script should live</p>
 
 <h2 id="label-Puppet+Documentation">Puppet Documentation</h2>
 
 <p>See the full Puppet documentation including parameters in <code>docs/index.html</code></p>
 
+<h1 id="label-Wiki">Wiki</h1>
+
+<p><a href="/wiki/pruning_md.html">Pruning process</a></p>
+
 <h2 id="label-Dependencies">Dependencies</h2>
 
 <p>All dependencies must be included in the catalogue.</p>

doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html

@@ -142,7 +142,26 @@
 44
 45
 46
-47</pre>
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -187,6 +206,25 @@ class prometheus_cd::main::files (
       content  =&gt; template(&#39;prometheus_cd/web.yml.erb&#39;),
       notify   =&gt; Service[$ps_prom_service],
     }
+    if $ps_enable_pruning == true {
+      file { $ps_pruning_file:
+        ensure   =&gt; file,
+        owner    =&gt; &#39;prometheus&#39;,
+        group    =&gt; &#39;prometheus&#39;,
+        mode     =&gt; &#39;0750&#39;,
+        selrange =&gt; s0,
+        selrole  =&gt; object_r,
+        seltype  =&gt; usr_,
+        seluser  =&gt; unconfined_u,
+        content  =&gt; template(&#39;prometheus_cd/prune_blocks.erb&#39;),
+        # notify Service ToDo,
+      }
+    }
+    if $ps_enable_pruning == false {
+      file { $ps_pruning_fir:
+        ensure   =&gt; absent,
+      }
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/prometheus_cd_3A_3Aparams.html

@@ -614,6 +614,19 @@
       
     </li>
   
+    <li>
+      
+        <span class='name'>ps_pruning_file</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&quot;${ps_pruning_dir}/prune_prometheus_pg.sh&quot;</tt>)</em>
+      
+      
+    </li>
+  
 </ul>
 
 
@@ -695,7 +708,8 @@
 101
 102
 103
-104</pre>
+104
+105</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 34</span>
@@ -747,6 +761,7 @@ class prometheus_cd::params (
   # pruning script
   Boolean $ps_enable_pruning    = false,
   String $ps_pruning_dir        = &#39;/opt/prometheus-prune&#39;,
+  String $ps_pruning_file       = &quot;${ps_pruning_dir}/prune_prometheus_pg.sh&quot;,
 
 ) {
   # defaults