Remove monasca, kafka, storm and zookeeper.

Monasca, kafka, storm and zookeeper have been removed in kolla-ansible [1],[2].

[1]: https://review.opendev.org/c/openstack/kolla-ansible/+/861392
[2]: https://review.opendev.org/c/openstack/kolla-ansible/+/865029

Change-Id: I0958a9353bc4585c4f65a1d316328a0e80b0b8b7

docker/fluentd/Dockerfile.j2

@@ -59,23 +59,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 {% endblock %}
 
-{% block fluentd_monasca_plugin_version %}
-ARG monasca_output_plugin_version=1.0.2
-ARG monasca_output_plugin_url=https://github.com/monasca/fluentd-monasca/archive/${monasca_output_plugin_version}.tar.gz
-{% endblock %}
-
-{% block fluentd_monasca_plugin_install %}
-# Build and install Fluentd output plugin for Monasca API
-
-RUN curl ${monasca_output_plugin_url} -o /tmp/fluentd-monasca.tar.gz \
-    && tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \
-    && cd /tmp/fluentd-monasca-* \
-    && td-agent-gem build fluentd-monasca-output.gemspec \
-    && {{ macros.install_fluent_plugins(['fluentd-monasca-output-*.gem'], chain=True) }} \
-    && rm -rf /tmp/fluentd*
-
-{% endblock %}
-
 {% block fluentd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 

docker/grafana/Dockerfile.j2

@@ -27,8 +27,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 {% block grafana_plugins_install %}
 
-RUN grafana-cli plugins install gnocchixyz-gnocchi-datasource \
+RUN grafana-cli plugins install gnocchixyz-gnocchi-datasource
-    && grafana-cli plugins install monasca-datasource
 
 {% endblock %}
 

docker/horizon/extend_start.sh

@@ -137,15 +137,6 @@ function config_masakari_dashboard {
         "${SITE_PACKAGES}/openstack_dashboard/local/local_settings.d/_50_masakari.py"
 }
 
-function config_monasca_ui {
-    config_dashboard "${ENABLE_MONASCA:-no}" \
-        "${SITE_PACKAGES}/monitoring/enabled/_50_admin_add_monitoring_panel.py" \
-        "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_50_admin_add_monitoring_panel.py"
-    config_dashboard "${ENABLE_MONASCA:-no}" \
-        "${SITE_PACKAGES}/monitoring/conf/monitoring_policy.json" \
-        "/etc/openstack-dashboard/monitoring_policy.json"
-}
-
 function config_murano_dashboard {
     for file in ${SITE_PACKAGES}/muranodashboard/local/enabled/_*[^__].py; do
         config_dashboard "${ENABLE_MURANO:-no}" \
@@ -283,7 +274,6 @@ config_magnum_dashboard
 config_manila_ui
 config_masakari_dashboard
 config_mistral_dashboard
-config_monasca_ui
 config_murano_dashboard
 config_neutron_vpnaas_dashboard
 config_octavia_dashboard

docker/kafka/Dockerfile.j2

@@ -1,51 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block kafka_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='kafka', homedir='/opt/kafka') }}
-
-{% if base_package_type == 'rpm' %}
-    {% set kafka_packages = [
-        'java-1.8.0-openjdk-headless',
-    ] %}
-{% elif base_package_type == 'deb' %}
-
-    {% if base_distro == 'debian' %}
-        {% set java_version = '11' %}
-    {% elif base_distro == 'ubuntu' %}
-        {% set java_version = '8' %}
-    {% endif %}
-
-    {% set kafka_packages = [
-        'openjdk-' + java_version + '-jre-headless',
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(kafka_packages | customizable("packages")) }}
-
-{% block kafka_version %}
-ARG kafka_version=2.0.1
-ARG kafka_scala_version=2.12
-ARG kafka_url=https://archive.apache.org/dist/kafka/${kafka_version}/kafka_${kafka_scala_version}-${kafka_version}.tgz
-ARG kafka_pkg_sha512sum=9773a85ef2898b4bae20481df4cfd5488bd195fffd700fcc874a9fa55065f6873f2ee12f46d2f6a6ccb5d5a93ddb7dec19227aef5d39d4f72b545ec63b24bb2f
-{% endblock %}
-
-{% block kafka_install %}
-RUN curl -o /tmp/kafka.tgz ${kafka_url} \
-    && echo "${kafka_pkg_sha512sum} /tmp/kafka.tgz" | sha512sum -c \
-    && tar --strip 1 -xvf /tmp/kafka.tgz -C /opt/kafka \
-    && rm -f /tmp/kafka.tgz
-{% endblock %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{% block kafka_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER kafka

docker/kafka/extend_start.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Create log directory, with appropriate permissions
-if [[ ! -d "/var/log/kolla/kafka" ]]; then
-    mkdir -p /var/log/kolla/kafka
-fi
-if [[ $(stat -c %a /var/log/kolla/kafka) != "755" ]]; then
-    chmod 755 /var/log/kolla/kafka
-fi

docker/monasca/monasca-agent/Dockerfile.j2

@@ -1,24 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block monasca_agent_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-ADD monasca-agent-archive /monasca-agent-source
-
-{% set monasca_agent_pip_packages = [
-    '/monasca-agent',
-    'prometheus_client'
-] %}
-
-RUN ln -s monasca-agent-source/* monasca-agent \
-    && {{ macros.install_pip(monasca_agent_pip_packages | customizable("pip_packages")) }}
-
-{% block monasca_agent_footer %}{% endblock %}
-
-{% block footer %}{% endblock %}
-
-USER monasca

docker/monasca/monasca-api/Dockerfile.j2

@@ -1,34 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block monasca_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-    {% set monasca_api_packages = [
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set monasca_api_packages = [
-    ] %}
-{% endif %}
-{{ macros.install_packages(monasca_api_packages | customizable("packages")) }}
-
-ADD monasca-api-archive /monasca-api-source
-
-{% set monasca_api_pip_packages = [
-    'influxdb',
-    '/monasca-api'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_monasca_extend_start
-
-RUN ln -s monasca-api-source/* monasca-api \
-    && {{ macros.install_pip(monasca_api_pip_packages | customizable("pip_packages")) }} \
-    && chmod 644 /usr/local/bin/kolla_monasca_extend_start
-
-{% block monasca_api_footer %}{% endblock %}
-
-{% block footer %}{% endblock %}

docker/monasca/monasca-api/extend_start.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-SERVICE="monasca-api"
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    monasca_db upgrade
-    exit 0
-fi
-
-# When Apache first starts it writes out the custom log files with root
-# ownership. This later prevents the Monasca API (which runs under the
-# 'monasca' user) from updating them. To avoid this we create the log
-# files with the required permissions here, before Apache does.
-MONASCA_API_LOG_DIR="/var/log/kolla/monasca"
-for LOG_TYPE in error access; do
-    if [ ! -f "${MONASCA_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log" ]; then
-        touch ${MONASCA_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log
-    fi
-    if [[ $(stat -c %U:%G ${MONASCA_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log) != "monasca:kolla" ]]; then
-        chown monasca:kolla ${MONASCA_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log
-    fi
-done
-
-. /usr/local/bin/kolla_httpd_setup

docker/monasca/monasca-base/Dockerfile.j2

@@ -1,38 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block monasca_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='monasca') }}
-
-{% if base_package_type == 'rpm' %}
-    {% set monasca_base_packages = [
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set monasca_base_packages = [
-        'librdkafka-dev'
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(monasca_base_packages | customizable("packages")) }}
-
-{% block monasca_source_install %}
-
-{% set monasca_base_pip_packages = [
-    'monasca-common',
-] %}
-
-RUN {{ macros.install_pip(monasca_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/monasca
-{% endblock %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN touch /usr/local/bin/kolla_monasca_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_monasca_extend_start
-
-{% block monasca_base_footer %}{% endblock %}

docker/monasca/monasca-base/extend_start.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Create log directory, with appropriate permissions
-MONASCA_LOG_DIR="/var/log/kolla/monasca"
-if [[ ! -d "$MONASCA_LOG_DIR" ]]; then
-    mkdir -p $MONASCA_LOG_DIR
-fi
-if [[ $(stat -c %U:%G ${MONASCA_LOG_DIR}) != "monasca:kolla" ]]; then
-    chown monasca:kolla ${MONASCA_LOG_DIR}
-fi
-if [[ $(stat -c %a ${MONASCA_LOG_DIR}) != "755" ]]; then
-    chmod 755 ${MONASCA_LOG_DIR}
-fi
-
-. /usr/local/bin/kolla_monasca_extend_start

docker/monasca/monasca-notification/Dockerfile.j2

@@ -1,23 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block monasca_notification_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-ADD monasca-notification-archive /monasca-notification-source
-
-{% set monasca_notification_pip_packages = [
-    '/monasca-notification'
-] %}
-
-RUN ln -s monasca-notification-source/* monasca-notification \
-    && {{ macros.install_pip(monasca_notification_pip_packages | customizable("pip_packages")) }}
-
-{% block monasca_notification_footer %}{% endblock %}
-
-{% block footer %}{% endblock %}
-
-USER monasca

docker/monasca/monasca-persister/Dockerfile.j2

@@ -1,26 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block monasca_persister_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-ADD monasca-persister-archive /monasca-persister-source
-
-{% set monasca_persister_pip_packages = [
-    '/monasca-persister',
-    'influxdb',
-    'elasticsearch',
-    'cassandra-driver'
-] %}
-
-RUN ln -s monasca-persister-source/* monasca-persister \
-    && {{ macros.install_pip(monasca_persister_pip_packages | customizable("pip_packages")) }}
-
-{% block monasca_persister_footer %}{% endblock %}
-
-{% block footer %}{% endblock %}
-
-USER monasca

docker/monasca/monasca-thresh/Dockerfile.j2

@@ -1,65 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}storm-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block monasca_thresh_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='monasca') }}
-
-{% if base_package_type == 'rpm' %}
-    {% set monasca_thresh_packages = [
-        'maven',
-    ] %}
-
-ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/
-
-{% elif base_package_type == 'deb' %}
-
-    {% if base_distro == 'debian' %}
-        {% set java_version = '11' %}
-    {% elif base_distro == 'ubuntu' %}
-        {% set java_version = '8' %}
-    {% endif %}
-
-    {% set monasca_thresh_packages = [
-        'openjdk-' + java_version + '-jdk-headless',
-        'maven',
-    ] %}
-
-ENV JAVA_HOME /usr/lib/jvm/java-{{java_version}}-openjdk-{{debian_arch}}/
-
-{% endif %}
-
-{{ macros.install_packages(monasca_thresh_packages | customizable("packages")) }}
-
-ADD monasca-thresh-archive /monasca-thresh-source
-ADD additions/monasca-common* /monasca-common-source
-
-{% block monasca_thresh_source_install %}
-
-{% set build_opts = ['-DskipTests'] %}
-
-RUN cd /monasca-common-source/java \
-    && mvn clean install {{ build_opts|join(' ') }} \
-    && cd /monasca-thresh-source/monasca-thresh-*/thresh \
-    && mvn clean package {{ build_opts|join(' ') }}
-{% endblock %}
-
-# Overwrite the script inherited from Storm
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-# Add bootstrap script
-COPY topology_bootstrap.sh /usr/local/bin/topology_bootstrap
-
-RUN touch /usr/local/bin/kolla_monasca_extend_start \
-    && chmod 644 /usr/local/bin/kolla_extend_start \
-    /usr/local/bin/kolla_monasca_extend_start \
-    /usr/local/bin/topology_bootstrap
-
-{% block monasca_thresh_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER monasca

docker/monasca/monasca-thresh/extend_start.sh

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-# Create log and data directories, with appropriate permissions
-MONASCA_LOG_DIR="/var/log/kolla/monasca"
-MONASCA_DATA_DIR="/var/lib/monasca-thresh/data"
-MONASCA_WORKER_DIR="/var/lib/monasca-thresh/worker-artifacts"
-if [[ ! -d "$MONASCA_LOG_DIR" ]]; then
-    mkdir -p $MONASCA_LOG_DIR
-fi
-if [[ ! -d "$MONASCA_DATA_DIR" ]]; then
-    mkdir -p $MONASCA_DATA_DIR
-fi
-if [[ ! -d "$MONASCA_WORKER_DIR" ]]; then
-    mkdir -p $MONASCA_WORKER_DIR
-fi
-if [[ $(stat -c %U:%G ${MONASCA_LOG_DIR}) != "monasca:kolla" ]]; then
-    chown monasca:kolla ${MONASCA_LOG_DIR}
-fi
-if [[ $(stat -c %U:%G ${MONASCA_DATA_DIR}) != "monasca:kolla" ]]; then
-    chown monasca:kolla ${MONASCA_DATA_DIR}
-fi
-if [[ $(stat -c %U:%G ${MONASCA_WORKER_DIR}) != "monasca:kolla" ]]; then
-    chown monasca:kolla ${MONASCA_WORKER_DIR}
-fi
-if [[ $(stat -c %a ${MONASCA_LOG_DIR}) != "755" ]]; then
-    chmod 755 ${MONASCA_LOG_DIR}
-fi
-if [[ $(stat -c %a ${MONASCA_DATA_DIR}) != "755" ]]; then
-    chmod 755 ${MONASCA_DATA_DIR}
-fi
-if [[ $(stat -c %a ${MONASCA_WORKER_DIR}) != "755" ]]; then
-    chmod 755 ${MONASCA_WORKER_DIR}
-fi
-
-# Delete the contents of data and worker-artifacts directories as
-# Apache Storm doesn't clear temp files unless shutdown gracefully.
-if [[ $(ls -Ab ${MONASCA_DATA_DIR}) != "" ]]; then
-    find ${MONASCA_DATA_DIR} -mindepth 1 -delete
-fi
-if [[ $(ls -Ab ${MONASCA_WORKER_DIR}) != "" ]]; then
-    find ${MONASCA_WORKER_DIR} -mindepth 1 -delete
-fi
-
-. /usr/local/bin/kolla_monasca_extend_start
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    . /usr/local/bin/topology_bootstrap
-fi

docker/monasca/monasca-thresh/topology_bootstrap.sh

@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# This script should be sourced by kolla_extend_start when bootstrapping
-#
-# Optional env(<default>):
-#   TOPOLOGY_NAME("monasca-thresh") - topology name to check
-#   TOPOLOGY_KILL_TIMEOUT(5) - secs to wait for topology kill
-#   STORM_WAIT_RETRIES(24) - retries to check for storm
-#   STORM_WAIT_TIMEOUT(20) - secs to wait for storm list
-#   STORM_WAIT_DELAY(5) - secs between storm list attempts
-
-#  - If topology exists, then:
-#     a) if TOPOLOGY_REPLACE is set, the existing topology is killed
-#        and script falls through (topology may be added)
-#     b) otherwise script exits with 0 (topology already exists)
-#  - If topology doesn't exist, script falls through (topology may be added)
-#  - If storm cannot be reached, or kill fails, script exits with 1
-
-TOPOLOGY_NAME=${TOPOLOGY_NAME:-monasca-thresh}
-TOPOLOGY_KILL_TIMEOUT=${TOPOLOGY_KILL_TIMEOUT:-5}
-
-# defaults from monasca-thresh
-STORM_WAIT_RETRIES=${STORM_WAIT_RETRIES:-24}
-STORM_WAIT_TIMEOUT=${STORM_WAIT_TIMEOUT:-20}
-STORM_WAIT_DELAY=${STORM_WAIT_DELAY:-5}
-
-STORM="/opt/storm/bin/storm"
-
-echo "Waiting for storm to become available..."
-success="false"
-for i in $(seq "$STORM_WAIT_RETRIES"); do
-    if timeout "$STORM_WAIT_TIMEOUT" "$STORM" list; then
-        echo "Storm is available, continuing..."
-        success="true"
-        break
-    else
-        echo "Connection attempt $i of $STORM_WAIT_RETRIES failed"
-        sleep "$STORM_WAIT_DELAY"
-    fi
-done
-
-if [ "$success" != "true" ]; then
-    echo "Unable to connect to Storm! Exiting..."
-    sleep 1
-    exit 1
-fi
-
-locate_topology() { # <topology>
-    echo "Searching for topology $1 in the storm"
-    topologies=$("$STORM" list | awk '/-----/,0{if (!/-----/)print $1}')
-    found="false"
-    for topology in $topologies; do
-        if [ "$topology" = "$1" ]; then
-            echo "Found storm topology with name: $topology"
-            found="true"
-            break
-        fi
-    done
-}
-
-# search for existing topology
-locate_topology "$TOPOLOGY_NAME"
-
-if [ "$found" = "true" ]; then
-
-    if [[ ! "${!TOPOLOGY_REPLACE[@]}" ]]; then
-        echo "Topology $TOPOLOGY_NAME found, submission not necessary"
-        exit 0
-    fi
-
-    echo "Topology replacement requested, killing old one..."
-    "$STORM" kill "$TOPOLOGY_NAME" -w "$TOPOLOGY_KILL_TIMEOUT"
-
-    echo "Wait $TOPOLOGY_KILL_TIMEOUT secs for topology to reap its artifacts..."
-    sleep "$TOPOLOGY_KILL_TIMEOUT"
-
-    for i in $(seq "$STORM_WAIT_RETRIES"); do
-        locate_topology "$TOPOLOGY_NAME"
-        [ "$found" != "true" ] && break
-        echo "... wait some more..."
-        sleep "$STORM_WAIT_DELAY"
-    done
-    if [ "$found" = "true" ]; then
-        echo "Unable to kill existing topology, giving up..."
-        exit 1
-    fi
-    echo "Topology successfully killed, continuing..."
-else
-    echo "Topology not found, continuing..."
-fi

docker/storm/storm-base/Dockerfile.j2

@@ -1,58 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block storm_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='storm', homedir='/opt/storm') }}
-
-{% if base_package_type == 'rpm' %}
-    {% set storm_packages = [
-        'java-1.8.0-openjdk-headless',
-        'zip',
-    ] %}
-{% elif base_package_type == 'deb' %}
-
-    {% if base_distro == 'debian' %}
-        {% set java_version = '11' %}
-    {% elif base_distro == 'ubuntu' %}
-        {% set java_version = '8' %}
-    {% endif %}
-
-    {% set storm_packages = [
-        'openjdk-' + java_version + '-jre-headless',
-        'zip',
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(storm_packages | customizable("packages")) }}
-
-{% block storm_version %}
-ARG storm_version=1.2.2
-ARG storm_url=https://archive.apache.org/dist/storm/apache-storm-${storm_version}/apache-storm-${storm_version}.tar.gz
-ARG storm_pkg_sha512sum=0a1120b8df7b22edc75f0a412d625841f72f3fb8e9ff5d413d510908d68ea1f0c17d68c1a7f1eda427b40902452e9efcae902c36499b558592e41cc1079de2e0
-{% endblock %}
-
-{% block storm_install %}
-RUN curl -o /tmp/storm.tgz ${storm_url} \
-    && echo "${storm_pkg_sha512sum} /tmp/storm.tgz" | sha512sum -c \
-    && tar --strip 1 -xvf /tmp/storm.tgz -C /opt/storm \
-    && rm -f /tmp/storm.tgz
-
-# Mitigation for CVE-2021-44228 and CVE-2021-45046: remove the JndiLookup class
-# from the classpath
-RUN zip -q -d /opt/storm/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
-{% endblock %}
-
-{% block storm_python_version %}
-# NOTE(dszumski): Storm needs to be told where the Py3 interpreter lives
-ENV PYTHON='/usr/bin/python3'
-{% endblock %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{% block storm_base_footer %}{% endblock %}

docker/storm/storm-base/extend_start.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Create log directory, with appropriate permissions
-if [[ ! -d "/var/log/kolla/storm" ]]; then
-    mkdir -p /var/log/kolla/storm
-fi
-if [[ $(stat -c %a /var/log/kolla/storm) != "755" ]]; then
-    chmod 755 /var/log/kolla/storm
-fi

docker/storm/storm/Dockerfile.j2

@@ -1,13 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}storm-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block storm_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% block storm_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER storm

