confdroid/confdroid_prometheus
3
0
Fork 0
Code Wiki Activity

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

Browse Source 
Auto-merge for build 19

See merge request puppet/prometheus_cd!18
This commit is contained in:
Jenkins
2025-10-18 12:01:11 +00:00
parent fccb178314 838685c7bf
commit 401d93735d
4 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
doc/puppet_classes/prometheus_cd_3A_3Amain_3A_3Afiles.html
View File

@@ -116,7 +116,9 @@
18 18
19 19
20 20
21</pre> 21
22
23</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -124,17 +126,19 @@
class prometheus_cd::main::files ( class prometheus_cd::main::files (
) inherits prometheus_cd::params { ) inherits prometheus_cd::params {
require prometheus_cd::main::dirs require prometheus_cd::main::dirs
file { $ps_main_file: if $ps_prom_host == fqdn {
ensure =&gt; file, file { $ps_main_file:
owner =&gt; &#39;root&#39;, ensure =&gt; file,
group =&gt; &#39;root&#39;, owner =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;, group =&gt; &#39;root&#39;,
selrange =&gt; s0, mode =&gt; &#39;0644&#39;,
selrole =&gt; object_r, selrange =&gt; s0,
seltype =&gt; etc_t, selrole =&gt; object_r,
seluser =&gt; system_u, seltype =&gt; etc_t,
content =&gt; template(&#39;prometheus_cd/prometheus.yml.erb&#39;), seluser =&gt; system_u,
notify =&gt; Service[$ps_prom_service], content =&gt; template(&#39;prometheus_cd/prometheus.yml.erb&#39;),
notify =&gt; Service[$ps_prom_service],
}
} }
}</pre> }</pre>
</td> </td>

19
doc/puppet_classes/prometheus_cd_3A_3Aparams.html
View File

@@ -292,7 +292,7 @@
<li> <li>
<span class='name'>ps_auth_user</span> <span class='name'>ps_auth_pass</span>
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
@@ -308,19 +308,6 @@
</li> </li>
<li>
<span class='name'>ps_auth_pass</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;changeme&#39;</tt>)</em>
</li>
</ul> </ul>
@@ -371,7 +358,8 @@
53 53
54 54
55 55
56</pre> 56
57</pre>
</td> </td>
<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 17</span>
@@ -413,6 +401,7 @@ class prometheus_cd::params (
# services # services
$ps_prom_service = &#39;prometheus&#39; $ps_prom_service = &#39;prometheus&#39;
$ps_ne_service = &#39;node_exporter&#39; $ps_ne_service = &#39;node_exporter&#39;
# includes must be last # includes must be last
include prometheus_cd::main::config include prometheus_cd::main::config
}</pre> }</pre>

24
manifests/main/files.pp
View File

@@ -6,16 +6,18 @@
class prometheus_cd::main::files ( class prometheus_cd::main::files (
) inherits prometheus_cd::params { ) inherits prometheus_cd::params {
require prometheus_cd::main::dirs require prometheus_cd::main::dirs
file { $ps_main_file: if $ps_prom_host == fqdn {
ensure => file, file { $ps_main_file:
owner => 'root', ensure => file,
group => 'root', owner => 'root',
mode => '0644', group => 'root',
selrange => s0, mode => '0644',
selrole => object_r, selrange => s0,
seltype => etc_t, selrole => object_r,
seluser => system_u, seltype => etc_t,
content => template('prometheus_cd/prometheus.yml.erb'), seluser => system_u,
notify => Service[$ps_prom_service], content => template('prometheus_cd/prometheus.yml.erb'),
notify => Service[$ps_prom_service],
}
} }
} }

3
manifests/params.pp
View File

@@ -12,7 +12,7 @@
# @param [String] ps_fw_prefix the firewall rule prefix # @param [String] ps_fw_prefix the firewall rule prefix
# @param [String] ps_main_port the firewall main port for prometheus # @param [String] ps_main_port the firewall main port for prometheus
# @param [String] ps_auth_user the username for authentication # @param [String] ps_auth_user the username for authentication
# @param [String] ps_auth_user the password for authentication # @param [String] ps_auth_pass the password for authentication
############################################################################## ##############################################################################
class prometheus_cd::params ( class prometheus_cd::params (
@@ -51,6 +51,7 @@ class prometheus_cd::params (
# services # services
$ps_prom_service = 'prometheus' $ps_prom_service = 'prometheus'
$ps_ne_service = 'node_exporter' $ps_ne_service = 'node_exporter'
# includes must be last # includes must be last
include prometheus_cd::main::config include prometheus_cd::main::config
} }