aboutsummaryrefslogtreecommitdiff
path: root/docker/monasca
AgeCommit message (Collapse)AuthorFilesLines
2022-12-06Remove monasca, kafka, storm and zookeeper.Michal Nasiadka10-391/+0
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-10-10Fix writable rootwrap/privsep configRadosław Piliszek1-2/+1
Fixes a hypothetical security issue related to privilege escalation via rootwrap/privsep. A potential vulnerable service could previously allow writes to its rootwrap/privsep config and thus allow for more commands to be run with root privileges via rootwrap/privsep. For a succesful attack, this would also require the service to allow to run arbitrary commands via rootwrap/privsep. Thus far, no such vulnerabilities have been reported and thus this fix is simply strengthening the container images against such an issue in the future. Change-Id: I92c81c77e6a16570a108cde8031f7977930fb02a Closes-Bug: #1874298
2022-04-22Merge "adjust permissions on _extend_start files (part II)"Zuul1-1/+1
2022-04-22Merge "monasca-thresh: drop special handling for Ubuntu"Zuul1-6/+0
2022-04-22adjust permissions on _extend_start files (part II)Marcin Juszkiewicz1-1/+1
Tim Shearer started it in 1d96a2bbe1b536b7d7f4cdbf55c6dabae6d058ae. Since all extend_start files are sourced rather than executed, the executable bits are now cleared throughout the project. Change-Id: Ia1797c32fc6a35f9f077c673abf4d8e16e51a760
2022-04-21monasca-thresh: drop special handling for UbuntuMarcin Juszkiewicz1-6/+0
Bug mentioned in Dockerfile was fixed about 4 years ago. Change-Id: I6d90e6673b01756e7de7c8eeb29423cee0cce6f7
2022-04-21flatten images a bitMarcin Juszkiewicz1-4/+4
As we have one type of images now some RUN calls could be merged so we will have less layers in resulting images. Change-Id: I5178c58fbd8c65efe825dc249c0f1368ef0fe8e0
2022-04-11Adjust permissions on _extend_start files.Tim Shearer2-2/+2
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 add_binary_source_envs() macroMarcin Juszkiewicz1-1/+0
With binary install type dropped there is no need for this macro. Change-Id: I7bdd29eb48a23faa04a98e785129d97258f05e64
2022-04-11Merge "docker: drop binary parts"Zuul6-71/+15
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-04-09docker: drop binary partsMarcin Juszkiewicz6-71/+15
Big patch drops all mentions of binary images support. Suggestions are welcome how to split it into parts or handle better. Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
2021-10-02Clean MariaDB/MySQLRadosław Piliszek1-2/+0
We are just overinstalling these. PyMySQL is enough nowadays. Change-Id: I074d9d13f52c208c0f3d92ea060b3b9abb6a6b9e
2021-08-05monasca-thresh: Allow topology check and removal in stormScott Shambarger3-1/+103
Patch adds a script in the monasca-thresh image that can be used to check if a topology exists in Storm, and optionally kill it. This is part of a bug in kolla-ansible where topologies were not submitted to Storm, but run locally. This patch includes a topology check script enabled by KOLLA_BOOTSTRAP which will exit kolla_start if the topology exists, and optionally enables topology removal (to allow replacement) enabled by TOPOLOGY_REPLACE. Topology names and various timeouts may be customized. If the new env variables are not set, existing behavior is unchanged. Partial-Bug: #1808805 Change-Id: If8f0730031435dda4235b7f2d2c23e5f5f767f87
2021-05-17Drop monasca-grafana image.Marcin Juszkiewicz3-113/+0
After months of using deprecated components image finally stopped building. Change-Id: I8f5a9b220fc8afd6ef07cb5f2142df8c6ead9bc0
2021-01-12Add a storm-base imageMark Goddard1-3/+1
Refactor storm image dependencies. Previously we had: base -> storm -> monasca-thresh Both storm and monasca-thresh images are final, and each includes a footer. This causes issues when the footer expects to be at the end of the image, or there to be only a single footer. In particular, since I2592a736206eaec811290e9fbdbf2540c0518ffe, the footer used in CI jobs reverts to the public package mirrors. This change introduces a storm-base image, and refactors the dependency chain: base -> storm-base -> storm base -> storm-base -> monasca-thresh Related-Bug: #1902101 Change-Id: I53e8ba8d4baa4434cf3c49ed94d1f7cb44099bee
2020-12-21Fix build of monasca-grafanaMichal Arbet1-12/+13
This patch is adding libffi-dev to build_packages for Debian/Ubuntu which is fixing monasca-grafana build. Change-Id: I67f93687d70f1c8c92719857cbf74971d9a17ae6
2020-12-02Unify curl optionsMichał Nasiadka1-2/+2
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-09-21create 'add_binary_source_envs' macro and use itMarcin Juszkiewicz1-0/+1
There is small subset of images where we need to know which install_type or install_metatype is used. So add them only there (and their children). Change-Id: Ib7d5e36b958d6c8daf2989df32e29fa24b46c62a Implements: blueprint infra-images
2020-08-10Merge "Refactor httpd install to base image"Zuul1-14/+1
2020-08-10Refactor httpd install to base imageJames Kirsch1-14/+1
Refactor installing and initial setup of httpd and mod wsgi from individual services to base image. Change-Id: I651a55a9ebe258ef403d33de010a4dfb368a4021
2020-08-05Install Monasca plugin for Grafana by defaultIsaac Prior1-0/+15
Change-Id: I472af9ec8cee3462beb5aca04ea6171b79933abe Co-Authored-By: Bartosz Bezak <bartosz@stackhpc.com>
2020-07-09introduce 'infra_image_prefix' for infra imagesMarcin Juszkiewicz2-2/+2
Defaults to 'image_prefix' for now but shows which images gets their names changed soon. Change-Id: I0608e8f62f28d6667b4c8753c47553e4cbf75503
2020-05-14Remove Monasca Log APIDoug Szumski2-49/+0
Monasca, since the Train release has supported a unified API for both logs and metrics. The Log API is no longer required. Change-Id: I5a59a84b00a1770bfaf7257295e82bb5b92df029
2020-05-04Use Python 3 for mod_wsgi in cyborg and monasca on Debian/UbuntuMark Goddard1-1/+1
In Train kolla switched to Python 3 in Debian and Ubuntu source images. For services running under httpd with mod_wsgi, they should install libapache2-mod-wsgi-py3 rather than libapache2-mod-wsgi. This was done for most images, but cyborg and monasca were omitted. This change fixes that. Change-Id: I25cfa62dbf20490685617b4a4185bf95ab91725e Closes-Bug: #1873421
2020-04-15Remove support for CentOS 7Marcin Juszkiewicz2-8/+2
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images so there is no need for checking which Python version (2.x or 3.x) is used inside of containers. We also no longer have to support yum as a value for distro_package_manager. Partially-Implements: blueprint centos-rhel-8 Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
2020-03-01Add block labels to all DockerfilesChristian Berendt8-0/+16
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
2019-12-17Fix monasca-grafana being unbuildable due to old npmRadosław Piliszek1-1/+6
Affected builds on Ubuntu which had: npm 3.5.2 while the latest was: npm 6.13.4 And CentOS had: npm 5.6.0 This patch runs npm update via npm. Pinned to 6.x. Additionally, this moves npm packages prefix (root) to /usr/local to avoid conflicts with native packages. Change-Id: Ibaacc1cc478b2b2f8196a5da4eea3570d7d310ff Closes-bug: #1856699
2019-12-11Refactor Apache httpd setupMark Goddard2-22/+4
All Apache httpd setup has been moved to a new helper script, kolla_httpd_setup. This includes the existing clean of /run/httpd, /var/run/httpd, /tmp/httpd etc. Horizon has an additional bit of Apache config for Debian/binary, which has been kept in extend_start.sh for horizon. Change-Id: Ia2af74b69c151db0bd7e452460b0babcee50b282 Related: blueprint centos-rhel-8
2019-10-02Merge "monasca: add 'monasca-common' to base"Zuul1-0/+1
2019-10-02monasca: add 'monasca-common' to baseMarcin Juszkiewicz1-0/+1
'monasca-common' is used by several monasca images: - agent - api - log-api - notification - persister So build it once. Change-Id: I33fbc77562d3806695345ffd7504ef3385f7564a
2019-09-27Fix monasca-grafana - pin rake to <13Mark Goddard1-1/+3
Rake 13.0.0 (released today) depends on Ruby 2.2, but CentOS 7 only provides Ruby 2.0. This change pins rake in the monasca-grafana image to versions earlier than 13.0.0. Change-Id: Id9a76f459aff016fbc920370c0a3ec58e0397fcb Closes-Bug: #1845647
2019-08-13Merge "Ensures monasca-thresh data and worker dirs exist and are empty on ↵Zuul1-1/+30
start up"
2019-08-09Ensures monasca-thresh data and worker dirs exist and are empty on start upIsaac Prior1-1/+30
This prevents the filesystem from filling up with Apache Storm temporary files which will otherwise not be cleared. Change-Id: Ib07e32f4e67e500f10986103d781dfd3874ffdd2 Partial-Bug: #1839149
2019-08-07Merge "Change monasca-grafana source branch to use grafana v4.2.0 with ↵Zuul1-1/+1
keystone changes"
2019-07-30Add prometheus_client to monasca-agent imagePierre Riteau1-1/+2
The prometheus_client package is required to use the Prometheus plugin. It makes sense to include this dependency by default since Kolla Ansible can deploy many Prometheus exporters, making it easy to scrape their metrics and store them in Monasca. The increase in size of the container image is negligible. Change-Id: I9b0a162513ed436930c4541b758fc9cb2ef97e96
2019-07-25Change monasca-grafana source branch to use grafana v4.2.0Isaac Prior1-1/+1
with keystone changes Change-Id: I0aa375ff4b26a3216839d69dff8e843584a3ecee
2019-07-19There is no Java 8 in Debian 'buster' (part 3)Marcin Juszkiewicz1-1/+1
Good to have proper Java version. Better is when JAVA_HOME is also adjusted to point to proper directory. And to have it set proper way. Change-Id: I0f83c3498028135751b0b887665d009e5e19410f
2019-07-16There is no Java 8 in Debian 'buster' (part 2)Marcin Juszkiewicz1-1/+8
Debian 'buster' release contains Java 11 only. So opendaylight and monasca-thresh images needed adjustments. Change-Id: I78f8be44436b8c8e5f58fea40a762c17e6b510a8
2019-06-03create missing apache2 directory on Debian/UbuntuMarcin Juszkiewicz2-0/+2
Ubuntu/source deployment of several images (horizon, placement-api, zun) failed with: + exec /usr/sbin/apache2 -DFOREGROUND apache2: Syntax error on line 80 of /etc/apache2/apache2.conf: DefaultRuntimeDir must be a valid directory, absolute or relative to ServerRoot Change-Id: Ie2a1077f7def0743f1403341985e2109aa490026
2019-03-21Merge "monasca, tempest: install librdkafka-dev to get it built for ↵Zuul1-0/+1
non-x86/source"
2019-03-20monasca, tempest: install librdkafka-dev to get it built for non-x86/sourceMarcin Juszkiewicz1-0/+1
fixes build issue under Debian:buster on AArch64: In file included from confluent_kafka/src/confluent_kafka.c:17: confluent_kafka/src/confluent_kafka.h:22:10: fatal error: librdkafka/rdkafka.h: No such file or directory #include <librdkafka/rdkafka.h> ^~~~~~~~~~~~~~~~~~~~~~ compilation terminated. error: command 'aarch64-linux-gnu-gcc' failed with exit status 1 Under Ubuntu it is still broken because librdkafka is too old. Change-Id: I1e54645ea5805f985c9bd04f9936ea3edbebfd31
2019-03-12Add python3 packages for RHEL systemsAlex Schultz1-1/+5
RDO is currently working on python3 support for the next version of CentOS/RHEL based systems. This package uses the distro_python3 flag that was added as part of I4028991bad92c0e8e21066cc4173c06ce5eba393 to use the python3 specific package names. This change only adds python3 package names for RHEL systems. Conflicts-With: https://review.openstack.org/#/c/636457/ Change-Id: Iad6b70b433a0dd1b0f8ae6790fd280594517661a Related-Blueprint: python3-support
2019-02-19debian/ubuntu: introduce 'debian_arch' variableMarcin Juszkiewicz1-9/+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-30Fix broken xtrabackup and monasca-grafana imagesMartin André1-1/+1
Percona started signing packages with a new public GPG key, without providing it via HTTPS. Ship the PERCONA-PACKAGING-KEY extracted from the percona-release package. https://jira.percona.com/browse/PT-1685 monasca-grafana broken by 'rake' missing when trying to install the 'fpm' gem. Co-Authored-By: Mark Goddard <mark@stackhpc.com> Change-Id: Ica9867448dc20864f2fd4614a295a23a4a625af4 Closes-Bug: #1813906 Closes-Bug: #1813927
2019-01-17Use base_package_typeAlex Schultz4-10/+10
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-11-07Add Monasca Grafana imageDoug Szumski3-0/+90
This provides support for building the Monasca fork of Grafana which features Keystone integration. It is primarily for use with the Monasca Grafana datasource, although other datasources can be installed if required. In the future it would be more efficient to build and host the packages externally. Implements: blueprint monasca-grafana Change-Id: I6cb175868d1993ae31700de36b721f4833c4164b
2018-10-02Fix potential Monasca-thresh start failureDoug Szumski2-0/+20
Monasca-thresh inherits from the Storm container, but we want it to write logs to the Monasca logs directory. In this commit we overwrite the script which configures the Storm log directory with the Monasca script. Change-Id: Id961134e424117ebefb088021faaf37fa02757d7 Partially-Implements: blueprint monasca-containers
2018-09-20Add monasca user to Monasca thresh containerDoug Szumski1-0/+2
The monasca-thresh container is special in that inherits from the Storm container so that it has access to the Storm client. We could make monasca-base inherit from Storm, but it would bloat the other Monasca images which may not run on the same nodes as the Storm topology. Partially-Implements: blueprint monasca-containers Change-Id: Idd1703b72e45bb9d124e06a28738b18da0bc6918
2018-09-19Use alembic migrations to deploy Monasca DBDoug Szumski1-9/+1
Support has recently been added for managing the Monasca DB with alembic. This change takes advantage of that. Partially-Implements: blueprint monasca-containers Change-Id: I89084ac0076eff099e567b32de249df9f0115e82
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 23:50:22 +0000