docker/zookeeper/Dockerfile.j2

@@ -1,43 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block zookeeper_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='zookeeper', homedir='/opt/zookeeper') }}
-
-{% if base_package_type == 'rpm' %}
-    {% set zookeeper_packages = [
-        'java-1.8.0-openjdk-headless',
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set zookeeper_packages = [
-        'default-jre-headless',
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(zookeeper_packages | customizable("packages")) }}
-
-{% block zookeeper_version %}
-ARG zookeeper_version=3.4.13
-ARG zookeeper_url=http://archive.apache.org/dist/zookeeper/zookeeper-${zookeeper_version}/zookeeper-${zookeeper_version}.tar.gz
-ARG zookeeper_pkg_sha1sum=a989b527f3f990d471e6d47ee410e57d8be7620b
-{% endblock %}
-
-{% block zookeeper_binary_install %}
-RUN curl -o /tmp/zookeeper.tar.gz ${zookeeper_url} \
-    && echo "${zookeeper_pkg_sha1sum} /tmp/zookeeper.tar.gz" | sha1sum -c \
-    && tar --strip 1 -xvf /tmp/zookeeper.tar.gz -C /opt/zookeeper \
-    && rm -f /tmp/zookeeper.tar.gz
-{% endblock %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 644 /usr/local/bin/kolla_extend_start
-
-{% block zookeeper_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER zookeeper

docker/zookeeper/extend_start.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Create log directory, with appropriate permissions
-if [[ ! -d "/var/log/kolla/zookeeper" ]]; then
-    mkdir -p /var/log/kolla/zookeeper
-fi
-if [[ $(stat -c %a /var/log/kolla/zookeeper) != "755" ]]; then
-    chmod 755 /var/log/kolla/zookeeper
-fi

kolla/common/config.py

@@ -105,7 +105,6 @@ _PROFILE_OPTS = [
                     'manila',
                     'masakari',
                     'mistral',
-                    'monasca',
                     'murano',
                     'octavia',
                     'redis',

kolla/common/sources.py

@@ -116,10 +116,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/mistral-dashboard/'
                      'mistral-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-monasca-ui': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-ui/'
-                     'monasca-ui-${openstack_branch}.tar.gz')},
     'horizon-plugin-murano-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/murano-dashboard/'
@@ -208,35 +204,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/tacker/'
                      'tacker-${openstack_branch}.tar.gz')},
