Branch: refs/heads/master Home: https://github.com/openSUSE/open-build-service Commit: 60492da27f8fe315840af8d64b48b4a2223b5b0e https://github.com/openSUSE/open-build-service/commit/60492da27f8fe315840af8... Author: Henne Vogelsang <hvogel@opensuse.org> Date: 2020-08-27 (Thu, 27 Aug 2020) Changed paths: A contrib/grafana-datasource.yml A contrib/influxdb-init.iql M contrib/telegraf.conf R docker-compose.ahm.yml A docker-compose.sre.yml M src/api/config/initializers/influxdb_rails.rb Log Message: ----------- Merge the docker-compose AHM/APM setups This makes it possible to start an environment with all monitoring services enabled. I think it make little sense to seperate AHM/APM. `docker-compose -f docker-compose.yml -f docker-compose.sre.yml up` Commit: 94a2f79f803092c4e4ae5b7d6cf12f5b71c2684d https://github.com/openSUSE/open-build-service/commit/94a2f79f803092c4e4ae5b... Author: Henne Vogelsang <hvogel@opensuse.org> Date: 2020-08-27 (Thu, 27 Aug 2020) Changed paths: A contrib/grafana-datasource.yml A contrib/influxdb-init.iql M contrib/telegraf.conf R docker-compose.ahm.yml A docker-compose.sre.yml M src/api/config/initializers/influxdb_rails.rb Log Message: ----------- Merge pull request #10078 from hennevogel/feature/full-dev-env Merge the docker-compose AHM/APM setups Compare: https://github.com/openSUSE/open-build-service/compare/92b16b72e57e...94a2f7...