Browse Source

Remove sensu images

They have been deprecated in Ussuri [1].

[1]: https://review.opendev.org/#/c/711636/

Change-Id: I0cfde46c29eedce77c70c1c677220814a801ff3a
changes/40/739440/3
Marcin Juszkiewicz 1 year ago
parent
commit
0cfd36292c
  1. 1
      doc/source/matrix_aarch64.csv
  2. 1
      doc/source/matrix_x86.csv
  3. 3
      docker/base/sources.list.ubuntu
  4. 13
      docker/sensu/sensu-api/Dockerfile.j2
  5. 28
      docker/sensu/sensu-base/Dockerfile.j2
  6. 9
      docker/sensu/sensu-base/extend_start.sh
  7. 82
      docker/sensu/sensu-client/Dockerfile.j2
  8. 42
      docker/sensu/sensu-server/Dockerfile.j2
  9. 2
      kolla/common/config.py
  10. 7
      kolla/image/build.py
  11. 1
      kolla/template/repos.yaml
  12. 5
      releasenotes/notes/remove-sensu-a20b01d025385aa1.yaml
  13. 1
      tools/validate-binary-build.sh

1
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

1
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

3
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

13
docker/sensu/sensu-api/Dockerfile.j2

@ -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

28
docker/sensu/sensu-base/Dockerfile.j2

@ -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 %}

9
docker/sensu/sensu-base/extend_start.sh

@ -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

82
docker/sensu/sensu-client/Dockerfile.j2

@ -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 %}

42
docker/sensu/sensu-server/Dockerfile.j2

@ -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

2
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,
},

7
kolla/image/build.py

@ -132,7 +132,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
},
@ -143,7 +142,6 @@ UNBUILDABLE_IMAGES = {
"opendaylight", # no binary package
"ovsdpdk",
"qdrouterd",
"sensu-base",
},
'ubuntu': {
@ -152,11 +150,6 @@ UNBUILDABLE_IMAGES = {
'ubuntu+aarch64': {
"kibana", # no binary package
"sensu-base", # no binary package
},
'ubuntu+ppc64le': {
"sensu-base", # no binary package
},
'centos+aarch64': {

1
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:

5
releasenotes/notes/remove-sensu-a20b01d025385aa1.yaml

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``sensu`` images which were deprecated in the Ussuri cycle has been
removed.

1
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"

Loading…
Cancel
Save