Upgrade ELK stack to 7.6.1 (#178)

* Update ELK stack to 7.6.1

* Switch Elasticsearch to bundled Java version

Author: axelaris

config/blobs.yml

@@ -54,10 +54,9 @@ curator/vendor/voluptuous-0.11.5-py2.py3-none-any.whl:
   size: 27677
   object_id: 30fbe47c-eb16-4db8-57ce-f853940769c7
   sha: b5c82285df0610464a9332c567cf8bd06b8786f6
-elasticsearch/elasticsearch-7.6.0-linux-x86_64.tar.gz:
-  size: 296200685
-  object_id: bf225a26-f847-4dbc-7b6d-3258a7f735da
-  sha: sha256:bba7b582a1efcfb870a2aacbceb5036f577fb5bfb9b481b2426177d25c21b595
+elasticsearch/elasticsearch-7.6.1-linux-x86_64.tar.gz:
+  size: 296454172
+  sha: sha256:25583ddd44a99437958f7f9410cd9746c8230b367d570cdf69e96824a583748a
 haproxy/haproxy-1.7.5.tar.gz:
   size: 1743979
   object_id: 27004bb4-29f6-493f-80ec-6a4170a955d5
@@ -66,14 +65,12 @@ haproxy/pcre-8.40.tar.gz:
   size: 2065161
   object_id: edf51dad-4c6c-4a3d-8ebb-3a9b9f9641e5
   sha: 10384eb3d411794cc15f55b9d837d3f69e35391e
-kibana/kibana-7.6.0-linux-x86_64.tar.gz:
-  size: 249467327
-  object_id: ade90b92-683a-46ca-5f81-3d9772659bd9
-  sha: sha256:3dafefee001da4fe20f8ecf31df59f485c48aabe6814d30089ed253e030a599d
-logstash/logstash-7.6.0.tar.gz:
-  size: 165923191
-  object_id: 3c6a0421-6037-4a2d-5546-75b3efb001a6
-  sha: sha256:87359a25bd68b51274946d34c30515c141c8c2ba5f0bda0d506d3f3a270043ad
+kibana/kibana-7.6.1-linux-x86_64.tar.gz:
+  size: 249498863
+  sha: sha256:da636529511e707bbbc621dc131ff2ed18f50fe0df30821c375d16c5ba4248f6
+logstash/logstash-7.6.1.tar.gz:
+  size: 172679481
+  sha: sha256:6b16f3158829ad820463c7f3ca4cfec433d12d0eafa25be203c92d12ca91da10
 logstash/logstash-filter-alter-3.0.2.zip:
   size: 7425
   object_id: 543e5010-6449-400b-489d-31b82dcb4670

jobs/cerebro/templates/bin/cerebro

@@ -22,7 +22,7 @@ do
   fi
 done
 
-source /var/vcap/packages/openjdk-11/bosh/runtime.env
+export JAVA_HOME=/var/vcap/packages/elasticsearch/jdk
 
 /var/vcap/packages/cerebro/bin/cerebro \
  <%= p("cerebro.exec.options", []).join(' ') %> \

jobs/elasticsearch/templates/bin/elasticsearch

@@ -3,7 +3,6 @@
 set -e # exit immediately if a simple command exits with a non-zero status
 set -u # report the usage of uninitialized variables
 
-source /var/vcap/packages/openjdk-11/bosh/runtime.env
 export JOB_NAME=elasticsearch
 export PORT=${PORT:-5000}
 export LANG=en_US.UTF-8

jobs/elasticsearch/templates/bin/elasticsearch_ctl

@@ -1,5 +1,8 @@
 ---
 name: cerebro
 
+dependencies:
+  - elasticsearch
+
 files:
   - cerebro/cerebro-0.8.5.tgz

packages/cerebro/spec

@@ -1,3 +1,3 @@
 set -e
 
-tar xzf elasticsearch/elasticsearch-7.6.0-linux-x86_64.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1
+tar xzf elasticsearch/elasticsearch-7.6.1-linux-x86_64.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1

packages/elasticsearch/packaging

@@ -2,4 +2,4 @@
 name: elasticsearch
 
 files:
-  - elasticsearch/elasticsearch-7.6.0-linux-x86_64.tar.gz
+  - elasticsearch/elasticsearch-7.6.1-linux-x86_64.tar.gz

packages/elasticsearch/spec

@@ -1,3 +1,3 @@
 set -e
 
-tar xzf kibana/kibana-7.6.0-linux-x86_64.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1
+tar xzf kibana/kibana-7.6.1-linux-x86_64.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1

packages/kibana/packaging

@@ -2,4 +2,4 @@
 name: kibana
 
 files:
-  - kibana/kibana-7.6.0-linux-x86_64.tar.gz
+  - kibana/kibana-7.6.1-linux-x86_64.tar.gz

packages/kibana/spec

@@ -5,7 +5,7 @@ set -e -u
 # shellcheck disable=1091
 source /var/vcap/packages/openjdk-11/bosh/compile.env
 
-tar xzf logstash/logstash-7.6.0.tar.gz -C "${BOSH_INSTALL_TARGET}" --strip-components 1
+tar xzf logstash/logstash-7.6.1.tar.gz -C "${BOSH_INSTALL_TARGET}" --strip-components 1
 
 export PATH="${BOSH_INSTALL_TARGET}/bin:${PATH}"