aboutsummaryrefslogtreecommitdiff
path: root/docker/monasca
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2022-12-05 15:10:50 +0100
committerMichal Nasiadka <mnasiadka@gmail.com>2022-12-06 12:58:10 +0000
commit52a53927f5d390886c3940e364fe9fa888e3bc98 (patch)
tree6bab585ca2d89349bba013618f8dba299a6a39ed /docker/monasca
parent3043491b0fd6b59b5b76430819d2149da5d254f3 (diff)
downloadkolla-52a53927f5d390886c3940e364fe9fa888e3bc98.tar.gz
kolla-52a53927f5d390886c3940e364fe9fa888e3bc98.zip
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
Diffstat (limited to 'docker/monasca')
-rw-r--r--docker/monasca/monasca-agent/Dockerfile.j224
-rw-r--r--docker/monasca/monasca-api/Dockerfile.j234
-rw-r--r--docker/monasca/monasca-api/extend_start.sh26
-rw-r--r--docker/monasca/monasca-base/Dockerfile.j238
-rw-r--r--docker/monasca/monasca-base/extend_start.sh15
-rw-r--r--docker/monasca/monasca-notification/Dockerfile.j223
-rw-r--r--docker/monasca/monasca-persister/Dockerfile.j226
-rw-r--r--docker/monasca/monasca-thresh/Dockerfile.j265
-rw-r--r--docker/monasca/monasca-thresh/extend_start.sh50
-rw-r--r--docker/monasca/monasca-thresh/topology_bootstrap.sh90
10 files changed, 0 insertions, 391 deletions
diff --git a/docker/monasca/monasca-agent/Dockerfile.j2 b/docker/monasca/monasca-agent/Dockerfile.j2
deleted file mode 100644
index 6f5c7dd90..000000000
--- a/docker/monasca/monasca-agent/Dockerfile.j2
+++ /dev/null
@@ -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
diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2
deleted file mode 100644
index 4b39e4464..000000000
--- a/docker/monasca/monasca-api/Dockerfile.j2
+++ /dev/null
@@ -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 %}
diff --git a/docker/monasca/monasca-api/extend_start.sh b/docker/monasca/monasca-api/extend_start.sh
deleted file mode 100644
index 7f5802f15..000000000
--- a/docker/monasca/monasca-api/extend_start.sh
+++ /dev/null
@@ -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
diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2
deleted file mode 100644
index e343a922a..000000000
--- a/docker/monasca/monasca-base/Dockerfile.j2
+++ /dev/null
@@ -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 %}
diff --git a/docker/monasca/monasca-base/extend_start.sh b/docker/monasca/monasca-base/extend_start.sh
deleted file mode 100644
index 77e835d44..000000000
--- a/docker/monasca/monasca-base/extend_start.sh
+++ /dev/null
@@ -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
diff --git a/docker/monasca/monasca-notification/Dockerfile.j2 b/docker/monasca/monasca-notification/Dockerfile.j2
deleted file mode 100644
index 0899b95c5..000000000
--- a/docker/monasca/monasca-notification/Dockerfile.j2
+++ /dev/null
@@ -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
diff --git a/docker/monasca/monasca-persister/Dockerfile.j2 b/docker/monasca/monasca-persister/Dockerfile.j2
deleted file mode 100644
index 9194768a0..000000000
--- a/docker/monasca/monasca-persister/Dockerfile.j2
+++ /dev/null
@@ -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
diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2
deleted file mode 100644
index a41692d08..000000000
--- a/docker/monasca/monasca-thresh/Dockerfile.j2
+++ /dev/null
@@ -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
diff --git a/docker/monasca/monasca-thresh/extend_start.sh b/docker/monasca/monasca-thresh/extend_start.sh
deleted file mode 100644
index 62451a8e1..000000000
--- a/docker/monasca/monasca-thresh/extend_start.sh
+++ /dev/null
@@ -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
diff --git a/docker/monasca/monasca-thresh/topology_bootstrap.sh b/docker/monasca/monasca-thresh/topology_bootstrap.sh
deleted file mode 100644
index 923d745e5..000000000
--- a/docker/monasca/monasca-thresh/topology_bootstrap.sh
+++ /dev/null
@@ -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