Upgrade bosh_exporter to v3.1.0

cloudfoundry · Feb 10, 2019 · 41291a7 · 41291a7
1 parent 0a19056
commit 41291a7
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
@@ -6,10 +6,10 @@ blackbox_exporter/blackbox_exporter-0.13.0.linux-amd64.tar.gz:
   size: 6992513
   object_id: 79855d2a-71a2-4b9f-7592-1d131997b1f5
   sha: fe7bd72d00e05759918e9592e9085d181758a9ab
-bosh_exporter/bosh_exporter-3.0.1.linux-amd64.tar.gz:
-  size: 4766620
-  object_id: 8e1ac4c3-abc7-4b64-7fb5-bb1191c5163d
-  sha: 2c3421f1d11d99ce6927454e75fa54da1844c664
+bosh_exporter/bosh_exporter-3.1.0.linux-amd64.tar.gz:
+  size: 6976228
+  object_id: 0b5d4e92-211d-4fac-60e3-a32c813047c1
+  sha: 5b95074c41855f897701a8af03a9358cd2df49d3
 bosh_tsdb_exporter/bosh_tsdb_exporter-0.2.0.linux-amd64.tar.gz:
   size: 3517628
   object_id: 803f9cdf-4cc8-4dcf-4be4-1811ae11a6c8

diff --git a/jobs/bosh_exporter/spec b/jobs/bosh_exporter/spec
@@ -31,6 +31,8 @@ properties:
     description: "Comma separated AZs to filter"
   bosh_exporter.filter.collectors:
     description: "Comma separated collectors to filter ('Deployments', 'Jobs')"
+  bosh_exporter.filter.cidrs:
+    description: "Comma separated CIDR to filter instance IPs"
   bosh_exporter.log_format:
     description: "Set the log target and format. Example: 'logger:syslog?appname=bob&local=7' or 'logger:stdout?json=true'"
   bosh_exporter.log_level:

diff --git a/jobs/bosh_exporter/templates/bin/bosh_exporter_ctl b/jobs/bosh_exporter/templates/bin/bosh_exporter_ctl
@@ -63,6 +63,9 @@ case $1 in
       <% if_p('bosh_exporter.filter.collectors') do |collectors| %> \
       --filter.collectors="<%= collectors %>" \
       <% end %> \
+      <% if_p('bosh_exporter.filter.cidrs') do |cidrs| %> \
+      --filter.cidrs="<%= cidrs %>" \
+      <% end %> \
       <% if_p('bosh_exporter.log_format') do |log_format| %> \
       --log.format="<%= log_format %>" \
       <% end %> \

diff --git a/packages/bosh_exporter/packaging b/packages/bosh_exporter/packaging
@@ -8,5 +8,5 @@ cp -a ${BOSH_COMPILE_TARGET}/common/* ${BOSH_INSTALL_TARGET}/common
 
 # Extract bosh_exporter package
 mkdir -p ${BOSH_INSTALL_TARGET}/bin
-tar xzvf ${BOSH_COMPILE_TARGET}/bosh_exporter/bosh_exporter-3.0.1.linux-amd64.tar.gz
-cp -a ${BOSH_COMPILE_TARGET}/bosh_exporter-3.0.1.linux-amd64/* ${BOSH_INSTALL_TARGET}/bin
+tar xzvf ${BOSH_COMPILE_TARGET}/bosh_exporter/bosh_exporter-3.1.0.linux-amd64.tar.gz
+cp -a ${BOSH_COMPILE_TARGET}/bosh_exporter-3.1.0.linux-amd64/* ${BOSH_INSTALL_TARGET}/bin
diff --git a/packages/bosh_exporter/spec b/packages/bosh_exporter/spec
@@ -3,4 +3,4 @@ name: bosh_exporter
 
 files:
   - common/utils.sh
-  - bosh_exporter/bosh_exporter-3.0.1.linux-amd64.tar.gz
+  - bosh_exporter/bosh_exporter-3.1.0.linux-amd64.tar.gz