aboutsummaryrefslogtreecommitdiff
path: root/docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2
AgeCommit message (Collapse)AuthorFilesLines
2026-07-06Migrate to pyproject.tomlMichal Nasiadka1-22/+0
[tool.setuptools.data-files] does not support recursive directory installation. The old setup.cfg [files] worked because PBR's FilesConfig.expand_globs() used os.walk() to expand docker/*, but this hook is not triggered by the pbr.build PEP-517 backend. Move docker/ into kolla/ and use [tool.setuptools.package-data] instead. Update kolla_worker._get_images_dir() to check the kolla package directory first so both editable and regular installs work. Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
2026-06-24kolla-build: fix build-date LABEL invalidating Docker layer cacheMichal Nasiadka1-1/+1
The build-date label was rendered into a LABEL instruction on line 3 of every Dockerfile template, immediately after FROM. Because Docker invalidates the cache for a changed instruction and all subsequent layers, a date change caused a full rebuild of every image on each new calendar day, even when nothing else had changed. Fix this by removing build-date from the Dockerfile templates and applying it as a --label argument at build time via image.labels. Labels passed on the build command line are not part of the Dockerfile cache key, so the date is still recorded in the image metadata without affecting layer caching. Change-Id: I8ef0d85bab1a999a4d09f7cbf0c088ca00fdcf77 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
2024-11-15Add mechanism for patching files in containersMichal Arbet1-0/+4
This patch adds a way to patch files in a Docker image built by Kolla. This is very useful for several reasons, specifically: - Custom modifications - The stable branch of some library has a fix but no pip package has been released - Eliminates the need to package your own pip packages - Eliminates the need to invent your own versioning to prevent upstream versioning - Eliminates the need to manage a pip server - In other words, it eliminates the need to get a wheel into the image and install it manually using any method not previously mentioned It is also highly desirable because, although Kolla can replace the source for a service with a custom URL for a tarball or its own Git repo, it cannot do this for dependencies pulled from pip. I would also like to point out that this is a feature with its own code path and works only if the user "inserts" a patch into the folder patches/docker-image/something.patch and creates an analogous series file for patch source code. Simply said, this code will never interfere with the upstream build process since this feature is not intended for use in upstream. It is rather meant for downstream users who know what they are doing. Now they just have an option to patch their images. Everything works on all layers of the Docker image and stores a report of applied patches which can then be seen in /etc. This mechanism is similar as debian patch quilt. Change-Id: I61d0790c5d4d070b7ea9e8c99c0a76ff5d22bf9d
2024-02-21Move curl sources to sources.pyMichal Nasiadka1-9/+4
Move most curl sources to sources.py, so it can be automatically updated in future. This also makes overriding the versions/locations/sha256 easier. Change-Id: Ib3497fe96162ae190e5c113cacaaa3ef8334f590
2022-06-22Bump prometheus-openstack-exporter version to 1.6.0Pierre Riteau1-5/+5
Change-Id: I4bd581c3ea422e1c9a075a71721413d47fdbdfe4 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/828902
2022-04-11drop infra_image_prefixMarcin Juszkiewicz1-1/+1
We have one install_type only now so that infra stuff is not needed anymore. Change-Id: I60d50ba7699d46d001eaef365fb84b0ce8e9b262
2022-03-11Unify curl use (customisation options)Maksim Malchuk1-2/+3
This change adds and unifies an ability to override hardcoded URLs for air-gapped environments via the usual blocks mechanism. Also, this change replaces ENV with ARG instruction for the variables used only in building images, and uses bash variable expansion where it possible. This change is a continuation of the I46b77978926fc2b578a68d1aaa944b2198af0685 Change-Id: I1fbad333b1bc95484e6f4c5145d5936a0e2db84f Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
2021-03-04Revert "Fix error when github return 302"Michal Nasiadka1-1/+1
This reverts commit 61def281d077f88051d1b1a14dfdbfabac036c8c. Reason for revert: --location was already in curlrc and it was unified in change I46b77978926fc2b578a68d1aaa944b2198af0685 Change-Id: I066d747400ede30037ff324ad55430af7c35dc18
2021-03-02Fix error when github return 302Sergei Chekanov1-1/+1
-L for curl: If the server reports that the requested page has moved to a different location (indicated with a Location: header and a 3XX response code), this option will make curl redo the request on the new place It fixes build error for me: INFO:kolla.common.utils.prometheus-v2-server: ---> Running in 693fd4095c77 INFO:kolla.common.utils.prometheus-v2-server:curl (https://github.com/prometheus/prometheus/releases/download/v2.23.0/prometheus-2.23.0.linux-amd64.tar.gz): response: 302, time: 0.166583, size: 640 INFO:kolla.common.utils.prometheus-v2-server: INFO:kolla.common.utils.prometheus-v2-server:gzip: stdin: not in gzip format INFO:kolla.common.utils.prometheus-v2-server: INFO:kolla.common.utils.prometheus-v2-server:tar: Child returned status 1 INFO:kolla.common.utils.prometheus-v2-server:tar: Error is not recoverable: exiting now Change-Id: I095ca6f34cc7c7bca485e9ec019cc52aeb8e3ff4
2020-12-17Bump prometheus-openstack-exporter version to 1.3.0Jorge Niedbalski1-1/+1
Change-Id: Ie54703e6ecf6a3332ef6f769fa500091068ea155 Signed-off-by: Jorge Niedbalski <jnr@metaklass.org>
2020-12-02Unify curl optionsMichał Nasiadka1-1/+1
Currently we use couple of curl options throughout Dockerfiles, this change adds all common options to curlrc (-sSLf) and removes usage of those in Dockerfiles. Change-Id: I46b77978926fc2b578a68d1aaa944b2198af0685
2020-11-03Bump up openstack exporter to 1.2.0Michal Nasiadka1-1/+1
Change-Id: I19edf083c2f96098773d1198796e60cb8679eb4d
2020-07-09introduce 'infra_image_prefix' for infra imagesMarcin Juszkiewicz1-1/+1
Defaults to 'image_prefix' for now but shows which images gets their names changed soon. Change-Id: I0608e8f62f28d6667b4c8753c47553e4cbf75503
2020-07-02Bump prometheus-openstack-exporter version to 1.1.0Jorge Niedbalski1-1/+1
Change-Id: Ia2306507d6ef97f01ff520dc4222bc48c1eb9843 Signed-off-by: Jorge Niedbalski <jnr@metaklass.org>
2020-03-27Bump prometheus_openstack_exporter to 1.0.0Jorge Niedbalski1-1/+1
v1.0.0 has been released, use that release as a base for prometheus_openstack_exporter. Change-Id: I6b8bb18633fd277f3ab46788fa76bb4af67f5942 Signed-off-by: Jorge Niedbalski <jnr@metaklass.org>
2020-03-01Add block labels to all DockerfilesChristian Berendt1-0/+2
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2019-10-18Bump Openstack Exporter version to 0.6.0Keith Plant1-1/+1
There appears to be a bug in the prometheus openstack exporter versions <= 0.2.1 causing cinder data to stop being collected after about 24 hours. Bumping to latest stable version 0.6.0. Change-Id: Iccaf4c0bb79e7e33072e37aa83711b37938d6719 Signed-off-by: Keith Plant <kplantjr@gmail.com>
2019-08-05[docker/openstack-exporter] Bump to 0.2.1 versionJorge Niedbalski1-1/+1
Bump the default version to 0.2.1 of the openstack-exporter. Change-Id: I6e893c25a9dfbbbac6bd69f2fa26e6c72a4154d7 Signed-off-by: Jorge Niedbalski <jnr@metaklass.org>
2019-06-25[prometheus/openstack-exporter] Changed repository location and version.Jorge Niedbalski1-2/+2
Version 0.0.9 has been released, also the default organization has been changed to its own org[0]. [0] https://github.com/openstack-exporter/openstack-exporter Change-Id: Ib82810a8d33dd91d28537058e873724a22067103 Signed-off-by: Jorge Niedbalski <niedbalski@gmail.com>
2019-03-11[docker/prometheus] Bump openstack-exporter version.Jorge Niedbalski1-1/+1
This commit bumps the prometheus-openstack-exporter version to the latest release 0.0.7. Change-Id: I4244f15d4eae4bc670cb2158ecf072781fd4c2ac Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org>
2019-02-19debian/ubuntu: introduce 'debian_arch' variableMarcin Juszkiewicz1-1/+1
Many images have 'if x86_64 then amd64 elif aarch64 then arm64' check to comply with Debian like architecture names in several projects. This patch creates 'debian_arch' variable which can be used in all Docker files (similar to 'base_arch' one). All required images got converted to use it. Change-Id: I9c5e6f13d6c9b24fe323408512bd5aef290111ad
2019-01-21[prometheus] Bump openstack-exporter version.Jorge Niedbalski1-1/+1
This commit bumps the prometheus-openstack-exporter version to the latest release 0.0.5. Change-Id: I8cd77c4973722cd7622ffc7a1833c6ed76ffd630 Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org>
2019-01-10[prometheus] Added openstack-exporter base image.Jorge Niedbalski1-0/+20
This commit adds the base image for openstack-exporter [0]. The selected exporter is released for amd64 and arm64 architectures. [0] https://github.com/Linaro/openstack-exporter Change-Id: Ic785711421c6af9d3e7c67f01c57c660501fbcee Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org>
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 19:26:14 +0000