3
0

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

Auto-merge for build 23

See merge request puppet/prometheus_cd!22
This commit is contained in:
2025-10-18 12:42:58 +00:00
6 changed files with 54 additions and 10 deletions

View File

@@ -83,6 +83,11 @@
</li>
<li>
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::prometheus_cd::main::dirs (puppet_class)">prometheus_cd::main::dirs</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::prometheus_cd::main::files (puppet_class)">prometheus_cd::main::files</a></span>

View File

@@ -57,35 +57,42 @@
</li>
<li id="object_puppet_classes::prometheus_cd::main::files" class="even">
<li id="object_puppet_classes::prometheus_cd::main::dirs" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::prometheus_cd::main::dirs (puppet_class)">prometheus_cd::main::dirs</a></span>
</div>
</li>
<li id="object_puppet_classes::prometheus_cd::main::files" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::prometheus_cd::main::files (puppet_class)">prometheus_cd::main::files</a></span>
</div>
</li>
<li id="object_puppet_classes::prometheus_cd::main::install" class="odd">
<li id="object_puppet_classes::prometheus_cd::main::install" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::prometheus_cd::main::install (puppet_class)">prometheus_cd::main::install</a></span>
</div>
</li>
<li id="object_puppet_classes::prometheus_cd::main::service" class="even">
<li id="object_puppet_classes::prometheus_cd::main::service" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Aservice.html" title="puppet_classes::prometheus_cd::main::service (puppet_class)">prometheus_cd::main::service</a></span>
</div>
</li>
<li id="object_puppet_classes::prometheus_cd::main::yumrepo" class="odd">
<li id="object_puppet_classes::prometheus_cd::main::yumrepo" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Amain_3A_3Ayumrepo.html" title="puppet_classes::prometheus_cd::main::yumrepo (puppet_class)">prometheus_cd::main::yumrepo</a></span>
</div>
</li>
<li id="object_puppet_classes::prometheus_cd::params" class="even">
<li id="object_puppet_classes::prometheus_cd::params" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/prometheus_cd_3A_3Aparams.html" title="puppet_classes::prometheus_cd::params (puppet_class)">prometheus_cd::params</a></span>
</div>

View File

@@ -116,7 +116,19 @@
18
19
20
21</pre>
21
22
23
24
25
26
27
28
29
30
31
32
33</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -125,6 +137,7 @@ class prometheus_cd::main::dirs (
) inherits prometheus_cd::params {
require prometheus_cd::main::install
if ($ps_prom_host == $fqdn) and ($manage_prometheus == true) {
# prometheus directors
file { $ps_main_dir:
ensure =&gt; directory,
owner =&gt; &#39;root&#39;,
@@ -135,6 +148,17 @@ class prometheus_cd::main::dirs (
seltype =&gt; etc_t,
seluser =&gt; system_u,
}
# data directory
file { $ps_data_dir:
ensure =&gt; directory,
owner =&gt; &#39;prometheus&#39;,
group =&gt; &#39;prometheus&#39;,
mode =&gt; &#39;0750&#39;,
# selrange =&gt; s0,
# selrole =&gt; object_r,
# seltype =&gt; etc_t,
# seluser =&gt; system_u,
}
}
}</pre>
</td>

View File

@@ -67,6 +67,8 @@
<dt>Inherited by:</dt>
<dd>
<span class='object_link'><a href="prometheus_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::prometheus_cd::main::dirs (puppet_class)">prometheus_cd::main::dirs</a></span><br/>
<span class='object_link'><a href="prometheus_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::prometheus_cd::main::files (puppet_class)">prometheus_cd::main::files</a></span><br/>
<span class='object_link'><a href="prometheus_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::prometheus_cd::main::config (puppet_class)">prometheus_cd::main::config</a></span><br/>
@@ -317,6 +319,11 @@
<em class="default">(defaults to: <tt>&#39;/data/prometheus&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the data directory for prometheus</p>
</div>
</li>
</ul>
@@ -330,7 +337,6 @@
<pre class="lines">
17
18
19
20
@@ -371,10 +377,11 @@
55
56
57
58</pre>
58
59</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 17</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 18</span>
class prometheus_cd::params (

View File

@@ -19,7 +19,7 @@ class prometheus_cd::main::dirs (
seluser => system_u,
}
# data directory
file { $ps_data_dir,
file { $ps_data_dir:
ensure => directory,
owner => 'prometheus',
group => 'prometheus',

View File

@@ -13,6 +13,7 @@
# @param [String] ps_main_port the firewall main port for prometheus
# @param [String] ps_auth_user the username for authentication
# @param [String] ps_auth_pass the password for authentication
# @param [String] ps_data_dir the data directory for prometheus
##############################################################################
class prometheus_cd::params (