-    'monasca-agent': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-agent/'
-                     'monasca-agent-${openstack_branch}.tar.gz')},
-    'monasca-api': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-api/'
-                     'monasca-api-${openstack_branch}.tar.gz')},
-    'monasca-notification': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-notification/'
-                     'monasca-notification-${openstack_branch}.tar.gz')},
-    'monasca-persister': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-persister/'
-                     'monasca-persister-${openstack_branch}.tar.gz')},
-    'monasca-statsd': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-statsd/'
-                     'monasca-statsd-${openstack_branch}.tar.gz')},
-    # FIXME(dszumski): Use openstack tar when infra is fixed
-    'monasca-thresh': {
-        'type': 'url',
-        'location': ('https://github.com/openstack/monasca-thresh/archive/'
-                     '${openstack_branch_slashed}.tar.gz')},
-    'monasca-thresh-additions-monasca-common': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-common/'
-                     'monasca-common-${openstack_branch}.tar.gz')},
     'murano-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/murano/'

kolla/common/users.py

@@ -97,7 +97,7 @@ USERS = {
         'uid': 42422,
         'gid': 42422,
     },
-    'kafka-user': {
+    'kafka-user': {  # unused user (kafka dropped)
         'uid': 42423,
         'gid': 42423,
     },
@@ -125,7 +125,7 @@ USERS = {
         'uid': 42430,
         'gid': 42430,
     },
-    'monasca-user': {
+    'monasca-user': {  # unused user (monasca dropped)
         'uid': 42431,
         'gid': 42431,
     },
@@ -201,7 +201,7 @@ USERS = {
         'uid': 42451,
         'gid': 42451,
     },
-    'zookeeper-user': {
+    'zookeeper-user': {  # unused user (zookeeper dropped)
         'uid': 42453,
         'gid': 42453,
     },

kolla/image/unbuildable.py

@@ -17,8 +17,6 @@
 UNBUILDABLE_IMAGES = {
     'aarch64': {
         "bifrost-base",      # someone need to get upstream working first
-        "monasca-base",      # 'confluent-kafka' requires newer libfdkafka-dev
-                             # than distributions have (v1.9.0+ in Zed)
         "prometheus-msteams",  # no aarch64 binary
         "prometheus-mtail",  # no aarch64 binary
         "skydive-base",      # no aarch64 binary

releasenotes/notes/deprecate-monasca-75479150789122dc.yaml

@@ -1,6 +1,7 @@
 ---
-deprecations:
+upgrade:
   - |
-    Deprecates support for ``monasca``, ``kafka``, ``storm`` and ``zookeeper``
+    Removes images for ``monasca``, ``kafka``, ``storm`` and
-    images. They will be removed in the Antelope cycle. Prometheus + Grafana +
+    ``zookeeper``, since support for them has been dropped in Kolla-Ansible in
-    EFK remain as the primary monitoring, logging and alerting stack in Kolla.
+    Zed release. Prometheus + Grafana + Fluentd + OpenSearch remain as the
+    primary monitoring, logging and alerting stack in Kolla.