3
0

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

Auto-merge for build 34

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

View File

@@ -24,9 +24,17 @@ INSTALLATION
CONFIGURATION
* manage directories and files including templates
* manage directories
* manage files including templates
* manage service
Configurable options:
- --storage.tsdb.retention.time via `$ps_retention_time`
- --storage.tsdb.retention.size via `$ps_retention_size`
- authentication user via `$ps_auth_user`
- authentication password via `$ps_auth_pass`
- web authentication password via `$ps_web_pass` ( different format required)
## Repo Documentation
See the full Puppet documentation including parameters in `docs/index.html`
@@ -43,7 +51,7 @@ via site.pp or nodes.pp
```bash
node 'example.example.net' {
include cd_kubernetes
include cd_prometheus
}
```

View File

@@ -85,11 +85,15 @@
<p>CONFIGURATION</p>
<ul><li>
<p>manage directories and files including templates</p>
<p>manage directories</p>
</li><li>
<p>manage files including templates</p>
</li><li>
<p>manage service</p>
</li></ul>
<p>Configurable options: - storage.tsdb.retention.time via <code>$ps_retention_time</code> - storage.tsdb.retention.size via <code>$ps_retention_size</code> - authentication user via <code>$ps_auth_user</code> - authentication password via <code>$ps_auth_pass</code> - web authentication password via <code>$ps_web_pass</code> ( different format required)</p>
<h2 id="label-Repo+Documentation">Repo Documentation</h2>
<p>See the full Puppet documentation including parameters in <code>docs/index.html</code></p>
@@ -106,7 +110,7 @@
<p>via site.pp or nodes.pp</p>
<pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
include cd_kubernetes
include cd_prometheus
}
</code></pre>
<ul><li>

View File

@@ -85,11 +85,15 @@
<p>CONFIGURATION</p>
<ul><li>
<p>manage directories and files including templates</p>
<p>manage directories</p>
</li><li>
<p>manage files including templates</p>
</li><li>
<p>manage service</p>
</li></ul>
<p>Configurable options: - storage.tsdb.retention.time via <code>$ps_retention_time</code> - storage.tsdb.retention.size via <code>$ps_retention_size</code> - authentication user via <code>$ps_auth_user</code> - authentication password via <code>$ps_auth_pass</code> - web authentication password via <code>$ps_web_pass</code> ( different format required)</p>
<h2 id="label-Repo+Documentation">Repo Documentation</h2>
<p>See the full Puppet documentation including parameters in <code>docs/index.html</code></p>
@@ -106,7 +110,7 @@
<p>via site.pp or nodes.pp</p>
<pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
include cd_kubernetes
include cd_prometheus
}
</code></pre>
<ul><li>