Drop elasticsearch, kibana and logstash

Support has been dropped in kolla-ansible, the upgrade path is opensearch.

Change-Id: I6f32aacb4e0b7dd1eb7206e02425b16f5beae4f0

15 files changed, 0 insertions, 246 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 09b01dc61..2d9ade3c9 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -62,10 +62,6 @@ COPY dnf.conf /etc/dnf/dnf.conf
 {% endblock %}
 
 #### BEGIN REPO ENABLEMENT
-{#
-Repo files not available for CentOS Stream 9:
-    'elasticsearch.repo',  # signed with SHA1 key https://github.com/elastic/elasticsearch/issues/85876
- #}
 {% set base_yum_repo_files = [
     'grafana.repo',
     'influxdb.repo',
@@ -80,7 +76,6 @@ Repo files not available for CentOS Stream 9:
 
 {#
 SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management/rpm/issues/1977
-    'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
     'https://packages.grafana.com/gpg.key',
  #}
 {% set base_yum_repo_keys = [
@@ -320,7 +315,6 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 
 {# NOTE(hrw): type field defaults to 'asc' which is used for single keys #}
 {% set base_remote_apt_keys = [
-   {'name': 'elasticsearch', 'url': 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'},
    {'name': 'grafana', 'url': 'https://packages.grafana.com/gpg.key'},
    {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdb.key'},
    {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index ba7e14b7f..7b5d4631b 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -6,12 +6,6 @@ Package: erlang*
 Pin: version 1:25.*
 Pin-Priority: 1000
 
-# NOTE(mgoddard): logstash 7.9.x is the last version that supports
-# Elasticsearch OSS.
-Package: logstash-oss
-Pin: version 7.9.*
-Pin-Priority: 1000
-
 # NOTE(hrw): we do not want backports unless requested
 Package: *
 Pin: release n=bullseye-backports
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
index d6a262861..8e6a9070f 100644
--- a/docker/base/apt_preferences.ubuntu
+++ b/docker/base/apt_preferences.ubuntu
@@ -6,12 +6,6 @@ Package: erlang*
 Pin: version 1:25.*
 Pin-Priority: 1000
 
-# NOTE(mgoddard): logstash 7.9.x is the last version that supports
-# Elasticsearch OSS.
-Package: logstash-oss
-Pin: version 7.9.*
-Pin-Priority: 1000
-
 Package: *
 Pin: origin dlm.mariadb.com
 Pin-Priority: 1000
diff --git a/docker/base/elasticsearch.repo b/docker/base/elasticsearch.repo
deleted file mode 100644
index 06725a607..000000000
--- a/docker/base/elasticsearch.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[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/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index a54bea3cf..e1cead25b 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/docker/collectd/Dockerfile.j2
@@ -31,7 +31,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
       'collectd-disk',
       'collectd-dns',
       'collectd-ipmi',
-      'collectd-log_logstash',
       'collectd-logparser',
       'collectd-mcelog',
       'collectd-mysql',
diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
deleted file mode 100644
index 4ef07a5a8..000000000
--- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block elasticsearch_curator_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-    {% set elasticsearch_curator_packages = [
-        'cronie',
-        'python3-wheel'
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set elasticsearch_curator_packages = [
-        'cron',
-        'python3-setuptools',
-        'python3-wheel'
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(elasticsearch_curator_packages | customizable("packages")) }}
-
-{{ macros.configure_user(name='elasticsearch') }}
-
-# NOTE(parallax): pin elasticsearch due to bug: https://bugs.launchpad.net/kolla/+bug/1941073
-{% set elasticsearch_curator_pip_packages = [
-    'elasticsearch==7.13.*',
-    'elasticsearch-curator'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools'], constraints=false) }} \
-    && {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false) }} \
-    && mkdir -p /etc/elasticsearch-curator \
-    && chmod 644 /usr/local/bin/kolla_extend_start
-
-{% block elasticsearch_curator_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-# NOTE(dszumski): Cron runs as root but should be configured to launch Curator
-# by the elasticsearch user.
diff --git a/docker/elasticsearch/elasticsearch-curator/extend_start.sh b/docker/elasticsearch/elasticsearch-curator/extend_start.sh
deleted file mode 100644
index 8af0cdd15..000000000
--- a/docker/elasticsearch/elasticsearch-curator/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# NOTE(dszumski): Cron runs as root but should be configured to launch Curator
-# by the elasticsearch user. Therefore this directory needs to be owned by
-# the elasticsearch user.
-if [[ ! -d "/var/log/kolla/elasticsearch" ]]; then
-    install -d -m 0755 -o elasticsearch -g elasticsearch /var/log/kolla/elasticsearch
-fi
diff --git a/docker/elasticsearch/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/elasticsearch/Dockerfile.j2
deleted file mode 100644
index e4135c153..000000000
--- a/docker/elasticsearch/elasticsearch/Dockerfile.j2
+++ /dev/null
@@ -1,54 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block elasticsearch_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='elasticsearch', shell='/bin/bash', homedir='/usr/share/elasticsearch') }}
-
-{{ macros.enable_extra_repos(['elasticsearch']) }}
-
-{% if base_package_type == 'rpm' %}
-
-# NOTE(hrw): post-install script of elasticsearch fails when trying to
-# install elasticsearch and java together.
-{{ macros.install_packages(['java-11-openjdk-headless']) }}
-
-    {% set elasticsearch_packages = [
-        'elasticsearch-oss',
-    ] %}
-
-ENV JAVA_HOME /usr/lib/jvm/jre-11-openjdk/
-
-{% elif base_package_type == 'deb' %}
-    {% set elasticsearch_packages = [
-        'elasticsearch-oss',
-    ] %}
-
-# NOTE(osmanlicilegi): post-install script of elasticsearch fails when trying to
-# install elasticsearch and java together.
-{{ macros.install_packages(['default-jre-headless']) }}
-
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-{{debian_arch}}/
-
-{% endif %}
-
-ENV ES_SKIP_SET_KERNEL_PARAMETERS true
-
-{{ macros.install_packages(elasticsearch_packages | customizable("packages")) }}
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-# NOTE: By default the shell of the elasticsearch user is /bin/false. We have to
-# change the shell to /bin/bash to be able to run elasticsearch as a non-root user.
-#
-# https://discuss.elastic.co/t/running-as-non-root-user-service-wrapper-has-changed/7863
-
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{% block elasticsearch_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER elasticsearch
diff --git a/docker/elasticsearch/elasticsearch/extend_start.sh b/docker/elasticsearch/elasticsearch/extend_start.sh
deleted file mode 100644
index b39f5b334..000000000
--- a/docker/elasticsearch/elasticsearch/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/elasticsearch" ]]; then
-    mkdir -p /var/log/kolla/elasticsearch
-fi
-if [[ $(stat -c %a /var/log/kolla/elasticsearch) != "755" ]]; then
-    chmod 755 /var/log/kolla/elasticsearch
-fi
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index e471fd03f..9562eef9d 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -34,12 +34,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
-# NOTE(frickler): Downgrading elasticsearch gems for compatibility with OSS versions of ES
 {{ macros.install_packages(fluentd_packages | customizable("packages")) }} \
-    && td-agent-gem install elasticsearch:7.13.0 \
-    && td-agent-gem uninstall "elasticsearch:>7.13.0" \
-    && td-agent-gem uninstall "elasticsearch-api:>7.13.0" \
-    && td-agent-gem uninstall "elasticsearch-transport:>7.13.0" \
     && chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \
     && mkdir -p /etc/{{ fluentd_user }} \
     && mkdir -p /var/run/{{ fluentd_user }} \
@@ -49,7 +44,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
 {% block fluentd_plugins_install %}
 
 {% set fluentd_plugins = [
-    'fluent-plugin-elasticsearch',
     'fluent-plugin-grok-parser',
     'fluent-plugin-prometheus',
     'fluent-plugin-rewrite-tag-filter',
diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2
deleted file mode 100644
index 11b2bdfcf..000000000
--- a/docker/kibana/Dockerfile.j2
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block kibana_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.enable_extra_repos(['kibana']) }}
-
-{{ macros.configure_user(name='kibana') }}
-
-# NOTE(hrw): upstream package ships x86_64 binaries for NodeJS. On other
-# architectures we install NodeJS from distro and remove binaries.
-
-{% if base_arch != 'x86_64' and base_distro in ['debian'] %}
-
-RUN dpkg --add-architecture amd64 && \
-{{ macros.install_packages(['nodejs', 'kibana-oss:amd64'], chain=True) }} \
-&& rm -rf /usr/share/kibana/node
-
-{% else %}
-
-{% set kibana_packages = ['kibana-oss'] %}
-
-{{ macros.install_packages(kibana_packages | customizable("packages")) }}
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{% block kibana_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER kibana
diff --git a/docker/kibana/extend_start.sh b/docker/kibana/extend_start.sh
deleted file mode 100644
index 4f6143181..000000000
--- a/docker/kibana/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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
diff --git a/docker/logstash/Dockerfile.j2 b/docker/logstash/Dockerfile.j2
deleted file mode 100644
index 6e4aada54..000000000
--- a/docker/logstash/Dockerfile.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block logstash_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='logstash', shell='/bin/bash', homedir='/usr/share/logstash') }}
-
-{{ macros.enable_extra_repos(['logstash']) }}
-
-{% if base_package_type == 'rpm' %}
-    {% set elk_java_package = 'java-11-openjdk-headless' %}
-ENV JAVA_HOME /usr/lib/jvm/jre-11-openjdk/
-{% elif base_package_type == 'deb' %}
-    {% set elk_java_package = 'openjdk-11-jre-headless' %}
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-{{debian_arch}}/
-{% endif %}
-
-# NOTE(mgoddard): logstash 7.9.x is the last version that supports
-# Elasticsearch OSS.
-{% if base_package_type == 'rpm' %}
-{% set logstash_packages = [
-    'logstash-oss-7.9.*',
-] %}
-{% else %}
-{% set logstash_packages = [
-    'logstash-oss',
-] %}
-{% endif %}
-
-# Post-install script of Logstash fails when trying to install Logstash and
-# Java together.
-{{ macros.install_packages([elk_java_package]) }}
-{{ macros.install_packages(logstash_packages | customizable("packages")) }}
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{% block logstash_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER logstash
diff --git a/docker/logstash/extend_start.sh b/docker/logstash/extend_start.sh
deleted file mode 100644
index 99152b1b5..000000000
--- a/docker/logstash/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/logstash" ]]; then
-    mkdir -p /var/log/kolla/logstash
-fi
-if [[ $(stat -c %a /var/log/kolla/logstash) != "755" ]]; then
-    chmod 755 /var/log/kolla/logstash
-fi
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 36d02f62f..ce23d01a4 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -85,7 +85,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'cryptography',
         'debtcollector',
         'decorator',
-        'elasticsearch',
         'eventlet',
         'fasteners',
         'fluent-logger',