diff options
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | doc/source/contributor/versions.rst | 1 | ||||
| -rw-r--r-- | doc/source/matrix_aarch64.csv | 1 | ||||
| -rw-r--r-- | doc/source/matrix_x86.csv | 1 | ||||
| -rw-r--r-- | docker/telegraf/Dockerfile.j2 | 46 | ||||
| -rw-r--r-- | docker/telegraf/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/telegraf/telegraf_sudoers | 1 | ||||
| -rw-r--r-- | kolla/common/config.py | 1 | ||||
| -rw-r--r-- | kolla/common/users.py | 2 | ||||
| -rw-r--r-- | kolla/image/unbuildable.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/drop-telegraf-28dd961f18ed7825.yaml | 4 |
11 files changed, 5 insertions, 66 deletions
diff --git a/README.rst b/README.rst index 6bf18532c..766d6b928 100644 --- a/README.rst +++ b/README.rst @@ -130,8 +130,6 @@ Kolla provides images to deploy the following infrastructure components: - `Valkey Sentinel <https://valkey.io/topics/sentinel>`__ provides high availability for valkey along with collateral tasks such as monitoring, notification and acts as configuration provider for clients. -- `Telegraf <https://www.docs.influxdata.com/telegraf/>`__ as a plugin-driven server - agent for collecting & reporting metrics. Directories =========== diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst index 018866463..62fa4818d 100644 --- a/doc/source/contributor/versions.rst +++ b/doc/source/contributor/versions.rst @@ -33,7 +33,6 @@ information about package sources. - Debian/Ubuntu: `Team RabbitMQ 'Modern Erlang' PPA`_ Fluentd 6.x (LTS) `Fluentd install guide`_ - Telegraf 1.24.x `InfluxDB upstream repo`_ ============== ================ ============================================= .. _`InfluxDB upstream repo`: https://repos.influxdata.com/ diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index 82c372410..7dbd5849f 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -47,7 +47,6 @@ prometheus,U,U,U rabbitmq,U,U,U skyline,U,U,U tacker,U,U,U -telegraf,N,N,N tgtd,U,U,U trove,U,U,U valkey,U,U,U diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 0e03298be..512577aac 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -49,7 +49,6 @@ rabbitmq,T,T,T skyline,U,U,U swift,T,T,U tacker,T,U,U -telegraf,U,U,U tgtd,N,T,U trove,U,U,U valkey,T,U,U diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2 deleted file mode 100644 index da431aeee..000000000 --- a/docker/telegraf/Dockerfile.j2 +++ /dev/null @@ -1,46 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block telegraf_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.enable_extra_repos(['influxdb']) }} -{{ macros.configure_user(name='telegraf', homedir='/etc/telegraf') }} - -{% set telegraf_packages = [ - 'chrony', - 'net-tools', - 'telegraf' -] %} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['opstools']) }} - - {% set telegraf_packages = telegraf_packages + [ - 'collectd', - ] %} -{% elif base_package_type == 'deb' %} - {% set telegraf_packages = telegraf_packages + [ - 'collectd-core', - ] %} -{% endif %} - -{{ macros.install_packages(telegraf_packages | customizable("packages")) }} - -COPY telegraf_sudoers /etc/sudoers.d/kolla_telegraf_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_telegraf_sudoers \ - && chmod 644 /usr/local/bin/kolla_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block telegraf_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER telegraf diff --git a/docker/telegraf/extend_start.sh b/docker/telegraf/extend_start.sh deleted file mode 100644 index 2830da1cb..000000000 --- a/docker/telegraf/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -TELEGRAF_LOG_DIR="/var/log/kolla/telegraf" - -if [[ ! -d "${TELEGRAF_LOG_DIR}" ]]; then - mkdir -p ${TELEGRAF_LOG_DIR} -fi -if [[ $(stat -c %a ${TELEGRAF_LOG_DIR}) != "755" ]]; then - chmod 755 ${TELEGRAF_LOG_DIR} -fi diff --git a/docker/telegraf/telegraf_sudoers b/docker/telegraf/telegraf_sudoers deleted file mode 100644 index d6e1e092f..000000000 --- a/docker/telegraf/telegraf_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R telegraf\: /var/lib/telegraf, /bin/chown -R telegraf\: /var/lib/telegraf diff --git a/kolla/common/config.py b/kolla/common/config.py index b1f325188..ee975f622 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -96,7 +96,6 @@ _PROFILE_OPTS = [ 'mistral', 'octavia', 'tacker', - 'telegraf', 'trove', 'valkey', 'zun', diff --git a/kolla/common/users.py b/kolla/common/users.py index cbbc147b0..623456071 100644 --- a/kolla/common/users.py +++ b/kolla/common/users.py @@ -185,7 +185,7 @@ USERS = { 'uid': 42447, 'gid': 42447, }, - 'telegraf-user': { + 'telegraf-user': { # unused user (telegraf dropped) 'uid': 42448, 'gid': 42448, }, diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py index 06c1f51f9..5dbc72094 100644 --- a/kolla/image/unbuildable.py +++ b/kolla/image/unbuildable.py @@ -26,7 +26,6 @@ UNBUILDABLE_IMAGES = { "hacluster-pcs", # Missing crmsh package "nova-spicehtml5proxy", # Missing spicehtml5 package "ovsdpdk", # Not supported on CentOS - "telegraf", # CS10 no opstools repo "tgtd", # Not supported on CentOS }, @@ -38,7 +37,6 @@ UNBUILDABLE_IMAGES = { "hacluster-pcs", # Missing crmsh package "nova-spicehtml5proxy", # Missing spicehtml5 package "ovsdpdk", # Not supported on CentOS - "telegraf", # CS10 no opstools repo "tgtd", # Not supported on CentOS }, diff --git a/releasenotes/notes/drop-telegraf-28dd961f18ed7825.yaml b/releasenotes/notes/drop-telegraf-28dd961f18ed7825.yaml new file mode 100644 index 000000000..93de985b2 --- /dev/null +++ b/releasenotes/notes/drop-telegraf-28dd961f18ed7825.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for building ``telegraf`` container images has been dropped. |