diff options
25 files changed, 93 insertions, 85 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 f433b9669..b549f19a2 100644 --- a/doc/source/contributor/versions.rst +++ b/doc/source/contributor/versions.rst @@ -15,31 +15,26 @@ information about package sources. ============== ================ ============================================= Name Version Package source information ============== ================ ============================================= - Grafana 9.x `Grafana install guide`_ - Kibana 7.x `Kibana install guide`_ - Logstash 7.x `Logstash install guide`_ + Grafana 12.x `Grafana install guide`_ MariaDB 11.4 (LTS) `MariaDB Community downloads`_ Galera 26.4 (LTS) `MariaDB Community downloads`_ OpenSearch 3.x `OpenSearch install guide`_ ProxySQL 3.0.x `ProxySQL repository`_ - Rabbitmq 4.1.x - CentOS/Rocky: + RabbitMQ 4.2.x - CentOS/Rocky: `Team RabbitMQ 'Cloudsmith' repo (RPM)`_ - Debian/Ubuntu: `Team RabbitMQ 'Cloudsmith' repo (Deb)`_ - Erlang 27.X - CentOS/Rocky aarch64: + Erlang 27.x - CentOS/Rocky aarch64: `openstack-kolla COPR`_ - CentOS/Rocky x86-64: `Team RabbitMQ 'Cloudsmith' repo (RPM)`_ - 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/ .. _`OpenSearch install guide`: https://opensearch.org/downloads.html -.. _`Kibana install guide`: https://www.elastic.co/guide/en/kibana/7.10/install.html -.. _`Logstash install guide`: https://www.elastic.co/guide/en/logstash/7.9/installing-logstash.html .. _`Fluentd install guide`: https://www.fluentd.org/download .. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/ 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/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 992fc0996..045efb6ae 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -11,6 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set glance_api_packages = [ 'lsscsi', 'device-mapper-multipath', + 'nvme-cli', 'qemu-img' ] %} {% elif base_package_type == 'deb' %} @@ -18,6 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'lsscsi', 'multipath-tools', 'nfs-common', + 'nvme-cli', 'qemu-utils' ] %} {% endif %} diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index b854ca0f6..c7d6f8aa2 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -36,7 +36,8 @@ ADD horizon-archive /horizon-source ADD plugins-archive / {% set horizon_pip_packages = [ - '/horizon' + '/horizon', + 'django_redis' ] %} {% set horizon_plugins_pip_packages = [ diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 1934b277c..c730c5566 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -40,7 +40,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq 'openvswitch${KOLLA_RPM_OVS_VERSION}', 'python3', 'python3-devel', - 'rabbitmq-server-4.1.*' + 'rabbitmq-server-4.2.*' ] %} {% elif base_package_type == 'deb' %} @@ -62,12 +62,16 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} {% block kolla_toolbox_pip_conf %} -ENV UPPER_CONSTRAINTS_FILE=https://releases.openstack.org/constraints/upper/{{ openstack_release }} +ENV UPPER_CONSTRAINTS_FILE=/requirements/upper-constraints.txt {% endblock %} {% block kolla_toolbox_upper_constraints %} -RUN mkdir -p /requirements \ - && curl -o /requirements/upper-constraints.txt $UPPER_CONSTRAINTS_FILE \ +ADD kolla-toolbox-archive /kolla-toolbox-source + +RUN case "$UPPER_CONSTRAINTS_FILE" in \ + http*) mkdir -p /requirements && curl -LO $UPPER_CONSTRAINTS_FILE /requirements/upper-constraints.txt ;; \ + *) ln -s kolla-toolbox-source/* /requirements ;; \ + esac \ && {{ macros.upper_constraints_remove("openstacksdk") }} \ && python3 -m venv --system-site-packages {{ venv_path }} \ && KOLLA_DISTRO_PYTHON_VERSION=$(/usr/bin/python3 -c "import sys; print('{}.{}'.format(sys.version_info.major, sys.version_info.minor))") \ @@ -79,6 +83,7 @@ ENV PATH {{ venv_path }}/bin:$PATH {% set kolla_toolbox_pip_packages = [ 'ansible-core==2.20.*', + 'ansible-runner', 'cmd2', 'openstacksdk', 'os-client-config', diff --git a/docker/prometheus/prometheus-valkey-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-valkey-exporter/Dockerfile.j2 new file mode 100644 index 000000000..7f38bae19 --- /dev/null +++ b/docker/prometheus/prometheus-valkey-exporter/Dockerfile.j2 @@ -0,0 +1,25 @@ +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +{% block labels %} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% block prometheus_valkey_exporter_header %}{% endblock %} + +{{ macros.install_packages(prometheus_valkey_exporter_packages | customizable("packages")) }} + +{% block prometheus_valkey_exporter_install %} +ADD prometheus-valkey-exporter-archive /prometheus-valkey-exporter-source + +RUN ln -s /prometheus-valkey-exporter-source/* prometheus-valkey-exporter \ + && cp /prometheus-valkey-exporter/redis_exporter /opt/valkey-exporter + +{% endblock %} + +{{ macros.kolla_patch_sources() }} + +{% block prometheus_valkey_exporter_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER prometheus diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 4f00c818a..36feb9c25 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -24,7 +24,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq {% set rabbitmq_packages = [ 'erlang-27.*', - 'rabbitmq-server-4.1.*' + 'rabbitmq-server-4.2.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.debian b/docker/rabbitmq/apt_preferences_rabbitmq.debian index 714f52fac..cc6404b3e 100644 --- a/docker/rabbitmq/apt_preferences_rabbitmq.debian +++ b/docker/rabbitmq/apt_preferences_rabbitmq.debian @@ -1,5 +1,5 @@ Package: rabbitmq-server -Pin: version 4.1.* +Pin: version 4.2.* Pin-Priority: 1000 Package: erlang* diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu index 714f52fac..cc6404b3e 100644 --- a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu +++ b/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu @@ -1,5 +1,5 @@ Package: rabbitmq-server -Pin: version 4.1.* +Pin: version 4.2.* Pin-Priority: 1000 Package: erlang* 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..d66221af1 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -38,9 +38,8 @@ DISTRO_PRETTY_NAME = { 'ubuntu': 'Ubuntu 24.04.* LTS', } -OPENSTACK_RELEASE = 'master' -# NOTE(mnasiadka): Using Flamingo here until Gazpacho shows up in osbpo -OPENSTACK_RELEASE_CODENAME = 'Flamingo' +OPENSTACK_RELEASE = '2026.1' +OPENSTACK_RELEASE_CODENAME = 'Gazpacho' # TODO(mandre) check for file integrity instead of downloading from an HTTPS # source @@ -96,7 +95,6 @@ _PROFILE_OPTS = [ 'mistral', 'octavia', 'tacker', - 'telegraf', 'trove', 'valkey', 'zun', diff --git a/kolla/common/sources.py b/kolla/common/sources.py index fa9b12126..24a0d7851 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -156,6 +156,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/keystone/' 'keystone-${openstack_branch}.tar.gz')}, + 'kolla-toolbox': { + 'type': 'url', + 'location': ('$tarballs_base/openstack/requirements/' + 'requirements-${openstack_branch}.tar.gz')}, 'kuryr-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/kuryr/' @@ -391,6 +395,17 @@ SOURCES = { 'releases/download/v${version}/' 'prometheus' '-${version}.linux-${debian_arch}.tar.gz')}, + 'prometheus-valkey-exporter': { + 'version': '1.82.0', + 'type': 'url', + 'sha256': { + 'amd64': '2d98dd0888f46e206bf3ad1b7c1784934a3a39cd8774cf47615f4c15594547cd', # noqa: E501 + 'arm64': '13aaa6acbb145848cb97ed3bab22747e094b3f0ed22df83c8ace593e3c527c95'}, # noqa: E501 + 'location': ('https://github.com/' + 'oliver006/redis_exporter/' + 'releases/download/v${version}/' + 'redis_exporter' + '-v${version}.linux-${debian_arch}.tar.gz')}, 'skyline-apiserver': { 'type': 'url', 'location': ('$tarballs_base/openstack/skyline-apiserver/' 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/kolla/template/repos.yaml b/kolla/template/repos.yaml index ece8c49fb..2a40375e0 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -175,7 +175,7 @@ rpm: distro: True name: "opstools" proxysql: - baseurl: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/almalinux/9" + baseurl: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/almalinux/10" gpgkey: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/repo_pub_key" name: "proxysql" rabbitmq: diff --git a/releasenotes/notes/add-valkey-exporter-e21762a106307538.yaml b/releasenotes/notes/add-valkey-exporter-e21762a106307538.yaml new file mode 100644 index 000000000..78cf5d4f8 --- /dev/null +++ b/releasenotes/notes/add-valkey-exporter-e21762a106307538.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Adds support for Valkey monitoring by introducing a new + ``prometheus-valkey-exporter`` container image. diff --git a/releasenotes/notes/bug-2035975-94c5670049a7e1a6.yaml b/releasenotes/notes/bug-2035975-94c5670049a7e1a6.yaml new file mode 100644 index 000000000..2c4186576 --- /dev/null +++ b/releasenotes/notes/bug-2035975-94c5670049a7e1a6.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fix missing nvme-cli package in Glance container. + `LP#2035975 <https://launchpad.net/bugs/2035975>`__ diff --git a/releasenotes/notes/bug-2093414-12e2d0f21e34bc59.yaml b/releasenotes/notes/bug-2093414-12e2d0f21e34bc59.yaml new file mode 100644 index 000000000..0cf23f330 --- /dev/null +++ b/releasenotes/notes/bug-2093414-12e2d0f21e34bc59.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Adds the ``django-redis`` package to the Horizon image. + This enables using Redis or Valkey as a Django cache and + session backend. + `LP#2093414 <https://launchpad.net/bugs/2093414>`__ 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. diff --git a/releasenotes/notes/rabbitmq-42-84cf0d09c9f33ef4.yaml b/releasenotes/notes/rabbitmq-42-84cf0d09c9f33ef4.yaml new file mode 100644 index 000000000..f30512f6e --- /dev/null +++ b/releasenotes/notes/rabbitmq-42-84cf0d09c9f33ef4.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + ``rabbitmq`` version has been updated to ``4.2``. diff --git a/releasenotes/notes/switch-proxysql3-base-to-almalinux10-d64c97ba1a894a34.yaml b/releasenotes/notes/switch-proxysql3-base-to-almalinux10-d64c97ba1a894a34.yaml new file mode 100644 index 000000000..bb2a0f526 --- /dev/null +++ b/releasenotes/notes/switch-proxysql3-base-to-almalinux10-d64c97ba1a894a34.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Bumped ProxySQL 3.0.x repository to Almalinux 10 for Redhat family + distributions. |