diff options
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/base/elasticsearch.repo | 10 | ||||
| -rw-r--r-- | docker/base/kibana.yum.repo | 6 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 7 | ||||
| -rw-r--r-- | releasenotes/notes/elasticsearch-upgrade-5.X-df217e3742b8b94a.yaml | 4 |
5 files changed, 13 insertions, 17 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 715557e04..3d083290e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -76,14 +76,13 @@ RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir 'elasticsearch.repo', 'grafana.repo', 'influxdb.repo', - 'kibana.yum.repo', 'nfs_ganesha.repo', 'opendaylight.repo', 'td.repo' ] %} {% set base_yum_repo_keys = [ - 'https://packages.elastic.co/GPG-KEY-elasticsearch', + 'https://artifacts.elastic.co/GPG-KEY-elasticsearch', 'https://repos.influxdata.com/influxdb.key', 'https://packagecloud.io/gpg.key', 'https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana', diff --git a/docker/base/elasticsearch.repo b/docker/base/elasticsearch.repo index e509e44fc..a9df03688 100644 --- a/docker/base/elasticsearch.repo +++ b/docker/base/elasticsearch.repo @@ -1,6 +1,8 @@ -[elasticsearch-2.x] -name=Elasticsearch repository for 2.x packages -baseurl=https://packages.elastic.co/elasticsearch/2.x/centos +[elasticsearch-kibana-logstash-5.x] +name=ELK repository for 5.x packages +baseurl=https://artifacts.elastic.co/packages/5.x/yum gpgcheck=1 -gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch +gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch enabled=1 +autorefresh=1 +type=rpm-md diff --git a/docker/base/kibana.yum.repo b/docker/base/kibana.yum.repo deleted file mode 100644 index 4e92bdf45..000000000 --- a/docker/base/kibana.yum.repo +++ /dev/null @@ -1,6 +0,0 @@ -[kibana-4.6] -name=Kibana repository for 4.6.x packages -baseurl=https://packages.elastic.co/kibana/4.6/centos -gpgcheck=1 -gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch -enabled=1 diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 3025ed444..b999624fe 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -12,11 +12,8 @@ deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe # are qemu, libvirt, and openvswitch. deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/queens main -# Elastic repo -deb https://packages.elastic.co/elasticsearch/2.x/debian stable main - -# Kibana repo -deb https://packages.elastic.co/kibana/4.6/debian stable main +# Elastic & kibana repo +deb https://artifacts.elastic.co/packages/5.x/apt stable main # InfluxDB repo deb https://repos.influxdata.com/ubuntu bionic stable diff --git a/releasenotes/notes/elasticsearch-upgrade-5.X-df217e3742b8b94a.yaml b/releasenotes/notes/elasticsearch-upgrade-5.X-df217e3742b8b94a.yaml new file mode 100644 index 000000000..31c213aac --- /dev/null +++ b/releasenotes/notes/elasticsearch-upgrade-5.X-df217e3742b8b94a.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Upgrade elasticsearch and kibana to 5.X |