Commit Graph

30 Commits

Author SHA1 Message Date
Dawud a97a561bab Fix missing grafana opensearch datasource
The grafana opensearch datasource was missing from the docker image.
This commit installs the datasource plugin.

Change-Id: Ia3a39c975abf815a66765f2f98c4789d6cec33d7
2023-08-21 16:26:10 +00:00
Michal Nasiadka 47a9a81859 grafana: remove SHA1 workaround
Change-Id: I08fe2827bc58baa95d396daf28de1079e3df4f77
2023-01-18 07:39:30 +01:00
Michal Nasiadka 52a53927f5 Remove monasca, kafka, storm and zookeeper.
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-12-06 12:58:10 +00:00
Marcin Juszkiewicz 542bbcdb6b grafana: ignore SHA1 gpg key on CentOS Stream 9 (and family)
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-09-27 08:17:15 +00:00
Marcin Juszkiewicz 86361d0831 grafana: drop check for not supported architectures
Kolla supports only AArch64 and x86-64 so there is no need to check for
other architectures.

Change-Id: I44e45492bcbdd56a5c985ba84bad66202c9fde55
2022-04-21 18:53:25 +00:00
Tim Shearer 1d96a2bbe1 Adjust permissions on _extend_start files.
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-11 17:22:24 +02:00
Marcin Juszkiewicz a1510870e8 drop infra_image_prefix
We have one install_type only now so that infra stuff is not needed
anymore.

Change-Id: I60d50ba7699d46d001eaef365fb84b0ce8e9b262
2022-04-11 06:22:21 +00:00
Piotr Parczewski 8c092ac5c6 Remove InfluxDB data source Grafana plugin
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-10-05 19:58:38 +02:00
Doug Szumski e8533795d4 Install Monasca datasource plugin for Grafana
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
2021-04-27 09:40:08 +01:00
Marcin Juszkiewicz 90adc2b851 introduce 'infra_image_prefix' for infra images
Defaults to 'image_prefix' for now but shows which images gets their
names changed soon.

Change-Id: I0608e8f62f28d6667b4c8753c47553e4cbf75503
2020-07-09 23:31:42 +02:00
Christian Berendt 861f55fbfd Add block labels to all Dockerfiles
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2020-03-01 17:25:58 +00:00
Marcin Juszkiewicz cf11cd6f3d Enable repos only when needed
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-11-29 11:38:06 +01:00
Marcin Juszkiewicz 1e7a78932d grafana/aarch64: use package from upstream repositories
We were installing 5.2.4 version instead of just latest one like it is
done on x86-64.

Change-Id: If8434c6c05e415ac8d601260d02b25facbdef1f5
2019-06-07 17:54:13 +02:00
Arnaud PARENT a873677392 Add template override for grafana plugins
Change-Id: I209c3c60d5c2edb6856e81eb374fbcad648e3904
Closes-Bug: #1827025
2019-04-30 11:57:53 +00:00
Alex Schultz ae1322ec10 Use base_package_type
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
2019-01-17 08:23:41 -07:00
Marcin Juszkiewicz 1367a1f35d grafana: on aarch64 use 5.2.4 version from upstream
Upstream started building Grafana for arm64 a while ago. So let's use it
instead of someone's build.

Change-Id: Ia5359cd86022f2475301407d62a5ad4e1b275c13
2018-09-27 18:45:31 +02:00
Jorge Niedbalski bfa0fe778f Add Grafana repository for arm64
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-05-03 16:59:43 +02:00
Kevin TIBI c94b6fc306 Fix gnocchi plugin for grafana
gnocchixyz-gnocchi-datasource is the official plugin for grafana

Change-Id: If5e0c8eb72d10b3f3eece4e006d8680a4a69e87f
2018-01-22 15:27:55 +01:00
Jawon Choo 31259fa595 Override image's meta info.
centos based images have wrong label info,
these changes fix own image's name and build-date.

Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c
Closes-Bug: #1680341
2017-05-03 11:08:17 +09:00
Jenkins e3312a58e5 Merge "grafana: disable for non-x86" 2017-04-20 13:04:29 +00:00
Chen 8c463a47a9 Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2
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-20 16:50:05 +09:00
Marcin Juszkiewicz f0aaa45fd7 grafana: disable for non-x86
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-19 11:18:31 +02:00
Sayantani Goswami 56137d0da1 Install InfluxDB Plugin in Grafana
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-04-04 01:55:33 +00:00
Jeffrey Zhang e5903d5fa9 Remove include_header and include_footer in all Dockerfiles
include_header and include_footer parameter is already removed, remove
them in all Dockerfiles.
Add missing footer block.

Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2017-02-05 10:44:48 +08:00
Sam Yaple 58eee09c15 use static uid/gid in images
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-17 09:02:21 -03:00
zhubingbing 7461c9d74f Fix grafana container
Add miss chmod 755 /usr/local/bin/kolla_extend_start in grafana

Change-Id: I536bf73f8586a7159f9018dc581c4f0dc0d5b807
Closes-Bug: #1655588
2017-01-11 09:45:46 +00:00
Jeffrey Zhang 69f980b86d change the mode for sudoers file
vmtp and grafana are configured in wrong.

TrivialFix

Change-Id: Ib7eab9ae6d433328772da450bb7a9b2a5e2554ee
2016-11-04 21:35:56 +08:00
Jeffrey Zhang bbb6ad1b3f Enable Gnocchi plugin in grafana
With this plugin, we can show the gnocchi data in grafana.

TrivialFix
Change-Id: Ib93ae79f1048566626f319063f4fcaec6f151a52
2016-11-04 07:19:10 +00:00
Mauricio Lima 18785f416c Remove unneeded blank lines
TrivialFix

Change-Id: I778d0a55adf1302c7a6f0702fec3a381d851f3df
2016-10-06 12:42:27 -03:00
Mathias Ewald 6417595b9f Added grafana container
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
2016-09-12 08:03:39 +00:00