From c19a57a97971ee92105baddb59addf283427cb19 Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Thu, 18 Jun 2020 16:44:55 +0100 Subject: Upgrade from ELK6 to ELK7 FOSS release Upgrade to the latest ELK OSS release. Due to the licensing change, this effectively pins us to 7.10.x which is supported until 2022-05-11 [1]. This patch also takes advantage of the ARM artifacts which have been kindly provided since the 7.8.0 release [2]. [1] https://www.elastic.co/support/eol [2] https://www.elastic.co/blog/elasticsearch-on-arm Change-Id: Icfa3db5788b25f70ee75411dbaf20d8d4a6a734b --- kolla/template/repos.yaml | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'kolla/template') diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 21d3452db..f547ba9cb 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -2,7 +2,7 @@ # TODO(mnasiadka): Rework the repo list once Ceph Octopus is released centos: ceph: "centos-ceph-nautilus" - elasticsearch: "elasticsearch-kibana-logstash-6.x" + elasticsearch: "elasticsearch-kibana-logstash-7.x" epel: "epel" epel-modular: "epel-modular" erlang: "rabbitmq_rabbitmq-erlang" @@ -10,8 +10,8 @@ centos: grafana: "grafana" hacluster: "ha" influxdb: "influxdb" - logstash: "elasticsearch-kibana-logstash-6.x" - kibana: "elasticsearch-kibana-logstash-6.x" + kibana: "elasticsearch-kibana-logstash-7.x" + logstash: "elasticsearch-kibana-logstash-7.x" opstools: "centos-opstools" powertools: "powertools" rabbitmq: "rabbitmq_rabbitmq-server" @@ -19,14 +19,15 @@ centos: centos-aarch64: ceph: "centos-ceph-nautilus" - elasticsearch: "elasticsearch-kibana-logstash-6.x" + elasticsearch: "elasticsearch-kibana-logstash-7.x" epel: "epel" epel-modular: "epel-modular" erlang: "centos-rabbitmq-38" extras: "extras" grafana: "grafana" hacluster: "ha" - logstash: "elasticsearch-kibana-logstash-6.x" + kibana: "elasticsearch-kibana-logstash-7.x" + logstash: "elasticsearch-kibana-logstash-7.x" opstools: "centos-opstools" powertools: "powertools" rabbitmq: "rabbitmq_rabbitmq-server" @@ -34,12 +35,12 @@ centos-aarch64: centos-ppc64le: ceph: "centos-ceph-nautilus" - elasticsearch: "elasticsearch-kibana-logstash-6.x" + elasticsearch: "elasticsearch-kibana-logstash-7.x" epel: "epel" epel-modular: "epel-modular" extras: "extras" hacluster: "ha" - logstash: "elasticsearch-kibana-logstash-6.x" + logstash: "elasticsearch-kibana-logstash-7.x" opstools: "centos-opstools" powertools: "powertools" rabbitmq: "rabbitmq_rabbitmq-server" @@ -51,34 +52,34 @@ rhel: rabbitmq: "centos-rabbitmq-38" debian: - elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" + elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ buster erlang" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/debian buster stable" libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" - logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" - kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" + logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" + kibana: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main" td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib" debian-aarch64: - elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" + elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/debian buster stable" - logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" - kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" + logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" + kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-7.x/apt stable main" libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main" td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib" ubuntu: - elasticsearch: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main" + elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/ubuntu focal stable" - logstash: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main" - kibana: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main" + logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" + kibana: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main" qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main" # NOTE(hrw): upstream uses bionic repo for focal @@ -86,11 +87,11 @@ ubuntu: td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib" ubuntu-aarch64: - elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" + elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/ubuntu focal stable" - logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" + logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main" td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib" -- cgit v1.2.3