3
0

Recommit for updates in build 59

This commit is contained in:
2025-12-04 13:12:56 +01:00
parent d85561e537
commit 76e634912c
2 changed files with 234 additions and 13 deletions

View File

@@ -161,7 +161,25 @@
63 63
64 64
65 65
66</pre> 66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84</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>
@@ -219,10 +237,28 @@ class prometheus_cd::main::files (
content =&gt; template(&#39;prometheus_cd/prune_blocks.erb&#39;), content =&gt; template(&#39;prometheus_cd/prune_blocks.erb&#39;),
# notify Service ToDo, # notify Service ToDo,
} }
file { $ps_env_file:
ensure =&gt; file,
owner =&gt; &#39;prometheus&#39;,
group =&gt; &#39;prometheus&#39;,
mode =&gt; &#39;0750&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; usr_,
seluser =&gt; unconfined_u,
content =&gt; template(&#39;prometheus_cd/prune.env.erb&#39;),
# notify Service ToDo,
} }
}
if $ps_enable_pruning == false { if $ps_enable_pruning == false {
file { $ps_pruning_file: file { $ps_pruning_file:
ensure =&gt; absent, ensure =&gt; absent,
# notify Service ToDo,
}
file { $ps_env_file:
ensure =&gt; absent,
# notify Service ToDo,
} }
} }
} }

View File

@@ -625,6 +625,173 @@
<em class="default">(defaults to: <tt>&quot;${ps_pruning_dir}/prune_prometheus_pg.sh&quot;</tt>)</em> <em class="default">(defaults to: <tt>&quot;${ps_pruning_dir}/prune_prometheus_pg.sh&quot;</tt>)</em>
&mdash;
<div class='inline'>
<p>the url and filename for the pruning script</p>
</div>
</li>
<li>
<span class='name'>ps_env_file</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&quot;${ps_pruning_dir}/prune.env&quot;</tt>)</em>
&mdash;
<div class='inline'>
<p>the url and filename for the env file</p>
</div>
</li>
<li>
<span class='name'>ps_pg_host</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;localhost&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the host running the database for cold metrics</p>
</div>
</li>
<li>
<span class='name'>ps_pg_port</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;5432&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the port for the database for cold metrics</p>
</div>
</li>
<li>
<span class='name'>ps_pg_db</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 database for cold metrics</p>
</div>
</li>
<li>
<span class='name'>ps_pg_user</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;readaccess&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the read-only user for the db for cold metrics</p>
</div>
</li>
<li>
<span class='name'>ps_pg_pass</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;Changeme&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the password for the db for cold metrics</p>
</div>
</li>
<li>
<span class='name'>ps_dry_run</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
&mdash;
<div class='inline'>
<p>(true = just log, false = actually delete blocks)</p>
</div>
</li>
<li>
<span class='name'>ps_min_age_hours</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;4&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Minimum block age in hours before pruning</p>
</div>
</li>
<li>
<span class='name'>ps_grace_hours</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Grace period in hours to be extra safe</p>
</div>
</li> </li>
</ul> </ul>
@@ -638,16 +805,6 @@
<pre class="lines"> <pre class="lines">
34
35
36
37
38
39
40
41
42
43
44 44
45 45
46 46
@@ -709,10 +866,29 @@
102 102
103 103
104 104
105</pre> 105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 34</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 44</span>
class prometheus_cd::params ( class prometheus_cd::params (
@@ -762,6 +938,15 @@ class prometheus_cd::params (
Boolean $ps_enable_pruning = false, Boolean $ps_enable_pruning = false,
String $ps_pruning_dir = &#39;/opt/prometheus-prune&#39;, String $ps_pruning_dir = &#39;/opt/prometheus-prune&#39;,
String $ps_pruning_file = &quot;${ps_pruning_dir}/prune_prometheus_pg.sh&quot;, String $ps_pruning_file = &quot;${ps_pruning_dir}/prune_prometheus_pg.sh&quot;,
String $ps_env_file = &quot;${ps_pruning_dir}/prune.env&quot;,
String $ps_pg_host = &#39;localhost&#39;,
String $ps_pg_port = &#39;5432&#39;,
String $ps_pg_db = &#39;prometheus&#39;,
String $ps_pg_user = &#39;readaccess&#39;,
String $ps_pg_pass = &#39;Changeme&#39;,
Boolean $ps_dry_run = true,
String $ps_min_age_hours = &#39;4&#39;,
String $ps_grace_hours = &#39;1&#39;,
) { ) {
# defaults # defaults