3
0

Merge branch 'jenkins-build-6' into 'master'

Auto-merge for build 6

See merge request puppet/prometheus_cd!5
This commit is contained in:
2025-06-13 13:29:52 +00:00
8 changed files with 156 additions and 10 deletions

View File

@@ -1,5 +1,6 @@
{
"cSpell.words": [
"reqpackage",
"rpms",
"sslcacert",
"sslverify"

View File

@@ -9,6 +9,7 @@
Prometheus is an open-source monitoring system with a dimensional data model, flexible query language, efficient time series database and modern alerting approach.
`prometheus_cd` is a Puppet module to automate installation and configuration of prometheus and node exporter.
This module supports either managing prometheus or node_exporter or both. You need to set the parameters `$manage_prometheus`and / or `$manage_node_exporter`to true ( false by default)
## WARNING

View File

@@ -68,7 +68,7 @@
<p>Prometheus is an open-source monitoring system with a dimensional data model, flexible query language, efficient time series database and modern alerting approach.</p>
<p><code>prometheus_cd</code> is a Puppet module to automate installation and configuration of prometheus and node exporter.</p>
<p><code>prometheus_cd</code> is a Puppet module to automate installation and configuration of prometheus and node exporter. This module supports either managing prometheus or node_exporter or both. You need to set the parameters <code>$manage_prometheus</code>and / or <code>$manage_node_exporter</code>to true ( false by default)</p>
<h2 id="label-WARNING">WARNING</h2>

View File

@@ -68,7 +68,7 @@
<p>Prometheus is an open-source monitoring system with a dimensional data model, flexible query language, efficient time series database and modern alerting approach.</p>
<p><code>prometheus_cd</code> is a Puppet module to automate installation and configuration of prometheus and node exporter.</p>
<p><code>prometheus_cd</code> is a Puppet module to automate installation and configuration of prometheus and node exporter. This module supports either managing prometheus or node_exporter or both. You need to set the parameters <code>$manage_prometheus</code>and / or <code>$manage_node_exporter</code>to true ( false by default)</p>
<h2 id="label-WARNING">WARNING</h2>

View File

@@ -104,7 +104,17 @@
6
7
8
9</pre>
9
10
11
12
13
14
15
16
17
18
19</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -112,6 +122,16 @@
class prometheus_cd::main::install (
) inherits prometheus_cd::params {
require prometheus_cd::main::yumrepo
if $manage_prometheus == true {
package { $reqpackage_prom:
ensure =&gt; $pkg_ensure,
}
}
if $manage_node_exporter == true {
package { $reqpackage_ne:
ensure =&gt; $pkg_ensure,
}
}
}</pre>
</td>
</tr>

View File

@@ -105,7 +105,101 @@
<div class="tags">
<p class="tag_title">Parameters:</p>
<ul class="param">
<li>
<span class='name'>reqpackage_prom</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;prometheus&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the prometheus package</p>
</div>
</li>
<li>
<span class='name'>reqpackage_ne</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;node_exporter&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the node_exporter package</p>
</div>
</li>
<li>
<span class='name'>pkg_ensure</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>which version of the package to install</p>
</div>
</li>
<li>
<span class='name'>manage_prometheus</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>whether to manage prometheus</p>
</div>
</li>
<li>
<span class='name'>manage_node_exporter</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>whether to manage node exporter</p>
</div>
</li>
</ul>
</div><div class="method_details_list">
@@ -115,17 +209,27 @@
<pre class="lines">
6
7
8
9
10
11</pre>
11
12
13
14
15
16
17
18
19
20
21</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 6</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 11</span>
class prometheus_cd::params (
String $reqpackage_prom = &#39;prometheus&#39;,
String $reqpackage_ne = &#39;node_exporter&#39;,
String $pkg_ensure = &#39;present&#39;,
Boolean $manage_prometheus = false,
Boolean $manage_node_exporter = false,
) {
# includes must be last

View File

@@ -6,4 +6,14 @@
class prometheus_cd::main::install (
) inherits prometheus_cd::params {
require prometheus_cd::main::yumrepo
if $manage_prometheus == true {
package { $reqpackage_prom:
ensure => $pkg_ensure,
}
}
if $manage_node_exporter == true {
package { $reqpackage_ne:
ensure => $pkg_ensure,
}
}
}

View File

@@ -2,8 +2,18 @@
# Module name: prometheus_cd
# Author: Arne Teuke (arne_teuke@confdroid.com)
# @summary Class holds all parameters for the prometheus_cd module.
# @param [String] reqpackage_prom the prometheus package
# @param [String] reqpackage_ne the node_exporter package
# @param [String] pkg_ensure which version of the package to install
# @param [boolean] manage_prometheus whether to manage prometheus
# @param [boolean] manage_node_exporter whether to manage node exporter
##############################################################################
class prometheus_cd::params (
String $reqpackage_prom = 'prometheus',
String $reqpackage_ne = 'node_exporter',
String $pkg_ensure = 'present',
Boolean $manage_prometheus = false,
Boolean $manage_node_exporter = false,
) {
# includes must be last