summaryrefslogtreecommitdiff
path: root/docker/monasca
AgeCommit message (Collapse)AuthorFilesLines
2021-01-23Add 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 (cherry picked from commit 93204ecfeca7ba394bd4c3872147357aa708f46e)
2021-01-22CI: Use Docker proxy for pulls + Ruby fixesMichał Nasiadka1-1/+2
For Train (due to CentOS 7) includes as well: - sensu-client: Pin simpleidn Ruby gem simpleidn Ruby gem started requiring Ruby 2.2. - monasca-grafana: Pin git Ruby gem fpm Ruby gem started requiring git Ruby gem git Ruby gem started requiring Ruby 2.3 Change-Id: I0c4d5e1ea16c6677813a334b38b3a22ad811531d Co-Authored-By: Radosław Piliszek <radoslaw.piliszek@gmail.com> Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/772077 (cherry picked from commit a8c12def858b57349207cab5fa8dabb3c23bdfa0)
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 (cherry picked from commit 88d48953357c67de14ff83f0361825b05fc71a07)
2020-06-08Fix multiple issuesMark Goddard1-1/+2
Both issues affect Train and earlier releases. 1. Fix monasca-grafana by pinning more Ruby gems childprocess 3.0.0 and ffi 1.13.0 depend on Ruby 2.3. 2. Bump bifrost to 7.2.1 Bifrost had a fix to stop using the master branch of DIB which dropped support for Python 2. Change-Id: Ida7e20833360bbca69c6aafc4f5d7cb375bb106f Closes-Bug: #1882070
2020-05-08Use 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 (cherry picked from commit f5d31da12fa66cedfc2e270b8cd3be8e2bb9254b)
2020-01-14Refactor 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 (cherry picked from commit 8484190e77e4237247dac7fba128e5a111fc9918)
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 (cherry picked from commit 308e85aa413da84ed107b27fa09a3f0e0a64392f)
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
2018-07-27Add Monasca Agent containerDoug Szumski1-0/+31
The Monasca Agent consists of 3 processes. The collector, which collects system level metrics from a host, a statsd server, which is used to receive application specific statsd metrics and a forwarder service which batches metrics and sends them to the Monasca API at pre-defined time intervals. Partially-Implements: blueprint monasca-containers Change-Id: Ia446ca0a6b932c2429d727b63e363b4e27307304
2018-07-26Remove Monasca statsd client Docker filesDoug Szumski1-33/+0
The monasca-statsd repo is a statsd client library with Monasca extensions such as support for adding dimensions to metrics. It is designed to be included in application code for sending application specific metrics to the Monasca statsd service, which is part of the Monasca Agent. This commit removes the Monasca Statsd Docker image because the normal use case would be to include it as a library in an application. The monasca-statsd tarball is left so that it can be added to containers using the additions mechanism if a user wants to generate application specific metrics. Partially-Implements: blueprint monasca-containers Change-Id: I20ec284e8f51eb046cc6de2636680847097a3ac1
2018-07-18Merge "Add support for deploying Monasca Thresh"Zuul1-0/+68
2018-07-16Add support for deploying Monasca ThreshDoug Szumski1-0/+68
Monasca Thresh is a Java topology for Storm which generates alerts from metrics. It depends on Java code in the monasca-common library. In this change we support building the Monasca Thresh Storm topology from source. To enable us to submit the topology to Storm we inherit from the Storm container (rather than the Monasca base image) so that we can use the Storm client. Change-Id: I389af89086cdab6d243c4a4fa65fd157535a5045 Partially-Implements: blueprint monasca-containers
2018-07-11Add database clients to Monasca persister containerDoug Szumski1-1/+4
The Monasca persister supports persisting to InfluxDB, Elasticsearch and Cassandra. We need python clients for these repositores to support this. Change-Id: I563913d5cd4fb779d2a475f39e0f34d0a92edee7 Partially-Implements: blueprint monasca-containers
2018-06-08Update Monasca base and API imagesDoug Szumski6-9/+126
* Support deploying APIs via Apache + mod_wsgi * Include InfluxDB client so that the Monasca API can talk to InfluxDB. Support for Cassandra can be added in a later commit. Change-Id: If71db99d4731967e814c5263f2c2d6f90391c2a6 Partially-Implements: blueprint monasca-containers
2018-04-03Fix typo in monasca-base scriptDoug Szumski1-1/+1
TrivialFix Change-Id: I83c548ceab5fd926a308dffaaa5b7de570288ad6
2017-05-03Override image's meta info.Jawon Choo6-6/+6
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-20Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2Chen6-6/+6
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-02-17Use install-pip macro in most source imagesChao Guo5-5/+25
1. Enable customization of pip packages in source branch of most images 2. All pip packages install uniformly through install-pip macro, user can easily customize his own pip command (For example using a mirror) Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com> Change-Id: If09582039f690fa4136e8f33200d5da15e092da7
2017-01-17use static uid/gid in imagesSam Yaple1-6/+5
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
2016-12-13Add monasca imagesSam Yaple7-0/+170
NOTE: Currently monasca does not publish master tarballs, I have will be working with them to do so. Change-Id: Ica3ab50c56271d05b7e40978d38711279dc42585 Partially-Implements: blueprint monasca-containers
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 17:57:29 +0000