aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/base/sources.list.ubuntu3
-rw-r--r--docker/sensu/sensu-api/Dockerfile.j213
-rw-r--r--docker/sensu/sensu-base/Dockerfile.j228
-rw-r--r--docker/sensu/sensu-base/extend_start.sh9
-rw-r--r--docker/sensu/sensu-client/Dockerfile.j282
-rw-r--r--docker/sensu/sensu-server/Dockerfile.j242
6 files changed, 0 insertions, 177 deletions
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index 9a9fbf72b..758d2ceab 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -33,9 +33,6 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/ussuri main
# Qdrouterd repo
#deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main
-# Sensu repo
-#deb https://sensu.global.ssl.fastly.net/apt bionic main
-
# Opendaylight repo
#deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main
diff --git a/docker/sensu/sensu-api/Dockerfile.j2 b/docker/sensu/sensu-api/Dockerfile.j2
deleted file mode 100644
index ca124f19f..000000000
--- a/docker/sensu/sensu-api/Dockerfile.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}sensu-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block sensu_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% block sensu_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER sensu
diff --git a/docker/sensu/sensu-base/Dockerfile.j2 b/docker/sensu/sensu-base/Dockerfile.j2
deleted file mode 100644
index 9d39faa68..000000000
--- a/docker/sensu/sensu-base/Dockerfile.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block sensu_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='sensu') }}
-
-{{ macros.enable_extra_repos(['sensu']) }}
-
-{% if base_package_type == 'rpm' %}
- {% set sensu_base_packages = ['sensu'] %}
-{% elif base_distro in ['ubuntu'] %}
- {% set sensu_base_packages = ['sensu'] %}
-{% else %}
-RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \
- && /bin/false
-{% endif %}
-
-{{ macros.install_packages(sensu_base_packages | customizable("packages")) }}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
-{% block sensu_base_footer %}{% endblock %}
diff --git a/docker/sensu/sensu-base/extend_start.sh b/docker/sensu/sensu-base/extend_start.sh
deleted file mode 100644
index c67447e01..000000000
--- a/docker/sensu/sensu-base/extend_start.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Create log directory, with appropriate permissions
-if [[ ! -d "/var/log/kolla/sensu" ]]; then
- mkdir -p /var/log/kolla/sensu
-fi
-if [[ $(stat -c %a /var/log/kolla/sensu) != "755" ]]; then
- chmod 755 /var/log/kolla/sensu
-fi
diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2
deleted file mode 100644
index f0bda508e..000000000
--- a/docker/sensu/sensu-client/Dockerfile.j2
+++ /dev/null
@@ -1,82 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}sensu-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block sensu_client_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.enable_extra_repos(['ceph']) }}
-
-{% if base_package_type == 'rpm' %}
- {% set sensu_client_packages = [
- 'ceph-common',
- 'cyrus-sasl-devel',
- 'docker-client',
- 'gcc-c++',
- 'make',
- 'mariadb',
- 'ntp',
- 'python3-pymongo',
- 'ruby-devel'
- ] %}
-{% elif base_package_type == 'deb' %}
- {% set sensu_client_packages = [
- 'build-essential',
- 'ceph-common',
- 'docker.io',
- 'inetutils-ping',
- 'libsasl2-dev',
- 'mysql-client',
- 'ntp',
- 'python3-cephfs',
- 'python3-pymongo',
- 'python3-rados',
- 'python3-rbd'
- ] %}
-{% else %}
-RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \
- && /bin/false
-{% endif %}
-
-{{ macros.install_packages(sensu_client_packages | customizable("packages")) }}
-
-{% block sensu_clients_install %}
-
-# Sensu plugins are all using semantic versioning.
-# Let's cap them to the known major version that works with the ruby shipped on
-# rhel/centos (currently 2.0)
-{% set sensu_plugins = [
- 'cpu-checks:"~>1"',
- 'disk-checks:"~>2"',
- 'dns:"~>1"',
- 'docker:"~>3"',
- 'elasticsearch:"~>1"',
- 'filesystem-checks:"~>1"',
- 'haproxy:"~>1"',
- 'http:"~>1"',
- 'io-checks:"~>1"',
- 'load-checks:"~>3"',
- 'memcached:"~>0"',
- 'memory-checks:"~>1"',
- 'mongodb:"~>0"',
- 'mysql:"~>2"',
- 'network-checks:"~>2"',
- 'ntp:"~>1"',
- 'openstack:"~>1"',
- 'rabbitmq:"~>3"',
- 'redis:"~>2"',
- 'uptime-checks:"~>1"',
- 'vmstats:"~>1"'
-] %}
-
-# TODO(mandre) Use packaged sensu plugins from centos-opstools for binary distro
-# http://cbs.centos.org/koji/search?match=glob&type=package&terms=*sensu*
-# NOTE(hrw): whois 5.0.0 requires Ruby 2.4+ while CentOS has 2.0
-# NOTE(yoctozepto): pinning minitest for the same reason
-RUN {%if base_package_type == 'rpm' %} gem install whois:"<5" minitest:"~>5.11.3" && {% endif %} sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }}
-{% endblock %}
-
-{% block sensu_client_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/sensu/sensu-server/Dockerfile.j2 b/docker/sensu/sensu-server/Dockerfile.j2
deleted file mode 100644
index cd3a43bcd..000000000
--- a/docker/sensu/sensu-server/Dockerfile.j2
+++ /dev/null
@@ -1,42 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}sensu-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block sensu_server_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
- {% set sensu_server_packages = [
- 'cyrus-sasl-devel',
- 'gcc-c++',
- 'make',
- 'ruby-devel'
- ] %}
-{% elif base_package_type == 'deb' %}
- {% set sensu_server_packages = [
- 'build-essential',
- 'libsasl2-dev'
- ] %}
-{% endif %}
-
-{{ macros.install_packages(sensu_server_packages | customizable("packages")) }}
-
-{% block sensu_server_plugins_install %}
-
-# Sensu plugins are all using semantic versioning.
-# Let's cap them to the known major version that works with the ruby shipped on
-# rhel/centos (currently 2.0)
-{% set sensu_plugins = [
- 'mailer:"~>3"',
- 'slack:"~>3"'
-] %}
-
-RUN sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }}
-{% endblock %}
-
-{% block sensu_server_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER sensu