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

Auto-merge for build 40

See merge request puppet/prometheus_cd!39

README.md

@@ -2,8 +2,6 @@
 
 [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=prometheus_cd)](https://jenkins.confdroid.com/job/prometheus_cd/)
 
-[[_TOC_]]
-
 ## Synopsis
 
 Prometheus is an open-source monitoring system with a dimensional data model, flexible query language, efficient time series database and modern alerting approach.
@@ -32,9 +30,16 @@ Configurable options:
 - --storage.tsdb.retention.time via `$ps_retention_time`
 - --storage.tsdb.retention.size via `$ps_retention_size`
 - --storage.tsdb.wal-segment-size via `ps_wal_seg_size`
+- --storage.tsdb.min-block-duration via `ps_min_block_dur`
+- --storage.tsdb.max-block-duration via `ps_max_block_dur`
 - authentication user via `$ps_auth_user`
 - authentication password via `$ps_auth_pass`
 - web authentication password via `$ps_web_pass` ( different format required)
+- MemoryMax via `ps_max_mem`
+- MemoryHigh via `ps_high_mem`
+- MemorySwapMax via `ps_swap_mem`
+- OOMScoreAdjust via `ps_oom_score`
+- GOMAXPROCS via `ps_max_procs`
 
 ## Repo Documentation
 

doc/file.README.html

@@ -62,8 +62,6 @@
 
 <p><a href="https://jenkins.confdroid.com/job/prometheus_cd/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=prometheus_cd"></a></p>
 
-<p>[[<em>TOC</em>]]</p>
-
 <h2 id="label-Synopsis">Synopsis</h2>
 
 <p>Prometheus is an open-source monitoring system with a dimensional data model, flexible query language, efficient time series database and modern alerting approach.</p>
@@ -92,7 +90,7 @@
 <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> - –storage.tsdb.wal-segment-size via <code>ps_wal_seg_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>
+<p>Configurable options: - –storage.tsdb.retention.time via <code>$ps_retention_time</code> - –storage.tsdb.retention.size via <code>$ps_retention_size</code> - –storage.tsdb.wal-segment-size via <code>ps_wal_seg_size</code> - –storage.tsdb.min-block-duration via <code>ps_min_block_dur</code> - –storage.tsdb.max-block-duration via <code>ps_max_block_dur</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) - MemoryMax via <code>ps_max_mem</code> - MemoryHigh via <code>ps_high_mem</code> - MemorySwapMax via <code>ps_swap_mem</code> - OOMScoreAdjust via <code>ps_oom_score</code> - GOMAXPROCS via <code>ps_max_procs</code></p>
 
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
 

doc/index.html

@@ -62,8 +62,6 @@
 
 <p><a href="https://jenkins.confdroid.com/job/prometheus_cd/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=prometheus_cd"></a></p>
 
-<p>[[<em>TOC</em>]]</p>
-
 <h2 id="label-Synopsis">Synopsis</h2>
 
 <p>Prometheus is an open-source monitoring system with a dimensional data model, flexible query language, efficient time series database and modern alerting approach.</p>
@@ -92,7 +90,7 @@
 <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> - –storage.tsdb.wal-segment-size via <code>ps_wal_seg_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>
+<p>Configurable options: - –storage.tsdb.retention.time via <code>$ps_retention_time</code> - –storage.tsdb.retention.size via <code>$ps_retention_size</code> - –storage.tsdb.wal-segment-size via <code>ps_wal_seg_size</code> - –storage.tsdb.min-block-duration via <code>ps_min_block_dur</code> - –storage.tsdb.max-block-duration via <code>ps_max_block_dur</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) - MemoryMax via <code>ps_max_mem</code> - MemoryHigh via <code>ps_high_mem</code> - MemorySwapMax via <code>ps_swap_mem</code> - OOMScoreAdjust via <code>ps_oom_score</code> - GOMAXPROCS via <code>ps_max_procs</code></p>
 
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
 

templates/override.conf.erb

@@ -20,4 +20,5 @@ ExecStart=/usr/bin/prometheus \
   --web.enable-lifecycle \
   --storage.tsdb.wal-compression \
   --storage.tsdb.min-block-duration=<%= @ps_min_block_dur %> \
-  --storage.tsdb.max-block-duration=<%= @ps_max_block_dur %>
+  --storage.tsdb.max-block-duration=<%= @ps_max_block_dur %>
+