recommit for updates in build 37

This commit is contained in:
Jenkins ConfDroid
2025-03-02 13:16:22 +01:00
parent c6fb468f8e
commit 8b321cd316
8 changed files with 61 additions and 88 deletions

View File

@@ -173,12 +173,6 @@ block</code>, not per class.</p>
</li><li>
<p>ERB Template Parser</p>
</li><li>
<p>Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)</p>
</li><li>
<p>Markdown-lint</p>
</li><li>
<p>Spellcheck</p>
</li><li>
<p>Sonar Quality Gate</p>
</li></ul>

View File

@@ -173,12 +173,6 @@ block</code>, not per class.</p>
</li><li>
<p>ERB Template Parser</p>
</li><li>
<p>Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)</p>
</li><li>
<p>Markdown-lint</p>
</li><li>
<p>Spellcheck</p>
</li><li>
<p>Sonar Quality Gate</p>
</li></ul>

View File

@@ -105,9 +105,7 @@
7
8
9
10
11
12</pre>
10</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
@@ -115,9 +113,7 @@
class cd_alloy::main::config (
) inherits cd_alloy::params {
include cd_alloy::main::service
}</pre>
</td>
</tr>

View File

@@ -117,8 +117,7 @@
19
20
21
22
23</pre>
22</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -126,19 +125,18 @@
class cd_alloy::main::dirs (
) inherits cd_alloy::params {
require cd_alloy::main::install
# main config dir
file { $ay_main_dir:
ensure =&gt; directory,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;alloy&#39;,
mode =&gt; &#39;0770&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
ensure =&gt; directory,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;alloy&#39;,
mode =&gt; &#39;0770&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
}
}</pre>
</td>

View File

@@ -121,9 +121,7 @@
23
24
25
26
27
28</pre>
26</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -131,25 +129,23 @@
class cd_alloy::main::files (
) inherits cd_alloy::params {
require cd_alloy::main::dirs
# Ensure log_targets is always an array
$log_targets_array = Array($cd_alloy::params::ay_log_targets, true)
file { $ay_main_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template(&#39;cd_alloy/config.alloy.erb&#39;),
notify =&gt; Service[$ay_service],
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template(&#39;cd_alloy/config.alloy.erb&#39;),
notify =&gt; Service[$ay_service],
}
}</pre>
</td>
</tr>

View File

@@ -77,7 +77,7 @@
</div>
<h2>Summary</h2>
Class manages module logic for the cd_alloy module
Class installs packages for the cd_alloy module
<h2>Overview</h2>
<div class="docstring">
@@ -109,8 +109,7 @@
11
12
13
14
15</pre>
14</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -118,7 +117,6 @@
class cd_alloy::main::install (
) inherits cd_alloy::params {
require cd_alloy::main::yumrepo
package { $reqpackages:

View File

@@ -112,8 +112,7 @@
14
15
16
17
18</pre>
17</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/service.pp', line 6</span>
@@ -121,14 +120,13 @@
class cd_alloy::main::service (
) inherits cd_alloy::params {
require cd_alloy::main::files
service { $ay_service:
ensure =&gt; running,
hasstatus =&gt; true,
hasrestart =&gt; true,
enable =&gt; true,
ensure =&gt; running,
hasstatus =&gt; true,
hasrestart =&gt; true,
enable =&gt; true,
}
}</pre>
</td>

View File

@@ -113,7 +113,7 @@
<span class='name'>reqpackages</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;alloy&#39;</tt>)</em>
@@ -131,7 +131,7 @@
<span class='name'>pkg_ensure</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;latest&#39;</tt>)</em>
@@ -149,7 +149,7 @@
<span class='name'>ay_loki_url</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;https://loki.example.net/loki/api/v1/push&#39;</tt>)</em>
@@ -167,10 +167,10 @@
<span class='name'>ay_loki_username</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
<em class="default">(defaults to: <tt>&#39;loki_user&#39;</tt>)</em>
&mdash;
@@ -185,10 +185,10 @@
<span class='name'>ay_loki_userpass</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
<em class="default">(defaults to: <tt>&#39;loki_pass&#39;</tt>)</em>
&mdash;
@@ -203,7 +203,7 @@
<span class='name'>ay_manage_loki</span>
<span class='type'>(<tt>boolean</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
@@ -221,7 +221,7 @@
<span class='name'>ay_manage_prom</span>
<span class='type'>(<tt>boolean</tt>)</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
@@ -239,7 +239,7 @@
<span class='name'>ay_prom_url</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;https://prometheus.example.net/api/v1/write&#39;</tt>)</em>
@@ -257,12 +257,17 @@
<span class='name'>ay_log_targets</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>Array</tt>)</span>
<em class="default">(defaults to: <tt>[&#39;/var/log/messages&#39;,&#39;/var/log/secure&#39;,]</tt>)</em>
&mdash;
<div class='inline'>
<p>the logging targets</p>
</div>
</li>
</ul>
@@ -276,7 +281,6 @@
<pre class="lines">
14
15
16
17
@@ -305,44 +309,39 @@
40
41
42
43
44
45</pre>
43</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 14</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 15</span>
class cd_alloy::params (
$reqpackages = &#39;alloy&#39;,
$pkg_ensure = &#39;latest&#39;,
String $reqpackages = &#39;alloy&#39;,
String $pkg_ensure = &#39;latest&#39;,
# loki
$ay_manage_loki = true,
$ay_loki_url = &#39;https://loki.example.net/loki/api/v1/push&#39;,
$ay_loki_username = &#39;&#39;,
$ay_loki_userpass = &#39;&#39;,
$ay_log_targets = [&#39;/var/log/messages&#39;,&#39;/var/log/secure&#39;,],
String $ay_manage_loki = true,
String $ay_loki_url = &#39;https://loki.example.net/loki/api/v1/push&#39;,
String $ay_loki_username = &#39;loki_user&#39;,
String $ay_loki_userpass = &#39;loki_pass&#39;,
Array $ay_log_targets = [&#39;/var/log/messages&#39;,&#39;/var/log/secure&#39;,],
# prometheus
$ay_manage_prom = true,
$ay_prom_url = &#39;https://prometheus.example.net/api/v1/write&#39;,
Boolean $ay_manage_prom = true,
String $ay_prom_url = &#39;https://prometheus.example.net/api/v1/write&#39;,
) {
# service
$ay_service = &#39;alloy&#39;
# service
$ay_service = &#39;alloy&#39;
# dirs
$ay_main_dir = &#39;/etc/alloy&#39;
# files
$ay_main_file = &quot;${ay_main_dir}/config.alloy&quot;
# dirs
$ay_main_dir = &#39;/etc/alloy&#39;
# files
$ay_main_file = &quot;${ay_main_dir}/config.alloy&quot;
# includes must be last
include cd_alloy::main::config
}</pre>
</td>
</tr>