From cbbcd14158cc50581e9fd2391270948f88a82df4 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 4 Dec 2025 12:00:56 +0100 Subject: [PATCH] Recommit for updates in build 55 --- .../prometheus_cd_3A_3Amain_3A_3Adirs.html | 40 +++++++++++++++++-- .../prometheus_cd_3A_3Aparams.html | 34 +++++++++++++--- 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html index 789e8a6..a7c3c64 100644 --- a/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html @@ -128,7 +128,24 @@ 30 31 32 -33 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50
# File 'manifests/main/dirs.pp', line 6
@@ -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   => directory,
@@ -148,7 +165,7 @@ class prometheus_cd::main::dirs (
       seltype  => etc_t,
       seluser  => system_u,
     }
-    # service systemfile directory
+    # service system file directory
     file { $ps_system_file_dir:
       ensure   => directory,
       owner    => 'root',
@@ -159,6 +176,23 @@ class prometheus_cd::main::dirs (
       seltype  => systemd_unit_file_t,
       seluser  => unconfined_u,
     }
+    if $ps_write_external == true {
+      file { $ps_pruning_dir:
+        ensure   => directory,
+        owner    => 'prometheus',
+        group    => 'prometheus',
+        mode     => '0755',
+        selrange => s0,
+        selrole  => object_r,
+        seltype  => usr_,
+        seluser  => unconfined_u,
+      }
+    }
+    if $ps_write_external == false {
+      file { $ps_pruning_dir:
+        ensure   => absent,
+      }
+    }
   }
 }
diff --git a/doc/puppet_classes/prometheus_cd_3A_3Aparams.html b/doc/puppet_classes/prometheus_cd_3A_3Aparams.html index f2b5053..bbcf7cf 100644 --- a/doc/puppet_classes/prometheus_cd_3A_3Aparams.html +++ b/doc/puppet_classes/prometheus_cd_3A_3Aparams.html @@ -568,12 +568,30 @@ (String) - (defaults to: 'http://change.local') + (defaults to: 'http://changeme.local/write')

the full url for the remote write point

+
+ + + +
  • + + ps_pruning_dir + + + (String) + + + (defaults to: '/opt/prometheus-prune') + + + — +
    +

    the directory for the pruning script

  • @@ -589,7 +607,6 @@
     
     
    -32
     33
     34
     35
    @@ -655,10 +672,14 @@
     95
     96
     97
    -98
    +98 +99 +100 +101 +102 -
    # File 'manifests/params.pp', line 32
    +        
    # File 'manifests/params.pp', line 33
     
     class prometheus_cd::params (
     
    @@ -702,7 +723,10 @@ class prometheus_cd::params (
     
       # remote write external
       Boolean $ps_write_external    = false,
    -  String $ps_external_url       = 'http://change.local',
    +  String $ps_external_url       = 'http://changeme.local/write',
    +
    +  # pruning script
    +  String $ps_pruning_dir        = '/opt/prometheus-prune'
     
     ) {
       # defaults