Upgrade prometheus to v2.12.0

Author: frodenas

config/blobs.yml

@@ -114,10 +114,10 @@ prometheus/prometheus-1.8.2.linux-amd64.tar.gz:
   size: 17748716
   object_id: 54fd8c7b-a676-44cd-64b2-d5788552e607
   sha: 33101ac86a6376680c3b44b63db47f1754d77a1a
-prometheus/prometheus-2.10.0.linux-amd64.tar.gz:
-  size: 48497454
-  object_id: aa8d08ec-1777-4166-4b61-2a6910ee76de
-  sha: sha256:f4233783826f18606b79e5cef0686e4a9c2030146a3c7ce134f0add09f5adcb7
+prometheus/prometheus-2.12.0.linux-amd64.tar.gz:
+  size: 53127635
+  object_id: a8c54581-f234-4f4d-5e41-701dcacee34b
+  sha: sha256:b9f57b6e64fb3048742cfa7dbcc727e1df906d8020ef246a5e81b7959ae97e08
 pushgateway/pushgateway-0.9.1.linux-amd64.tar.gz:
   size: 8823528
   object_id: 0dfd86d9-8128-4466-4f39-419ce4d5058f

jobs/prometheus2/spec

@@ -31,6 +31,8 @@ consumes:
 properties:
   prometheus.log_level:
     description: "Only log messages with the given severity or above. One of: [debug, info, warn, error]"
+  prometheus.log_format:
+    description: "Output format of log messages. One of: [logfmt, json]"
   prometheus.scrape_interval:
     description: "How frequently to scrape targets by default"
   prometheus.scrape_timeout:
@@ -83,6 +85,10 @@ properties:
     description: "Maximum duration compacted blocks may span (defaults to 10% of the retention period)"
   prometheus.storage.tsdb.no_lockfile:
     description: "Do not create lockfile in data directory"
+    default: false
+  prometheus.storage.tsdb.wal_compression:
+    description: "Compress the tsdb WAL"
+    default: false
   prometheus.storage.remote.flush_deadline:
     description: "How long to wait flushing sample on shutdown or config reload"
   prometheus.storage.remote.read_sample_limit:
@@ -100,8 +106,10 @@ properties:
     description: "Regex for CORS origin"
   prometheus.web.enable_lifecycle:
     description: "Enable shutdown and reload via HTTP request"
+    default: false
   prometheus.web.enable_admin_api:
     description: "Enables API endpoints for admin control actions"
+    default: false
   prometheus.web.external_url:
     description: "The URL under which Prometheus is externally reachable"
   prometheus.web.port:

jobs/prometheus2/templates/bin/prometheus_ctl

@@ -47,6 +47,9 @@ case $1 in
       <% if_p('prometheus.log_level') do |log_level| %> \
       --log.level="<%= log_level %>" \
       <% end %> \
+      <% if_p('prometheus.log_format') do |log_format| %> \
+      --log.format="<%= log_format %>" \
+      <% end %> \
       <% if_p('prometheus.query.max_concurrency') do |max_concurrency| %> \
       --query.max-concurrency="<%= max_concurrency %>" \
       <% end %> \
@@ -81,9 +84,12 @@ case $1 in
       <% if_p('prometheus.storage.tsdb.max_block_duration') do |max_block_duration| %> \
       --storage.tsdb.max-block-duration="<%= max_block_duration %>" \
       <% end %> \
-      <% if_p('prometheus.storage.tsdb.no_lockfile') do |no_lockfile| %> \
-      --storage.tsdb.no-lockfile="<%= no_lockfile %>" \
-      <% end %> \
+      <% if p('prometheus.storage.tsdb.no_lockfile') %> \
+      --storage.tsdb.no-lockfile \
+      <% end %>
+      <% if p('prometheus.storage.tsdb.wal_compression') %> \
+      --storage.tsdb.wal-compression \
+      <% end %>
       <% if_p('prometheus.storage.remote.flush_deadline') do |flush_deadline| %> \
       --storage.remote.flush-deadline="<%= flush_deadline %>" \
       <% end %> \
@@ -102,15 +108,11 @@ case $1 in
       <% if_p('prometheus.web.cors_origin') do |cors_origin| %> \
       --web.cors.origin="<%= cors_origin %>" \
       <% end %> \
-      <% if_p('prometheus.web.enable_lifecycle') do |enable_lifecycle| %> \
-        <% if enable_lifecycle %> \
+      <% if p('prometheus.web.enable_lifecycle') %> \
       --web.enable-lifecycle \
-        <% end %> \
       <% end %> \
-      <% if_p('prometheus.web.enable_admin_api') do |enable_admin_api| %> \
-        <% if enable_admin_api %> \
+      <% if p('prometheus.web.enable_admin_api') %> \
       --web.enable-admin-api \
-        <% end %> \
       <% end %> \
       <% if_p('prometheus.web.external_url') do |external_url| %> \
       --web.external-url="<%= external_url %>" \

packages/prometheus2/packaging

@@ -8,5 +8,5 @@ cp -a ${BOSH_COMPILE_TARGET}/common/* ${BOSH_INSTALL_TARGET}/common
 
 # Extract prometheus package
 mkdir -p ${BOSH_INSTALL_TARGET}/bin
-tar xzvf ${BOSH_COMPILE_TARGET}/prometheus/prometheus-2.10.0.linux-amd64.tar.gz
-cp -a ${BOSH_COMPILE_TARGET}/prometheus-2.10.0.linux-amd64/* ${BOSH_INSTALL_TARGET}/bin
+tar xzvf ${BOSH_COMPILE_TARGET}/prometheus/prometheus-2.12.0.linux-amd64.tar.gz
+cp -a ${BOSH_COMPILE_TARGET}/prometheus-2.12.0.linux-amd64/* ${BOSH_INSTALL_TARGET}/bin

packages/prometheus2/spec

@@ -3,4 +3,4 @@ name: prometheus2
 
 files:
   - common/utils.sh
-  - prometheus/prometheus-2.10.0.linux-amd64.tar.gz
+  - prometheus/prometheus-2.12.0.linux-amd64.tar.gz