Merge "Remove sensu images"

13 files changed, 6 insertions, 189 deletions

diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index c4a7db379..e5beb94f8 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -74,7 +74,6 @@ rsyslog,C,C,C,C,N,C
 sahara,C,C,C,C,N,C
 searchlight,N,C,N,C,N,C
 senlin,C,C,C,C,N,C
-sensu (deprecated),C,C,N,N,N,N
 skydive,N,N,N,N,N,N
 solum,N,C,N,C,N,C
 storm,C,C,C,C,N,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index f2dbb33ad..c23b4edff 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -75,7 +75,6 @@ rsyslog,C,C,C,C,C,C
 sahara,C,C,C,C,C,C
 searchlight,N,C,N,C,N,C
 senlin,C,C,C,C,C,C
-sensu (deprecated),C,C,C,C,N,N
 skydive,C,C,C,C,C,C
 solum,N,C,N,C,N,C
 storm,C,C,C,C,C,C
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
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 7648b04a0..6983e44e8 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -1072,7 +1072,7 @@ USERS = {
         'uid': 42466,
         'gid': 42466,
     },
-    'sensu-user': {
+    'sensu-user': {  # unused used (sensu dropped)
         'uid': 42467,
         'gid': 42467,
     },
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 96ae2d58d..4b32a0e4a 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -131,7 +131,6 @@ UNBUILDABLE_IMAGES = {
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "opendaylight",          # Missing opendaylight repo
         "ovsdpdk",               # Not supported on CentOS
-        "sensu-base",            # Dropped by CentOS
         "tgtd",                  # Not supported on CentOS 8
     },
 
@@ -142,7 +141,6 @@ UNBUILDABLE_IMAGES = {
         "opendaylight",  # no binary package
         "ovsdpdk",
         "qdrouterd",
-        "sensu-base",
     },
 
     'ubuntu': {
@@ -151,11 +149,6 @@ UNBUILDABLE_IMAGES = {
 
     'ubuntu+aarch64': {
         "kibana",        # no binary package
-        "sensu-base",    # no binary package
-    },
-
-    'ubuntu+ppc64le': {
-        "sensu-base",    # no binary package
     },
 
     'centos+aarch64': {
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 63f02cba2..9b9a4abdb 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -71,7 +71,6 @@ ubuntu:
   opendaylight: "deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main"
   qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main"
   rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
-  sensu: "deb https://sensu.global.ssl.fastly.net/apt bionic main"
   td-agent: "deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib"
 
 ubuntu-aarch64:
diff --git a/releasenotes/notes/remove-sensu-a20b01d025385aa1.yaml b/releasenotes/notes/remove-sensu-a20b01d025385aa1.yaml
new file mode 100644
index 000000000..f06944d16
--- /dev/null
+++ b/releasenotes/notes/remove-sensu-a20b01d025385aa1.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``sensu`` images which were deprecated in the Ussuri cycle has been
+    removed.
diff --git a/tools/validate-binary-build.sh b/tools/validate-binary-build.sh
index 6b430500b..4d12a5df3 100755
--- a/tools/validate-binary-build.sh
+++ b/tools/validate-binary-build.sh
@@ -35,7 +35,6 @@ for distro in debian ubuntu centos rhel; do
     check_for_errors "gem .*install"
     check_for_errors "pip .*install"
     check_for_errors "npm .*install"
-    check_for_errors "sensu-install"
     check_for_errors "git .*clone"
     check_for_errors "wget"
     check_for_errors "curl"