Recommit for updates in build 15

This commit is contained in:
Jenkins Server
2026-02-27 15:19:14 +01:00
parent 9a51bf956e
commit b294b1500e
9 changed files with 78 additions and 18 deletions

View File

@@ -78,7 +78,7 @@
<div class="docstring"> <div class="docstring">
<div class="discussion"> <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>
</div> </div>

View File

@@ -83,7 +83,7 @@
<div class="docstring"> <div class="docstring">
<div class="discussion"> <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>
</div> </div>

View File

@@ -83,7 +83,7 @@
<div class="docstring"> <div class="docstring">
<div class="discussion"> <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>
</div> </div>

View File

@@ -83,7 +83,7 @@
<div class="docstring"> <div class="docstring">
<div class="discussion"> <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>
</div> </div>
@@ -145,7 +145,20 @@
47 47
48 48
49 49
50</pre> 50
51
52
53
54
55
56
57
58
59
60
61
62
63</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -190,7 +203,20 @@ class confdroid_prometheus::main::dirs (
} }
if $ps_enable_pruning == false { if $ps_enable_pruning == false {
file { $ps_pruning_dir: file { $ps_pruning_dir:
ensure =&gt; absent, 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,
} }
} }
} }

View File

@@ -83,7 +83,7 @@
<div class="docstring"> <div class="docstring">
<div class="discussion"> <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>
</div> </div>

View File

@@ -83,7 +83,7 @@
<div class="docstring"> <div class="docstring">
<div class="discussion"> <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>
</div> </div>
@@ -114,7 +114,13 @@
16 16
17 17
18 18
19</pre> 19
20
21
22
23
24
25</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span> <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 { ) inherits confdroid_prometheus::params {
require confdroid_prometheus::main::yumrepo require confdroid_prometheus::main::yumrepo
if $manage_prometheus == true { if $manage_prometheus == true {
package { $reqpackage_prom: if $install_from_binary == false {
ensure =&gt; $pkg_ensure, 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 { if $manage_node_exporter == true {
package { $reqpackage_ne: package { $reqpackage_ne:
ensure =&gt; $pkg_ensure, ensure =&gt; $pkg_ensure,

View File

@@ -83,7 +83,7 @@
<div class="docstring"> <div class="docstring">
<div class="discussion"> <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>
</div> </div>

View File

@@ -83,7 +83,7 @@
<div class="docstring"> <div class="docstring">
<div class="discussion"> <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>
</div> </div>

View File

@@ -99,7 +99,7 @@
<div class="docstring"> <div class="docstring">
<div class="discussion"> <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>
</div> </div>
@@ -808,6 +808,24 @@
&mdash; &mdash;
<div class='inline'> <div class='inline'>
<p>the SQL template to use for checks.</p> <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> </div>
</li> </li>
@@ -823,8 +841,6 @@
<pre class="lines"> <pre class="lines">
45
46
47 47
48 48
49 49
@@ -910,10 +926,14 @@
129 129
130 130
131 131
132</pre> 132
133
134
135
136</pre>
</td> </td>
<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 ( class confdroid_prometheus::params (
@@ -921,6 +941,7 @@ class confdroid_prometheus::params (
String $reqpackage_prom = &#39;prometheus2&#39;, String $reqpackage_prom = &#39;prometheus2&#39;,
String $reqpackage_ne = &#39;node_exporter&#39;, String $reqpackage_ne = &#39;node_exporter&#39;,
String $pkg_ensure = &#39;present&#39;, String $pkg_ensure = &#39;present&#39;,
Boolean $install_from_binary = false,
# config logic # config logic
Boolean $manage_prometheus = false, Boolean $manage_prometheus = false,
@@ -985,6 +1006,7 @@ class confdroid_prometheus::params (
$ps_main_dir = &#39;/etc/prometheus&#39; $ps_main_dir = &#39;/etc/prometheus&#39;
$ps_system_file_dir = &#39;/etc/systemd/system/prometheus.service.d&#39; $ps_system_file_dir = &#39;/etc/systemd/system/prometheus.service.d&#39;
$ps_system_dir = &#39;/etc/systemd/system/&#39; $ps_system_dir = &#39;/etc/systemd/system/&#39;
$ps_install_dir = &#39;/opt/prometheus&#39;
# files # files
$ps_main_file = &quot;${ps_main_dir}/prometheus.yml&quot; $ps_main_file = &quot;${ps_main_dir}/prometheus.yml&quot;