From f7ac960a8b0cfc7d7f7638c610c29083fdb8b6ba Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 4 Dec 2025 12:19:55 +0100 Subject: [PATCH] Recommit for updates in build 57 --- doc/file.README.html | 6 ++- doc/index.html | 6 ++- .../prometheus_cd_3A_3Amain_3A_3Afiles.html | 40 ++++++++++++++++++- .../prometheus_cd_3A_3Aparams.html | 17 +++++++- 4 files changed, 65 insertions(+), 4 deletions(-) diff --git a/doc/file.README.html b/doc/file.README.html index 7bf71c0..6ab6a8b 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -90,12 +90,16 @@

manage service

-

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 - –storage.tsdb.min-block-duration via ps_min_block_dur - –storage.tsdb.max-block-duration via ps_max_block_dur - authentication user via $ps_auth_user - authentication password via $ps_auth_pass - web authentication password via $ps_web_pass ( different format required) - external remote write ( writing to a remote instance like pg-adapter): - ps_write_external true enables it - ps_external_url must be a valid full url - ps_auth_ext_usermust be a valid user - ps_auth_ext_passmust be a valid password

+

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 - –storage.tsdb.min-block-duration via ps_min_block_dur - –storage.tsdb.max-block-duration via ps_max_block_dur - authentication user via $ps_auth_user - authentication password via $ps_auth_pass - web authentication password via $ps_web_pass ( different format required) - external remote write ( writing to a remote instance like pg-adapter): - ps_write_external true enables it - ps_external_url must be a valid full url - ps_auth_ext_usermust be a valid user - ps_auth_ext_passmust be a valid password - pruning local blocks - ps_enable_pruning true enables it - ps_pruning_dir the directory where the pruning script should live

Puppet Documentation

See the full Puppet documentation including parameters in docs/index.html

+

Wiki

+ +

Pruning process

+

Dependencies

All dependencies must be included in the catalogue.

diff --git a/doc/index.html b/doc/index.html index b8a1c94..7d6633e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -90,12 +90,16 @@

manage service

-

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 - –storage.tsdb.min-block-duration via ps_min_block_dur - –storage.tsdb.max-block-duration via ps_max_block_dur - authentication user via $ps_auth_user - authentication password via $ps_auth_pass - web authentication password via $ps_web_pass ( different format required) - external remote write ( writing to a remote instance like pg-adapter): - ps_write_external true enables it - ps_external_url must be a valid full url - ps_auth_ext_usermust be a valid user - ps_auth_ext_passmust be a valid password

+

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 - –storage.tsdb.min-block-duration via ps_min_block_dur - –storage.tsdb.max-block-duration via ps_max_block_dur - authentication user via $ps_auth_user - authentication password via $ps_auth_pass - web authentication password via $ps_web_pass ( different format required) - external remote write ( writing to a remote instance like pg-adapter): - ps_write_external true enables it - ps_external_url must be a valid full url - ps_auth_ext_usermust be a valid user - ps_auth_ext_passmust be a valid password - pruning local blocks - ps_enable_pruning true enables it - ps_pruning_dir the directory where the pruning script should live

Puppet Documentation

See the full Puppet documentation including parameters in docs/index.html

+

Wiki

+ +

Pruning process

+

Dependencies

All dependencies must be included in the catalogue.

diff --git a/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html index 0cee90a..021364e 100644 --- a/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html @@ -142,7 +142,26 @@ 44 45 46 -47 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 
# File 'manifests/main/files.pp', line 6
@@ -187,6 +206,25 @@ class prometheus_cd::main::files (
       content  => template('prometheus_cd/web.yml.erb'),
       notify   => Service[$ps_prom_service],
     }
+    if $ps_enable_pruning == true {
+      file { $ps_pruning_file:
+        ensure   => file,
+        owner    => 'prometheus',
+        group    => 'prometheus',
+        mode     => '0750',
+        selrange => s0,
+        selrole  => object_r,
+        seltype  => usr_,
+        seluser  => unconfined_u,
+        content  => template('prometheus_cd/prune_blocks.erb'),
+        # notify Service ToDo,
+      }
+    }
+    if $ps_enable_pruning == false {
+      file { $ps_pruning_fir:
+        ensure   => absent,
+      }
+    }
   }
 }
diff --git a/doc/puppet_classes/prometheus_cd_3A_3Aparams.html b/doc/puppet_classes/prometheus_cd_3A_3Aparams.html index 6cc2394..9bfd937 100644 --- a/doc/puppet_classes/prometheus_cd_3A_3Aparams.html +++ b/doc/puppet_classes/prometheus_cd_3A_3Aparams.html @@ -614,6 +614,19 @@ +
  • + + ps_pruning_file + + + (String) + + + (defaults to: "${ps_pruning_dir}/prune_prometheus_pg.sh") + + +
    • + @@ -695,7 +708,8 @@ 101 102 103 -104 +104 +105 
    # File 'manifests/params.pp', line 34
@@ -747,6 +761,7 @@ class prometheus_cd::params (
   # pruning script
   Boolean $ps_enable_pruning    = false,
   String $ps_pruning_dir        = '/opt/prometheus-prune',
+  String $ps_pruning_file       = "${ps_pruning_dir}/prune_prometheus_pg.sh",
 
 ) {
   # defaults