From 5bea347bd89dae1513e5feb36f61f2155e1d381d Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Thu, 9 Mar 2023 15:57:34 +0000 Subject: [PATCH 1/5] fix virtualenv ci failure (cherry picked from commit e36a6fb384e20d6d3d3f2c6634fca80f71cd149f) --- etc/kayobe/ansible/configure-aio-resources.yml | 9 ++++++++- etc/kayobe/environments/ci-aio/kolla/globals.yml | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/ansible/configure-aio-resources.yml b/etc/kayobe/ansible/configure-aio-resources.yml index 78450eaeb..243472d60 100644 --- a/etc/kayobe/ansible/configure-aio-resources.yml +++ b/etc/kayobe/ansible/configure-aio-resources.yml @@ -16,7 +16,14 @@ state: present become: true - - name: Install python openstack client + - name: Ensure latest version of pip is installed + pip: + name: pip + state: latest + virtualenv: '{{ venv }}' + virtualenv_command: "/usr/bin/python3 -m venv" + + - name: Ensure python openstack client is installed pip: name: python-openstackclient virtualenv: '{{ venv }}' diff --git a/etc/kayobe/environments/ci-aio/kolla/globals.yml b/etc/kayobe/environments/ci-aio/kolla/globals.yml index 843acf785..626ecae08 100644 --- a/etc/kayobe/environments/ci-aio/kolla/globals.yml +++ b/etc/kayobe/environments/ci-aio/kolla/globals.yml @@ -14,3 +14,6 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" # Elasticsearch memory tuning es_heap_size: 1g + +# Increase Grafana timeout +grafana_start_first_node_retries: 20 From 958114d5beff45915ca2952748ca19b8f9278954 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 13 Mar 2023 14:47:03 +0000 Subject: [PATCH 2/5] CI: Install python3-venv on Ubuntu in configure-aio-resources.yml --- etc/kayobe/ansible/configure-aio-resources.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/etc/kayobe/ansible/configure-aio-resources.yml b/etc/kayobe/ansible/configure-aio-resources.yml index 243472d60..48263c641 100644 --- a/etc/kayobe/ansible/configure-aio-resources.yml +++ b/etc/kayobe/ansible/configure-aio-resources.yml @@ -8,13 +8,16 @@ tasks: - name: Install python build dependencies package: - name: - - "{% if ansible_facts.os_family == 'RedHat' %}gcc{% else %}build-essential{% endif %}" - - "python3-dev{% if ansible_facts.os_family == 'RedHat' %}el{% endif %}" + name: "{{ packages | select | list }}" cache_valid_time: "{{ apt_cache_valid_time if ansible_facts.os_family == 'Debian' else omit }}" update_cache: "{{ True if ansible_facts.os_family == 'Debian' else omit }}" state: present become: true + vars: + packages: + - "{% if ansible_facts.os_family == 'RedHat' %}gcc{% else %}build-essential{% endif %}" + - "python3-dev{% if ansible_facts.os_family == 'RedHat' %}el{% endif %}" + - "{% if ansible_facts.os_family == 'Debian' %}python3-venv{% endif %}" - name: Ensure latest version of pip is installed pip: From 992263081b4831f7a4d8ba0728bd635f5c73da7b Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 15 Mar 2023 13:15:30 +0000 Subject: [PATCH 3/5] Add tags for Blazar and Caso images --- etc/kayobe/kolla/globals.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 67c5b1bb6..81c231d6d 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -9,9 +9,13 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts {% if kolla_base_distro == 'centos' %} bifrost_tag: xena-20230214T165534 +blazar_tag: xena-20230315T122920 +caso_tag: xena-20230315T122920 neutron_tag: xena-20230307T142413 {% else %} bifrost_tag: xena-20230215T195824 +blazar_tag: xena-20230315T122918 +caso_tag: xena-20230315T122918 keystone_tag: xena-20230308T120251 neutron_tag: xena-20230307T142414 {% endif %} From edf5c1a91d946f53da3269f3c26cfd61631e00c7 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 28 Feb 2023 16:05:28 +0100 Subject: [PATCH 4/5] Bump node exporter to 1.5.0 This fixes a crash seen on HPE DL385 nodes [1]: panic: "node_rapl_package-0-die-0_joules_total" is not a valid metric name [1] https://github.com/prometheus/node_exporter/issues/2299 --- etc/kayobe/kolla.yml | 2 +- .../notes/node-exporter-1.5.0-5e3764790a5a0190.yaml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/node-exporter-1.5.0-5e3764790a5a0190.yaml diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 5cf57682c..72404e9c6 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -362,7 +362,7 @@ kolla_build_args: haproxy_exporter_version: "0.13.0" memcached_exporter_version: "0.9.0" mysqld_exporter_version: "0.13.0" - node_exporter_version: "1.3.1" + node_exporter_version: "1.5.0" prometheus_version: "2.35.0" prometheus_alertmanager_version: "0.24.0" prometheus_cadvisor_sha256sum: "8e3df91eee70c72ac3f3184b9fab1229b037c2e850ff1593103b2bd9028c57c0" diff --git a/releasenotes/notes/node-exporter-1.5.0-5e3764790a5a0190.yaml b/releasenotes/notes/node-exporter-1.5.0-5e3764790a5a0190.yaml new file mode 100644 index 000000000..2683e94b4 --- /dev/null +++ b/releasenotes/notes/node-exporter-1.5.0-5e3764790a5a0190.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + Updates Prometheus Node exporter to version 1.5.0. +fixes: + - | + Fixes a `Prometheus Node exporter crash + `__ which may + affect nodes with AMD processors (first seen on HPE DL385). From ee98ed99bf52a8536934307cb5e8255e933ddc73 Mon Sep 17 00:00:00 2001 From: Dawud M <7688823+technowhizz@users.noreply.github.com> Date: Wed, 15 Mar 2023 17:06:00 +0000 Subject: [PATCH 5/5] Update node exporter container image tags --- etc/kayobe/kolla/globals.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 81c231d6d..64f9e9d25 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -12,12 +12,14 @@ bifrost_tag: xena-20230214T165534 blazar_tag: xena-20230315T122920 caso_tag: xena-20230315T122920 neutron_tag: xena-20230307T142413 +prometheus_node_exporter_tag: xena-20230310T170439 {% else %} bifrost_tag: xena-20230215T195824 blazar_tag: xena-20230315T122918 caso_tag: xena-20230315T122918 keystone_tag: xena-20230308T120251 neutron_tag: xena-20230307T142414 +prometheus_node_exporter_tag: xena-20230315T164024 {% endif %} glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"