From d7b17b96b89f460efab4ac4c2b430ccfeab291ca Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Tue, 18 Feb 2025 10:38:36 +0000 Subject: [PATCH] Revert monitoring Kolla config to upstream default --- .../kolla/config/fluentd/output/00-local.conf | 85 ------------------- .../config/fluentd/output/03-opensearch.conf | 51 ----------- .../prometheus-blackbox-exporter.yml | 56 ------------ etc/kayobe/kolla/kolla-build.conf | 12 --- .../notes/pin-deps-c93f3c1d92ce2942.yaml | 11 +++ 5 files changed, 11 insertions(+), 204 deletions(-) delete mode 100644 etc/kayobe/kolla/config/fluentd/output/00-local.conf delete mode 100644 etc/kayobe/kolla/config/fluentd/output/03-opensearch.conf delete mode 100644 etc/kayobe/kolla/config/prometheus/prometheus-blackbox-exporter.yml create mode 100644 releasenotes/notes/pin-deps-c93f3c1d92ce2942.yaml diff --git a/etc/kayobe/kolla/config/fluentd/output/00-local.conf b/etc/kayobe/kolla/config/fluentd/output/00-local.conf deleted file mode 100644 index a00daa5c9..000000000 --- a/etc/kayobe/kolla/config/fluentd/output/00-local.conf +++ /dev/null @@ -1,85 +0,0 @@ -{% raw %} -{% for item in syslog_facilities | selectattr('enabled') %} - - @type copy - - @type file - path /var/log/kolla/{{ item.logdir }}/{{ item.logfile }} - append true - # Disable timestamp in filename for logs - - path /var/log/kolla/{{ item.logdir }}/{{ item.logfile }}.*.buffer - - - output_tag {{ item.output_tag | default(false) | lower }} - output_time {{ item.output_time | default(false) | lower }} - - -{% if log_direct_to_elasticsearch %} - - @type elasticsearch - host {{ elasticsearch_address }} - port {{ elasticsearch_port | default('9200') }} - scheme {{ fluentd_elasticsearch_scheme }} -{% if fluentd_elasticsearch_path != '' %} - path {{ fluentd_elasticsearch_path }} -{% endif %} -{% if fluentd_elasticsearch_scheme == 'https' %} - ssl_version {{ fluentd_elasticsearch_ssl_version }} - ssl_verify {{ fluentd_elasticsearch_ssl_verify }} -{% if fluentd_elasticsearch_cacert | length > 0 %} - ca_file {{ fluentd_elasticsearch_cacert }} -{% endif %} -{% endif %} -{% if fluentd_elasticsearch_user != '' and fluentd_elasticsearch_password != ''%} - user {{ fluentd_elasticsearch_user }} - password {{ fluentd_elasticsearch_password }} -{% endif %} - logstash_format true - logstash_prefix {{ opensearch_log_index_prefix }} - reconnect_on_error true - request_timeout {{ fluentd_elasticsearch_request_timeout }} - suppress_type_name true - - @type file - path /var/lib/fluentd/data/elasticsearch.buffer/{{ item.facility }}.* - flush_interval 15s - - -{% elif log_direct_to_opensearch %} - - @type opensearch - host {{ opensearch_address }} - port {{ opensearch_port }} - scheme {{ fluentd_opensearch_scheme }} -{% if fluentd_opensearch_path != '' %} - path {{ fluentd_opensearch_path }} -{% endif %} -{% if fluentd_opensearch_scheme == 'https' %} - ssl_version {{ fluentd_opensearch_ssl_version }} - ssl_verify {{ fluentd_opensearch_ssl_verify }} -{% if fluentd_opensearch_cacert | length > 0 %} - ca_file {{ fluentd_opensearch_cacert }} -{% endif %} -{% endif %} -{% if fluentd_opensearch_user != '' and fluentd_opensearch_password != ''%} - user {{ fluentd_opensearch_user }} - password {{ fluentd_opensearch_password }} -{% endif %} - logstash_format true - logstash_prefix {{ opensearch_log_index_prefix }} - reconnect_on_error true - request_timeout {{ fluentd_opensearch_request_timeout }} - suppress_type_name true - bulk_message_request_threshold 20M - - @type file - path /var/lib/fluentd/data/opensearch.buffer/{{ item.facility }}.* - flush_interval 15s - chunk_limit_size 8M - - -{% endif %} - -{% endfor %} -{% endraw %} diff --git a/etc/kayobe/kolla/config/fluentd/output/03-opensearch.conf b/etc/kayobe/kolla/config/fluentd/output/03-opensearch.conf deleted file mode 100644 index 9106c4175..000000000 --- a/etc/kayobe/kolla/config/fluentd/output/03-opensearch.conf +++ /dev/null @@ -1,51 +0,0 @@ -{% raw %} -{% if enable_caso | bool and inventory_hostname in groups['caso'] %} - - @type copy - - @type opensearch - host { opensearch_address }} - port {{ opensearch_port }} - logstash_format true - logstash_prefix apel - flush_interval 15s - - -{% endif %} - - - @type copy - - @type opensearch - host {{ opensearch_address }} - port {{ opensearch_port }} - scheme {{ fluentd_opensearch_scheme }} -{% if fluentd_opensearch_path != '' %} - path {{ fluentd_opensearch_path }} -{% endif %} -{% if fluentd_opensearch_scheme == 'https' %} - ssl_version {{ fluentd_opensearch_ssl_version }} - ssl_verify {{ fluentd_opensearch_ssl_verify }} -{% if fluentd_opensearch_cacert | length > 0 %} - ca_file {{ fluentd_opensearch_cacert }} -{% endif %} -{% endif %} -{% if fluentd_opensearch_user != '' and fluentd_opensearch_password != ''%} - user {{ fluentd_opensearch_user }} - password {{ fluentd_opensearch_password }} -{% endif %} - logstash_format true - logstash_prefix {{ opensearch_log_index_prefix }} - reconnect_on_error true - request_timeout {{ fluentd_opensearch_request_timeout }} - suppress_type_name true - bulk_message_request_threshold 20M - - @type file - path /var/lib/fluentd/data/opensearch.buffer/openstack.* - flush_interval 15s - chunk_limit_size 8M - - - -{% endraw %} diff --git a/etc/kayobe/kolla/config/prometheus/prometheus-blackbox-exporter.yml b/etc/kayobe/kolla/config/prometheus/prometheus-blackbox-exporter.yml deleted file mode 100644 index f4cf32737..000000000 --- a/etc/kayobe/kolla/config/prometheus/prometheus-blackbox-exporter.yml +++ /dev/null @@ -1,56 +0,0 @@ -# yamllint disable-file -modules: - http_2xx: - prober: http - os_endpoint: - prober: http - http: - valid_status_codes: [200,300] - headers: - Content-Type: application/json - fail_if_body_not_matches_regexp: - - "versions" - http_post_2xx: - prober: http - http: - method: POST - tcp_connect: - prober: tcp - tls_connect: - prober: tcp - tcp: - tls: true - ssh_banner: - prober: tcp - tcp: - query_response: - - expect: "^SSH-2.0-" - icmp: - prober: icmp - http_2xx_opensearch_dashboards: - prober: http - timeout: 5s - http: - basic_auth: -{% raw %} - username: {{ opensearch_dashboards_user }} - password: {{ opensearch_dashboards_password }} -{% endraw %} - http_2xx_prometheus: - prober: http - timeout: 5s - http: - basic_auth: -{% raw %} - username: admin - password: {{ prometheus_password }} -{% endraw %} - http_2xx_alertmanager: - prober: http - timeout: 5s - http: - basic_auth: -{% raw %} - username: {{ prometheus_alertmanager_user }} - password: {{ prometheus_alertmanager_password }} -{% endraw %} diff --git a/etc/kayobe/kolla/kolla-build.conf b/etc/kayobe/kolla/kolla-build.conf index db9caaa5d..c2cc7efa0 100644 --- a/etc/kayobe/kolla/kolla-build.conf +++ b/etc/kayobe/kolla/kolla-build.conf @@ -14,15 +14,3 @@ build_args = {{ (kolla_build_args | default({})).items() | map('join', ':') | jo type = git location = https://github.com/stackhpc/requirements reference = stackhpc/{{ openstack_release }} - -[prometheus-v2-server] -version = 2.54.1 -sha256 = amd64:31715ef65e8a898d0f97c8c08c03b6b9afe485ac84e1698bcfec90fc6e62924f,arm64:3d9946ca730f2679bbd63e9d40e559a0ba227a638d237e723af1a99bd7098263 - -[prometheus-blackbox-exporter] -version = 0.25.0 -sha256 = amd64:c651ced6405c5e0cd292a400f47ae9b34f431f16c7bb098afbcd38f710144640,arm64:46ec5a54a41dc1ea8a8cecee637e117de4807d3b0976482a16596e82e79ac484 - -[prometheus-memcached-exporter] -version = 0.14.4 -sha256 = amd64:e61b9f15959218a38c49b9ba919fca0a3e36e7edf9c607aabcf1ccbbd3b8cc59,arm64:9a28b57bd217e80acd1cdc86cef97e32058f3b2cce75f79baa13b42a27b7291a diff --git a/releasenotes/notes/pin-deps-c93f3c1d92ce2942.yaml b/releasenotes/notes/pin-deps-c93f3c1d92ce2942.yaml new file mode 100644 index 000000000..e2e072c65 --- /dev/null +++ b/releasenotes/notes/pin-deps-c93f3c1d92ce2942.yaml @@ -0,0 +1,11 @@ +--- +features: + - | + Removed custom Kolla configuration files that have since been updated + upstream. + - | + Removed Kolla build configuration pins to use versions from upstream. + This change affects ``prometheus-v2-server`` (``2.54.1 -> 2.55.1``), and + ``prometheus-memcached-exporter`` (``0.14.4 -> 0.15.0``). + ``prometheus-blackbox-exporter`` has also been unpinned, but the version + remains the same.