Recommit for updates in build 15

doc/puppet_classes/confdroid_prometheus.html

@@ -78,7 +78,7 @@
 <div class="docstring">
   <div class="discussion">
     
-<p>confdroid_prometheus::init.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)</p>
+<p>confdroid_prometheus::init.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)</p>
 
   </div>
 </div>

doc/puppet_classes/confdroid_prometheus_3A_3Afirewall_3A_3Aiptables.html

@@ -83,7 +83,7 @@
 <div class="docstring">
   <div class="discussion">
     
-<p>confdroid_prometheus::firewall::iptables.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)</p>
+<p>confdroid_prometheus::firewall::iptables.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)</p>
 
   </div>
 </div>

doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Aconfig.html

@@ -83,7 +83,7 @@
 <div class="docstring">
   <div class="discussion">
     
-<p>confdroid_prometheus::main::config.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)</p>
+<p>confdroid_prometheus::main::config.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)</p>
 
   </div>
 </div>

doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Adirs.html

@@ -83,7 +83,7 @@
 <div class="docstring">
   <div class="discussion">
     
-<p>confdroid_prometheus::main::dirs.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)</p>
+<p>confdroid_prometheus::main::dirs.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)</p>
 
   </div>
 </div>
@@ -145,7 +145,20 @@
 47
 48
 49
-50</pre>
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -193,6 +206,19 @@ class confdroid_prometheus::main::dirs (
         ensure =&gt; absent,
       }
     }
+    # binary install directory
+    if $install_from_binary == true {
+      file { $ps_install_dir:
+        ensure   =&gt; directory,
+        owner    =&gt; &#39;root&#39;,
+        group    =&gt; &#39;root&#39;,
+        mode     =&gt; &#39;0755&#39;,
+        selrange =&gt; s0,
+        selrole  =&gt; object_r,
+        seltype  =&gt; usr_,
+        seluser  =&gt; unconfined_u,
+      }
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Afiles.html

@@ -83,7 +83,7 @@
 <div class="docstring">
   <div class="discussion">
     
-<p>confdroid_prometheus::main::files.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)</p>
+<p>confdroid_prometheus::main::files.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)</p>
 
   </div>
 </div>

doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ainstall.html

@@ -83,7 +83,7 @@
 <div class="docstring">
   <div class="discussion">
     
-<p>confdroid_prometheus::main::install.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)</p>
+<p>confdroid_prometheus::main::install.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)</p>
 
   </div>
 </div>
@@ -114,7 +114,13 @@
 16
 17
 18
-19</pre>
+19
+20
+21
+22
+23
+24
+25</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -123,10 +129,16 @@ 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 =&gt; $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 =&gt; $pkg_ensure,

doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Aservice.html

@@ -83,7 +83,7 @@
 <div class="docstring">
   <div class="discussion">
     
-<p>confdroid_prometheus::main::service.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)</p>
+<p>confdroid_prometheus::main::service.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)</p>
 
   </div>
 </div>

doc/puppet_classes/confdroid_prometheus_3A_3Amain_3A_3Ayumrepo.html

@@ -83,7 +83,7 @@
 <div class="docstring">
   <div class="discussion">
     
-<p>confdroid_prometheus::main::yumrepo.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)</p>
+<p>confdroid_prometheus::main::yumrepo.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)</p>
 
   </div>
 </div>

doc/puppet_classes/confdroid_prometheus_3A_3Aparams.html

@@ -99,7 +99,7 @@
 <div class="docstring">
   <div class="discussion">
     
-<p>confdroid_prometheus::params.pp Module name: confdroid_prometheus Author: Arne Teuke (arne_teuke@confdroid.com)</p>
+<p>confdroid_prometheus::params.pp Module name: confdroid_prometheus Author: 12ww1160 (12ww1160@confdroid.com)</p>
 
   </div>
 </div>
@@ -808,6 +808,24 @@
         &mdash;
         <div class='inline'>
 <p>the SQL template to use for checks.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>install_from_binary</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>false</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>whether to install from binary releases instead of packages</p>
 </div>
       
     </li>
@@ -823,8 +841,6 @@
         <pre class="lines">
 
 
-45
-46
 47
 48
 49
@@ -910,10 +926,14 @@
 129
 130
 131
-132</pre>
+132
+133
+134
+135
+136</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 45</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 47</span>
 
 class confdroid_prometheus::params (
 
@@ -921,6 +941,7 @@ class confdroid_prometheus::params (
   String $reqpackage_prom       = &#39;prometheus2&#39;,
   String $reqpackage_ne         = &#39;node_exporter&#39;,
   String $pkg_ensure            = &#39;present&#39;,
+  Boolean $install_from_binary  = false,
 
   # config logic
   Boolean $manage_prometheus    = false,
@@ -985,6 +1006,7 @@ class confdroid_prometheus::params (
   $ps_main_dir            = &#39;/etc/prometheus&#39;
   $ps_system_file_dir     = &#39;/etc/systemd/system/prometheus.service.d&#39;
   $ps_system_dir          = &#39;/etc/systemd/system/&#39;
+  $ps_install_dir         = &#39;/opt/prometheus&#39;
 
   # files
   $ps_main_file           = &quot;${ps_main_dir}/prometheus.yml&quot;