aboutsummaryrefslogtreecommitdiff
path: root/docker/grafana
AgeCommit message (Collapse)AuthorFilesLines
2026-07-06Migrate to pyproject.tomlMichal Nasiadka3-51/+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-12-13Remove deprecated AngularJS plugins from GrafanaDawud1-1/+1
Change-Id: Id81ce23fed7c19211aa8b15abce185d990be8389
2024-11-15Add mechanism for patching files in containersMichal Arbet1-0/+2
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-06-28Change logic for plugins in grafana image buildDawud1-2/+5
Co-authored-by: Will Szumski <will@stackhpc.com> Change-Id: I2b1c95395aeefb2ccb1d8edf415eee0f98c52190
2023-08-21Fix missing grafana opensearch datasourceDawud1-1/+2
The grafana opensearch datasource was missing from the docker image. This commit installs the datasource plugin. Change-Id: Ia3a39c975abf815a66765f2f98c4789d6cec33d7
2023-01-18grafana: remove SHA1 workaroundMichal Nasiadka1-5/+0
Change-Id: I08fe2827bc58baa95d396daf28de1079e3df4f77
2022-12-06Remove monasca, kafka, storm and zookeeper.Michal Nasiadka1-2/+1
Monasca, kafka, storm and zookeeper have been removed in kolla-ansible [1],[2]. [1]: https://review.opendev.org/c/openstack/kolla-ansible/+/861392 [2]: https://review.opendev.org/c/openstack/kolla-ansible/+/865029 Change-Id: I0958a9353bc4585c4f65a1d316328a0e80b0b8b7
2022-09-27grafana: ignore SHA1 gpg key on CentOS Stream 9 (and family)Marcin Juszkiewicz1-0/+5
RHEL 9 refuses to use SHA1 gpg keys. Grafana team still did not handled key upgrade: https://github.com/grafana/grafana/issues/41036 Change-Id: Id963271103ce1397b7a5498d032e8f797edfcc70
2022-04-21grafana: drop check for not supported architecturesMarcin Juszkiewicz1-7/+0
Kolla supports only AArch64 and x86-64 so there is no need to check for other architectures. Change-Id: I44e45492bcbdd56a5c985ba84bad66202c9fde55
2022-04-11Adjust permissions on _extend_start files.Tim Shearer1-1/+1
Explicitly set the permissions on the kolla-toolbox kolla_extend_start file. Also, since all extend_start files are sourced rather than executed, the executable bits are now cleared throughout the project. Change-Id: I5c2deb4a2e33575d57c852089f856a9acc6818d0
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
2021-10-05Remove InfluxDB data source Grafana pluginPiotr Parczewski1-1/+0
Grafana has now native support for configuring Influxdb data sources. Plugin has been defunct anyway since Grafana requires it to be signed. Change-Id: I461f598bca6606f1d2939e385bb7befe2b792aa6
2021-04-27Install Monasca datasource plugin for GrafanaDoug Szumski1-1/+2
The Monasca Grafana image has been removed. This change provides a path for Monasca users to switch to using the vanilla Grafana image. Depends-On: I8f5a9b220fc8afd6ef07cb5f2142df8c6ead9bc0 Change-Id: I9db7ec2df050fa20317d84f6cea40d1f5fd42e60
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-03-01Add block labels to all DockerfilesChristian Berendt1-0/+2
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2019-11-29Enable repos only when neededMarcin Juszkiewicz1-0/+2
Disable external repositories by default and enable only when needed. Depends-on: https://review.opendev.org/696480 Implements: blueprint repos-off-by-default Change-Id: Icf2a8397a8349e0fe849d88d160409fd234480a9
2019-06-07grafana/aarch64: use package from upstream repositoriesMarcin Juszkiewicz1-17/+0
We were installing 5.2.4 version instead of just latest one like it is done on x86-64. Change-Id: If8434c6c05e415ac8d601260d02b25facbdef1f5
2019-04-30Add template override for grafana pluginsArnaud PARENT1-2/+7
Change-Id: I209c3c60d5c2edb6856e81eb374fbcad648e3904 Closes-Bug: #1827025
2019-01-17Use base_package_typeAlex Schultz1-1/+1
This change updates the docker files to use base_package_type instead of doing specific distro checks for the rhel/deb generic cases. The base_distro is still available and is used when a specific distro needs a customization but if the differences are purely rpm vs deb, then the base_package_type can be used. Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
2018-09-27grafana: on aarch64 use 5.2.4 version from upstreamMarcin Juszkiewicz1-1/+19
Upstream started building Grafana for arm64 a while ago. So let's use it instead of someone's build. Change-Id: Ia5359cd86022f2475301407d62a5ad4e1b275c13
2018-05-03Add Grafana repository for arm64Jorge Niedbalski1-1/+1
Official ARM support as part of the release process of grafana is on development [0]. For now, the closest official repositories are the ones from fg2it repository, which is also part of the developers working on the support, so we are adding it to the sources for now until the official support is done. [0] https://github.com/grafana/grafana-docker/issues/117 Bug: #1768585 Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org> Change-Id: Iba004f99c0ac92cb660e405c5ac9c61dc7fa81e2
2018-01-22Fix gnocchi plugin for grafanaKevin TIBI1-1/+1
gnocchixyz-gnocchi-datasource is the official plugin for grafana Change-Id: If5e0c8eb72d10b3f3eece4e006d8680a4a69e87f
2017-05-03Override image's meta info.Jawon Choo1-1/+1
centos based images have wrong label info, these changes fix own image's name and build-date. Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c Closes-Bug: #1680341
2017-04-20Merge "grafana: disable for non-x86"Jenkins1-0/+7
2017-04-20Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2Chen1-1/+1
Use LABEL instruction instead of MAINTAINER (deprecated) instruc- tion as suggested by Docker's official dockerfile guide. docs.docker.com/engine/reference/builder/#maintainer-deprecated Closes-Bug: #1683652 Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898
2017-04-19grafana: disable for non-x86Marcin Juszkiewicz1-0/+7
Kolla depends on upstream version of Grafana and those are provided only for x86-64 architecture. On other archs package from distribution can be fetched but build then fail due to version differences. And it does not look like there will be newer version in distributions: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835210 Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: I62911fd3cabdc25c23e93d621ebe2464f8e4fb6e
2017-04-04Install InfluxDB Plugin in GrafanaSayantani Goswami1-0/+1
InfluxDB plugin is missing in Grafana and is required to be installed to use InfluxDB as a data source in Grafana. Change-Id: I3d2e6eb4394eb9071ffb390235a06ef4e0682b55
2017-02-05Remove include_header and include_footer in all DockerfilesJeffrey Zhang1-1/+0
include_header and include_footer parameter is already removed, remove them in all Dockerfiles. Add missing footer block. Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2017-01-17use static uid/gid in imagesSam Yaple1-2/+3
This centralizes all user and group creation into a single source. This will fix any current and furture uid/gid mismatches (such as with nova-libvirt). In the process, we also unify users between the distros in a standard way. The users in the following containers change from thier defaults: Ubuntu: _chrony user is now chrony Ubuntu: memcache user is now memcached All: qemu user is used for ownership and socket permissions All uid and gid numbers are customizable via kolla-build.conf Co-Authored-By: Kris Lindgren <klindgren@godaddy.com> Change-Id: I120f26ab0683dc87d69727c3df8d4707e52a4543 Partially-Implements: blueprint static-uid-gid
2017-01-11Fix grafana containerzhubingbing1-0/+1
Add miss chmod 755 /usr/local/bin/kolla_extend_start in grafana Change-Id: I536bf73f8586a7159f9018dc581c4f0dc0d5b807 Closes-Bug: #1655588
2016-11-04change the mode for sudoers fileJeffrey Zhang1-3/+5
vmtp and grafana are configured in wrong. TrivialFix Change-Id: Ib7eab9ae6d433328772da450bb7a9b2a5e2554ee
2016-11-04Enable Gnocchi plugin in grafanaJeffrey Zhang1-1/+2
With this plugin, we can show the gnocchi data in grafana. TrivialFix Change-Id: Ib93ae79f1048566626f319063f4fcaec6f151a52
2016-10-06Remove unneeded blank linesMauricio Lima2-2/+0
TrivialFix Change-Id: I778d0a55adf1302c7a6f0702fec3a381d851f3df
2016-09-12Added grafana containerMathias Ewald3-0/+33
Added grafana repository to base image Co-Authored-By: zhubingbing <zhubingbing10@gmail.com> Installed grafana from repository Change-Id: Ib99195ec4522f185f6fd4cebf10e305bb58f69c4 Partially-Implements: Blueprint performance-monitoring