Upgrade prometheus to v2.3.0

cloudfoundry · Jun 18, 2018 · 8bd2ac3 · 8bd2ac3
1 parent 5906cd2
commit 8bd2ac3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/config/blobs.yml b/config/blobs.yml
@@ -106,10 +106,10 @@ prometheus/prometheus-1.8.2.linux-amd64.tar.gz:
   size: 17748716
   object_id: 54fd8c7b-a676-44cd-64b2-d5788552e607
   sha: 33101ac86a6376680c3b44b63db47f1754d77a1a
-prometheus/prometheus-2.2.1.linux-amd64.tar.gz:
-  size: 26438285
-  object_id: 74cf438a-ca0e-4b1c-4b3a-3fc464e8a424
-  sha: 3e20a5d0156e98ec3a4bc58b7b588a944924b1ca
+prometheus/prometheus-2.3.0.linux-amd64.tar.gz:
+  size: 27403308
+  object_id: a40b32e9-ffcc-4d77-4629-7948e4a243f4
+  sha: 3e8b352f3668b64ea3f6a878dcc3527ea4b3f474
 pushgateway/pushgateway-0.5.2.linux-amd64.tar.gz:
   size: 4566057
   object_id: e6066543-cdff-4d9e-5a62-ca40873985c1

diff --git a/jobs/prometheus2/spec b/jobs/prometheus2/spec
@@ -68,6 +68,8 @@ 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"
+  prometheus.storage.remote.flush_deadline:
+    description: "How long to wait flushing sample on shutdown or config reload"
 
   prometheus.web.console.libraries:
     description: "Path to the console library directory"

diff --git a/jobs/prometheus2/templates/bin/prometheus_ctl b/jobs/prometheus2/templates/bin/prometheus_ctl
@@ -69,6 +69,9 @@ case $1 in
       <% if_p('prometheus.storage.tsdb.no_lockfile') do |no_lockfile| %> \
       --storage.tsdb.no-lockfile="<%= no_lockfile %>" \
       <% end %> \
+      <% if_p('prometheus.storage.remote.flush_deadline') do |flush_deadline| %> \
+      --storage.remote.flush-deadline="<%= flush_deadline %>" \
+      <% end %> \
       <% if_p('prometheus.web.console.libraries') do |libraries| %> \
       --web.console.libraries="<%= libraries %>" \
       <% end %> \

diff --git a/packages/prometheus2/packaging b/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.2.1.linux-amd64.tar.gz
-cp -a ${BOSH_COMPILE_TARGET}/prometheus-2.2.1.linux-amd64/* ${BOSH_INSTALL_TARGET}/bin
+tar xzvf ${BOSH_COMPILE_TARGET}/prometheus/prometheus-2.3.0.linux-amd64.tar.gz
+cp -a ${BOSH_COMPILE_TARGET}/prometheus-2.3.0.linux-amd64/* ${BOSH_INSTALL_TARGET}/bin
diff --git a/packages/prometheus2/spec b/packages/prometheus2/spec
@@ -3,4 +3,4 @@ name: prometheus2
 
 files:
   - common/utils.sh
-  - prometheus/prometheus-2.2.1.linux-amd64.tar.gz
+  - prometheus/prometheus-2.3.0.linux-amd64.tar.gz