From b294b1500e9848377d00282b22e01a83f8f2bb32 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 27 Feb 2026 15:19:14 +0100 Subject: [PATCH] Recommit for updates in build 15 --- doc/puppet_classes/confdroid_prometheus.html | 2 +- ...rometheus_3A_3Afirewall_3A_3Aiptables.html | 2 +- ...roid_prometheus_3A_3Amain_3A_3Aconfig.html | 2 +- ...fdroid_prometheus_3A_3Amain_3A_3Adirs.html | 32 +++++++++++++++++-- ...droid_prometheus_3A_3Amain_3A_3Afiles.html | 2 +- ...oid_prometheus_3A_3Amain_3A_3Ainstall.html | 20 +++++++++--- ...oid_prometheus_3A_3Amain_3A_3Aservice.html | 2 +- ...oid_prometheus_3A_3Amain_3A_3Ayumrepo.html | 2 +- .../confdroid_prometheus_3A_3Aparams.html | 32 ++++++++++++++++--- 9 files changed, 78 insertions(+), 18 deletions(-) diff --git a/doc/puppet_classes/confdroid_prometheus.html b/doc/puppet_classes/confdroid_prometheus.html index 74f1330..1922ed5 100644 --- a/doc/puppet_classes/confdroid_prometheus.html +++ b/doc/puppet_classes/confdroid_prometheus.html @@ -78,7 +78,7 @@
-

confdroid_prometheus::init.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)

+

confdroid_prometheus::init.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)

diff --git a/doc/puppet_classes/confdroid_prometheus_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/confdroid_prometheus_3A_3Afirewall_3A_3Aiptables.html index 7ab742c..25e806d 100644 --- a/doc/puppet_classes/confdroid_prometheus_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/confdroid_prometheus_3A_3Afirewall_3A_3Aiptables.html @@ -83,7 +83,7 @@
-

confdroid_prometheus::firewall::iptables.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)

+

confdroid_prometheus::firewall::iptables.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)

diff --git a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Aconfig.html index 2bd08a6..a1e1c06 100644 --- a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Aconfig.html @@ -83,7 +83,7 @@
-

confdroid_prometheus::main::config.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)

+

confdroid_prometheus::main::config.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)

diff --git a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Adirs.html index 0471b15..d8f7e3f 100644 --- a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Adirs.html @@ -83,7 +83,7 @@
-

confdroid_prometheus::main::dirs.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)

+

confdroid_prometheus::main::dirs.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)

@@ -145,7 +145,20 @@ 47 48 49 -50 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 
# File 'manifests/main/dirs.pp', line 6
@@ -190,7 +203,20 @@ class confdroid_prometheus::main::dirs (
     }
     if $ps_enable_pruning == false {
       file { $ps_pruning_dir:
-        ensure   => absent,
+        ensure => absent,
+      }
+    }
+    # binary install directory
+    if $install_from_binary == true {
+      file { $ps_install_dir:
+        ensure   => directory,
+        owner    => 'root',
+        group    => 'root',
+        mode     => '0755',
+        selrange => s0,
+        selrole  => object_r,
+        seltype  => usr_,
+        seluser  => unconfined_u,
       }
     }
   }
diff --git a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Afiles.html
index cf826e3..4f4f663 100644
--- a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Afiles.html
@@ -83,7 +83,7 @@
 

   

     
-
confdroid_prometheus::main::files.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)

+
confdroid_prometheus::main::files.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)

 
   

 

diff --git a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ainstall.html
index 334e2e6..5b29927 100644
--- a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ainstall.html
@@ -83,7 +83,7 @@
 

   

     
-
confdroid_prometheus::main::install.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)

+
confdroid_prometheus::main::install.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)

 
   

 

@@ -114,7 +114,13 @@
 16
 17
 18
-19
+19 +20 +21 +22 +23 +24 +25 
# File 'manifests/main/install.pp', line 6
@@ -123,10 +129,16 @@ class confdroid_prometheus::main::install (
 ) inherits confdroid_prometheus::params {
   require confdroid_prometheus::main::yumrepo
   if $manage_prometheus  == true {
-    package { $reqpackage_prom:
-      ensure => $pkg_ensure,
+    if $install_from_binary == false {
+      package { $reqpackage_prom:
+        ensure => $pkg_ensure,
+      }
+    }
+    if $install_from_binary == true {
+      # place function here to install from binary releases, e.g. using the archive module
     }
   }
+
   if $manage_node_exporter == true {
     package { $reqpackage_ne:
       ensure => $pkg_ensure,
diff --git a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Aservice.html
index 8ecb52a..191025a 100644
--- a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Aservice.html
+++ b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Aservice.html
@@ -83,7 +83,7 @@
 

   

     
-
confdroid_prometheus::main::service.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)

+
confdroid_prometheus::main::service.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)

 
   

 

diff --git a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ayumrepo.html b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ayumrepo.html
index 36f8843..9dc9b3e 100644
--- a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ayumrepo.html
+++ b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ayumrepo.html
@@ -83,7 +83,7 @@
 

   

     
-
confdroid_prometheus::main::yumrepo.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)

+
confdroid_prometheus::main::yumrepo.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)

 
   

 

diff --git a/doc/puppet_classes/confdroid_prometheus_3A_3Aparams.html b/doc/puppet_classes/confdroid_prometheus_3A_3Aparams.html
index 216eeac..edda519 100644
--- a/doc/puppet_classes/confdroid_prometheus_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_prometheus_3A_3Aparams.html
@@ -99,7 +99,7 @@
 

   

     
-
confdroid_prometheus::params.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)

+
confdroid_prometheus::params.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)

 
   

 

@@ -808,6 +808,24 @@
         —
         

 
the SQL template to use for checks.

+

+      
+    
+  
+    
  • 
+      
+        install_from_binary
+      
+      
+        (Boolean)
+      
+      
+        (defaults to: false)
+      
+      
+        —
+        
    
+
    whether to install from binary releases instead of packages
    
 
    
       
     
    • 
@@ -823,8 +841,6 @@
         
     
 
-45
-46
 47
 48
 49
@@ -910,10 +926,14 @@
 129
 130
 131
-132
    
+132
+133
+134
+135
+136
    - 
    # File 'manifests/params.pp', line 45
+        
    # File 'manifests/params.pp', line 47
 
 class confdroid_prometheus::params (
 
@@ -921,6 +941,7 @@ class confdroid_prometheus::params (
   String $reqpackage_prom       = 'prometheus2',
   String $reqpackage_ne         = 'node_exporter',
   String $pkg_ensure            = 'present',
+  Boolean $install_from_binary  = false,
 
   # config logic
   Boolean $manage_prometheus    = false,
@@ -985,6 +1006,7 @@ class confdroid_prometheus::params (
   $ps_main_dir            = '/etc/prometheus'
   $ps_system_file_dir     = '/etc/systemd/system/prometheus.service.d'
   $ps_system_dir          = '/etc/systemd/system/'
+  $ps_install_dir         = '/opt/prometheus'
 
   # files
   $ps_main_file           = "${ps_main_dir}/prometheus.yml"