From a7ab74eced9fb3eec50d6ce9a7414b0e173d8a73 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 27 Feb 2026 15:38:47 +0100 Subject: [PATCH] Recommit for updates in build 17 --- ...fdroid_prometheus_3A_3Amain_3A_3Adirs.html | 28 +------------------ ...oid_prometheus_3A_3Amain_3A_3Ainstall.html | 18 ++---------- .../confdroid_prometheus_3A_3Aparams.html | 28 +++---------------- 3 files changed, 8 insertions(+), 66 deletions(-) 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 d8f7e3f..8a857b4 100644 --- a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Adirs.html @@ -145,20 +145,7 @@ 47 48 49 -50 -51 -52 -53 -54 -55 -56 -57 -58 -59 -60 -61 -62 -63 +50
# File 'manifests/main/dirs.pp', line 6
@@ -206,19 +193,6 @@ class confdroid_prometheus::main::dirs (
         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_3Ainstall.html b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ainstall.html index 5b29927..88c1875 100644 --- a/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ainstall.html @@ -114,13 +114,7 @@ 16 17 18 -19 -20 -21 -22 -23 -24 -25 +19
# File 'manifests/main/install.pp', line 6
@@ -129,16 +123,10 @@ class confdroid_prometheus::main::install (
 ) inherits confdroid_prometheus::params {
   require confdroid_prometheus::main::yumrepo
   if $manage_prometheus  == true {
-    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
+    package { $reqpackage_prom:
+      ensure => $pkg_ensure,
     }
   }
-
   if $manage_node_exporter == true {
     package { $reqpackage_ne:
       ensure => $pkg_ensure,
diff --git a/doc/puppet_classes/confdroid_prometheus_3A_3Aparams.html b/doc/puppet_classes/confdroid_prometheus_3A_3Aparams.html
index edda519..af9140a 100644
--- a/doc/puppet_classes/confdroid_prometheus_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_prometheus_3A_3Aparams.html
@@ -808,24 +808,6 @@
         —
         

the SQL template to use for checks.

-
- - - -
  • - - install_from_binary - - - (Boolean) - - - (defaults to: false) - - - — -
    -

    whether to install from binary releases instead of packages

  • @@ -841,6 +823,8 @@
     
     
    +45
    +46
     47
     48
     49
    @@ -927,13 +911,10 @@
     130
     131
     132
    -133
    -134
    -135
    -136
    +133
    -
    # File 'manifests/params.pp', line 47
    +        
    # File 'manifests/params.pp', line 45
     
     class confdroid_prometheus::params (
     
    @@ -941,7 +922,6 @@ 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,