From bfb7e41ed0a63f97c2096cd2c792e02208db47a7 Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Tue, 26 Mar 2019 15:00:24 +0100 Subject: Upgrade Elasticsearch and Kibana to 6.x Start using oss tagged binaries. These binaries contain only features that are available under the Apache 2.0 license. Implements: blueprint elasticsearch-kibana-version-upgrade Co-authored-by: Dincer Celik Change-Id: I8b52b2630a72393bf4b9c7095fc67db6c36c27fa --- docker/base/apt_preferences.debian | 4 ++-- docker/base/elasticsearch.repo | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'docker/base') diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 1676a8fa8..ae89f61e5 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -24,12 +24,12 @@ Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster Pin-Priority: 100 # Unless it is kibana (on aarch64) -Package: kibana +Package: kibana kibana-oss Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster Pin-Priority: 600 # on x86-64 use upstream package for kibana -Package: kibana +Package: kibana kibana-oss Pin: release o=elastic,b=amd64 Pin-Priority: 700 diff --git a/docker/base/elasticsearch.repo b/docker/base/elasticsearch.repo index 16e589be1..b279f407b 100644 --- a/docker/base/elasticsearch.repo +++ b/docker/base/elasticsearch.repo @@ -1,8 +1,6 @@ -[elasticsearch-kibana-logstash-5.x] -name=ELK repository for 5.x packages -baseurl=https://artifacts.elastic.co/packages/5.x/yum +[elasticsearch-kibana-logstash-6.x] +name=ELK repository for 6.x packages +baseurl=https://artifacts.elastic.co/packages/oss-6.x/yum gpgcheck=1 gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch enabled=0 -autorefresh=1 -type=rpm-md -- cgit v1.2.3