Skip to content

Commit 46ecb0a

Browse files
authored
Merge pull request #1520 from stackhpc/master-kolla-config
Revert monitoring Kolla config to upstream default
2 parents 6f0171e + d7b17b9 commit 46ecb0a

File tree

5 files changed

+11
-204
lines changed

5 files changed

+11
-204
lines changed

etc/kayobe/kolla/config/fluentd/output/00-local.conf

Lines changed: 0 additions & 85 deletions
This file was deleted.

etc/kayobe/kolla/config/fluentd/output/03-opensearch.conf

Lines changed: 0 additions & 51 deletions
This file was deleted.

etc/kayobe/kolla/config/prometheus/prometheus-blackbox-exporter.yml

Lines changed: 0 additions & 56 deletions
This file was deleted.

etc/kayobe/kolla/kolla-build.conf

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,3 @@ build_args = {{ (kolla_build_args | default({})).items() | map('join', ':') | jo
1414
type = git
1515
location = https://github.com/stackhpc/requirements
1616
reference = stackhpc/{{ openstack_release }}
17-
18-
[prometheus-v2-server]
19-
version = 2.54.1
20-
sha256 = amd64:31715ef65e8a898d0f97c8c08c03b6b9afe485ac84e1698bcfec90fc6e62924f,arm64:3d9946ca730f2679bbd63e9d40e559a0ba227a638d237e723af1a99bd7098263
21-
22-
[prometheus-blackbox-exporter]
23-
version = 0.25.0
24-
sha256 = amd64:c651ced6405c5e0cd292a400f47ae9b34f431f16c7bb098afbcd38f710144640,arm64:46ec5a54a41dc1ea8a8cecee637e117de4807d3b0976482a16596e82e79ac484
25-
26-
[prometheus-memcached-exporter]
27-
version = 0.14.4
28-
sha256 = amd64:e61b9f15959218a38c49b9ba919fca0a3e36e7edf9c607aabcf1ccbbd3b8cc59,arm64:9a28b57bd217e80acd1cdc86cef97e32058f3b2cce75f79baa13b42a27b7291a
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
features:
3+
- |
4+
Removed custom Kolla configuration files that have since been updated
5+
upstream.
6+
- |
7+
Removed Kolla build configuration pins to use versions from upstream.
8+
This change affects ``prometheus-v2-server`` (``2.54.1 -> 2.55.1``), and
9+
``prometheus-memcached-exporter`` (``0.14.4 -> 0.15.0``).
10+
``prometheus-blackbox-exporter`` has also been unpinned, but the version
11+
remains the same.

0 commit comments

Comments
 (0)