diff --git a/docker/base/elasticsearch.repo b/docker/base/elasticsearch.repo index b279f407b6..06725a607c 100644 --- a/docker/base/elasticsearch.repo +++ b/docker/base/elasticsearch.repo @@ -1,6 +1,6 @@ -[elasticsearch-kibana-logstash-6.x] -name=ELK repository for 6.x packages -baseurl=https://artifacts.elastic.co/packages/oss-6.x/yum +[elasticsearch-kibana-logstash-7.x] +name=ELK repository for 7.x packages +baseurl=https://artifacts.elastic.co/packages/oss-7.x/yum gpgcheck=1 gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch enabled=0 diff --git a/kolla/image/build.py b/kolla/image/build.py index f1adf2ecf4..f2c4b1a957 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -145,7 +145,6 @@ UNBUILDABLE_IMAGES = { }, 'centos+aarch64': { - "elasticsearch", # no binary package "hacluster-pcs", # no binary package "influxdb", # no binary package "kibana", # no binary package diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 21d3452dbf..f547ba9cb8 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" diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index 0a1c5bd5a4..65d54a6875 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -104,8 +104,8 @@ class MethodsTest(base.TestCase): 'enable') expectCmd = 'RUN echo "deb https://packages.grafana.com/oss/deb ' expectCmd += 'stable main" >/etc/apt/sources.list.d/grafana.list && ' - expectCmd += 'echo "deb [arch=amd64] ' - expectCmd += 'https://artifacts.elastic.co/packages/oss-6.x/apt ' + expectCmd += 'echo "deb ' + expectCmd += 'https://artifacts.elastic.co/packages/oss-7.x/apt ' expectCmd += 'stable main" >/etc/apt/sources.list.d/kibana.list' self.assertEqual(expectCmd, result) diff --git a/releasenotes/notes/upgrade-to-elk7-1816e69663735a98.yaml b/releasenotes/notes/upgrade-to-elk7-1816e69663735a98.yaml new file mode 100644 index 0000000000..f21a90a79f --- /dev/null +++ b/releasenotes/notes/upgrade-to-elk7-1816e69663735a98.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Upgrades Elasticsearch, Logstash and Kibana (ELK) 6 images to ELK 7. Please + see the upgrade notes in the official `documentation + `__