Recommit for updates in build 55

doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html

@@ -128,7 +128,24 @@
 30
 31
 32
-33</pre>
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -136,7 +153,7 @@
 class prometheus_cd::main::dirs (
 ) inherits prometheus_cd::params {
   require prometheus_cd::main::install
-  if ($ps_prom_host == $fqdn) and ($manage_prometheus == true)  {
+  if ($ps_prom_host == $fqdn) and ($manage_prometheus == true) {
     # prometheus directory
     file { $ps_main_dir:
       ensure   =&gt; directory,
@@ -148,7 +165,7 @@ class prometheus_cd::main::dirs (
       seltype  =&gt; etc_t,
       seluser  =&gt; system_u,
     }
-    # service systemfile directory
+    # service system file directory
     file { $ps_system_file_dir:
       ensure   =&gt; directory,
       owner    =&gt; &#39;root&#39;,
@@ -159,6 +176,23 @@ class prometheus_cd::main::dirs (
       seltype  =&gt; systemd_unit_file_t,
       seluser  =&gt; unconfined_u,
     }
+    if $ps_write_external == true {
+      file { $ps_pruning_dir:
+        ensure   =&gt; directory,
+        owner    =&gt; &#39;prometheus&#39;,
+        group    =&gt; &#39;prometheus&#39;,
+        mode     =&gt; &#39;0755&#39;,
+        selrange =&gt; s0,
+        selrole  =&gt; object_r,
+        seltype  =&gt; usr_,
+        seluser  =&gt; unconfined_u,
+      }
+    }
+    if $ps_write_external == false {
+      file { $ps_pruning_dir:
+        ensure   =&gt; absent,
+      }
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/prometheus_cd_3A_3Aparams.html

@@ -568,12 +568,30 @@
         <span class='type'>(<tt>String</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>&#39;http://change.local&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;http://changeme.local/write&#39;</tt>)</em>
       
       
         &mdash;
         <div class='inline'>
 <p>the full url for the remote write point</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ps_pruning_dir</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;/opt/prometheus-prune&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the directory for the pruning script</p>
 </div>
       
     </li>
@@ -589,7 +607,6 @@
         <pre class="lines">
 
 
-32
 33
 34
 35
@@ -655,10 +672,14 @@
 95
 96
 97
-98</pre>
+98
+99
+100
+101
+102</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 32</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 33</span>
 
 class prometheus_cd::params (
 
@@ -702,7 +723,10 @@ class prometheus_cd::params (
 
   # remote write external
   Boolean $ps_write_external    = false,
-  String $ps_external_url       = &#39;http://change.local&#39;,
+  String $ps_external_url       = &#39;http://changeme.local/write&#39;,
+
+  # pruning script
+  String $ps_pruning_dir        = &#39;/opt/prometheus-prune&#39;
 
 ) {
   # defaults