diff options
| author | Sylvain Baubeau <sbaubeau@redhat.com> | 2019-03-26 15:00:24 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-04-09 14:10:16 +0100 |
| commit | c56d68f4b5f500d4a4894995f30892313c3fd2da (patch) | |
| tree | d96bec94f8e3119ac2c27ba1486b1724278a94c8 /docker/kibana6 | |
| parent | 2506a14dbd4c4c4ddb26871a0cad251b5718ca59 (diff) | |
| download | kolla-c56d68f4b5f500d4a4894995f30892313c3fd2da.tar.gz kolla-c56d68f4b5f500d4a4894995f30892313c3fd2da.zip | |
Add elasticsearch6 and kibana6 images
Elasticsearch and Kibana only support CentOS 8 from version 6.x, but in
Train Kolla uses ELK 5.x.
This change adds new elasticsearch6 and kibana6 images based on ELK 6.x
only for CentOS 7 and 8. This enables two things:
1. provide elasticsearch and kibana for CentOS 8 in Train
2. provide a migration path from CentOS 7 to 8 that does not involve a
simultaneous major upgrade, by first upgrading CentOS 7 to ELK 6.x.
The new images are based on the upgrade to 6.x in Ussuri in
I8b52b2630a72393bf4b9c7095fc67db6c36c27fa.
This includes a switch to start using oss tagged binaries. These
binaries contain only features that are available under the Apache 2.0
license.
Related: blueprint elasticsearch-kibana-version-upgrade
Co-authored-by: Dincer Celik <hello@dincercelik.com>
Change-Id: I8b52b2630a72393bf4b9c7095fc67db6c36c27fa
Diffstat (limited to 'docker/kibana6')
| -rw-r--r-- | docker/kibana6/Dockerfile.j2 | 22 | ||||
| -rw-r--r-- | docker/kibana6/elasticsearch.repo | 6 | ||||
| -rw-r--r-- | docker/kibana6/extend_start.sh | 10 |
3 files changed, 38 insertions, 0 deletions
diff --git a/docker/kibana6/Dockerfile.j2 b/docker/kibana6/Dockerfile.j2 new file mode 100644 index 000000000..8deb44fb3 --- /dev/null +++ b/docker/kibana6/Dockerfile.j2 @@ -0,0 +1,22 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block kibana_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.configure_user(name='kibana') }} + +{% set kibana_packages = ['kibana-oss'] %} + +COPY elasticsearch.repo /etc/yum.repos.d/ + +{{ macros.install_packages(kibana_packages | customizable("packages")) }} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start + +{% block kibana_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER kibana diff --git a/docker/kibana6/elasticsearch.repo b/docker/kibana6/elasticsearch.repo new file mode 100644 index 000000000..7172d13a8 --- /dev/null +++ b/docker/kibana6/elasticsearch.repo @@ -0,0 +1,6 @@ +[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=1 diff --git a/docker/kibana6/extend_start.sh b/docker/kibana6/extend_start.sh new file mode 100644 index 000000000..4f6143181 --- /dev/null +++ b/docker/kibana6/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +KIBANA_LOG_DIR="/var/log/kolla/kibana" + +if [[ ! -d "${KIBANA_LOG_DIR}" ]]; then + mkdir -p "${KIBANA_LOG_DIR}" +fi +if [[ $(stat -c %U:%G "${KIBANA_LOG_DIR}") != "kibana:kolla" ]]; then + chown kibana:kolla "${KIBANA_LOG_DIR}" +fi |