Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .buildkite/deploy/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2.3'
services:
# This is a proxy used to block beats until all services are healthy.
# See: https://github.com/docker/compose/issues/4369
Expand Down
1 change: 0 additions & 1 deletion auditbeat/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2.3'
services:
beat:
build: ${PWD}/.
Expand Down
3 changes: 1 addition & 2 deletions filebeat/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2.3'
services:
# This is a proxy used to block "docker-compose up" until all services are healthy.
# See: https://github.com/docker/compose/issues/4369
Expand Down Expand Up @@ -61,4 +60,4 @@ services:
test: ["CMD", "redis-cli", "-h", "localhost", "-p", "6379", "--tls", "--cert", "/certs/server-cert.pem", "--key", "/certs/server-key.pem", "--cacert", "/certs/root-ca.pem", "ping"]
interval: 10s
timeout: 5s
retries: 5
retries: 5
1 change: 0 additions & 1 deletion heartbeat/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2.3'
services:
# This is a proxy used to block beats until all services are healthy.
# See: https://github.com/docker/compose/issues/4369
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/aerospike/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
aerospike:
image: docker.elastic.co/integrations-ci/beats-aerospike:${AEROSPIKE_VERSION:-7.2.0.1}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/apache/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "2.3"

services:
apache:
image: docker.elastic.co/integrations-ci/beats-apache:${APACHE_VERSION:-2.4.54}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/ceph/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
ceph:
image: docker.elastic.co/integrations-ci/beats-ceph:${CEPH_VERSION:-master-97985eb-nautilus-centos-7-x86_64}-2
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/consul/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
consul:
image: docker.elastic.co/integrations-ci/beats-consul:${CONSUL_VERSION:-1.9.3}-2
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/couchbase/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
couchbase:
image: docker.elastic.co/integrations-ci/beats-couchbase:${COUCHBASE_VERSION:-6.5.1}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/couchdb/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
couchdb:
image: docker.elastic.co/integrations-ci/beats-couchdb:${COUCHDB_VERSION:-1.7}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
# Dummy container for docker tests, so there is a container with
# healthcheck generating events
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/dropwizard/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
dropwizard:
image: docker.elastic.co/integrations-ci/beats-dropwizard:${DROPWIZARD_VERSION:-4.1.2}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/envoyproxy/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
envoyproxy:
image: docker.elastic.co/integrations-ci/beats-envoyproxy:v${ENVOYPROXY_VERSION:-1.7.0}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/etcd/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
etcd:
image: docker.elastic.co/integrations-ci/beats-etcd:${ETCD_VERSION:-3.3.10}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/golang/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
golang:
image: docker.elastic.co/integrations-ci/beats-golang:1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/haproxy/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
haproxy:
image: docker.elastic.co/integrations-ci/beats-haproxy:${HAPROXY_VERSION:-1.8.22}-2
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/http/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
http:
image: docker.elastic.co/integrations-ci/beats-http:1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/logstash/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
logstash:
image: docker.elastic.co/integrations-ci/beats-logstash:${LOGSTASH_VERSION:-8.1.0-aa69d697-SNAPSHOT}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/memcached/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
memcached:
image: docker.elastic.co/integrations-ci/beats-memcached:${MEMCACHED_VERSION:-1.4.35}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/mongodb/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
mongodb:
image: docker.elastic.co/integrations-ci/beats-mongodb:${MONGODB_VERSION:-5.0}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/munin/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
munin:
image: docker.elastic.co/integrations-ci/beats-munin:1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/mysql/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
mysql:
image: docker.elastic.co/integrations-ci/beats-mysql:${MYSQL_VARIANT:-mysql}-${MYSQL_VERSION:-8.0}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/nginx/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "2.3"

services:
nginx:
image: docker.elastic.co/integrations-ci/beats-nginx:${NGINX_VERSION:-1.23.2}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/openmetrics/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
openmetrics-node_exporter:
image: docker.elastic.co/integrations-ci/beats-openmetrics-node-exporter:${NODE_EXPORTER_VERSION:-0.18.1}-1
Expand Down
4 changes: 1 addition & 3 deletions metricbeat/module/php_fpm/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
version: '2.3'

services:
phpfpm:
image: docker.elastic.co/integrations-ci/beats-phpfpm:${PHPFPM_VERSION:-7.1}-1
build:
build:
context: ./_meta
args:
PHPFPM_VERSION: ${PHPFPM_VERSION:-7.1}
Expand Down
4 changes: 1 addition & 3 deletions metricbeat/module/postgresql/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
postgresql:
image: docker.elastic.co/integrations-ci/beats-postgresql:${POSTGRESQL_VERSION:-13.11}-2
Expand All @@ -16,4 +14,4 @@ services:
interval: 15s
timeout: 30s
retries: 5
start_period: 15s
start_period: 15s
2 changes: 0 additions & 2 deletions metricbeat/module/prometheus/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
prometheus_base:
image: docker.elastic.co/integrations-ci/beats-prometheus:${PROMETHEUS_VERSION:-2.6.0}-2
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/rabbitmq/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
rabbitmq:
image: docker.elastic.co/integrations-ci/beats-rabbitmq:${RABBITMQ_VERSION:-3.7.4}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/redis/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
redis:
image: docker.elastic.co/integrations-ci/beats-redis:${REDIS_VERSION:-3.2.12}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/traefik/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
traefik:
image: docker.elastic.co/integrations-ci/beats-traefik:${TRAEFIK_VERSION:-1.6}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/uwsgi/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
uwsgi_tcp:
image: docker.elastic.co/integrations-ci/beats-uwsgi:${UWSGI_VERSION:-2.0.18}-py${UWSGI_PYTHON_VERSION:-3.8}-1
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/vsphere/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
vsphere:
image: docker.elastic.co/integrations-ci/beats-vsphere:${VSPHERE_GOLANG_VERSION:-1.19}-1
Expand Down
4 changes: 1 addition & 3 deletions metricbeat/module/zookeeper/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
zookeeper:
image: docker.elastic.co/integrations-ci/beats-zookeeper:${ZOOKEEPER_VERSION:-3.5.5}-1
Expand All @@ -10,4 +8,4 @@ services:
ports:
- 2181
environment:
- ZOO_4LW_COMMANDS_WHITELIST=stat, ruok, conf, isro, cons, mntr
- ZOO_4LW_COMMANDS_WHITELIST=stat, ruok, conf, isro, cons, mntr
1 change: 0 additions & 1 deletion packetbeat/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2.3'
services:
beat:
build: ${PWD}/.
Expand Down
1 change: 0 additions & 1 deletion x-pack/agentbeat/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2.3'
services:
# This is a proxy used to block beats until all services are healthy.
# See: https://github.com/docker/compose/issues/4369
Expand Down
1 change: 0 additions & 1 deletion x-pack/auditbeat/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2.3'
services:
beat:
build: ../../auditbeat
Expand Down
1 change: 0 additions & 1 deletion x-pack/filebeat/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2.3'
services:
# This is a proxy used to block beats until all services are healthy.
# See: https://github.com/docker/compose/issues/4369
Expand Down
1 change: 0 additions & 1 deletion x-pack/heartbeat/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2.3'
services:
# This is a proxy used to block beats until all services are healthy.
# See: https://github.com/docker/compose/issues/4369
Expand Down
1 change: 0 additions & 1 deletion x-pack/libbeat/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2.3'
services:
# This is a proxy used to block beats until all services are healthy.
# See: https://github.com/docker/compose/issues/4369
Expand Down
2 changes: 0 additions & 2 deletions x-pack/metricbeat/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
# This is a proxy used to block "docker-compose up" until all services are healthy.
# See: https://github.com/docker/compose/issues/4369
Expand Down
2 changes: 0 additions & 2 deletions x-pack/metricbeat/module/activemq/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
activemq:
image: docker.elastic.co/integrations-ci/beats-activemq:${ACTIVEMQ_VERSION:-5.15.9}-1
Expand Down
2 changes: 0 additions & 2 deletions x-pack/metricbeat/module/cockroachdb/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
cockroachdb:
image: docker.elastic.co/integrations-ci/beats-cockroachdb:${COCKROACHDB_VERSION:-22.1.19}-1
Expand Down
2 changes: 0 additions & 2 deletions x-pack/metricbeat/module/coredns/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
coredns:
image: docker.elastic.co/integrations-ci/beats-coredns:${COREDNS_VERSION:-1.5.0}-1
Expand Down
2 changes: 0 additions & 2 deletions x-pack/metricbeat/module/ibmmq/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
ibmmq:
image: docker.elastic.co/integrations-ci/beats-ibmmq:${IBMMQ_VERSION:-9.1.5.0-r2-amd64}-1
Expand Down
2 changes: 0 additions & 2 deletions x-pack/metricbeat/module/mssql/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
mssql:
image: docker.elastic.co/integrations-ci/beats-mssql:${MSSQL_VERSION:-2019-CU28-ubuntu-20.04}-1
Expand Down
2 changes: 0 additions & 2 deletions x-pack/metricbeat/module/oracle/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
oracle:
image: docker.elastic.co/observability-ci/database-enterprise:${ORACLE_VERSION:-12.2.0.1}-1
Expand Down
4 changes: 1 addition & 3 deletions x-pack/metricbeat/module/prometheus/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
version: '2.3'

services:
prometheus:
extends:
file: ../../../../metricbeat/module/prometheus/docker-compose.yml
service: prometheus
service: prometheus
2 changes: 0 additions & 2 deletions x-pack/metricbeat/module/redisenterprise/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
redisenterprise:
image: docker.elastic.co/integrations-ci/beats-redisenterprise:${REDISENTERPRISE_VERSION:-5.4.10-22}-3
Expand Down
4 changes: 1 addition & 3 deletions x-pack/metricbeat/module/sql/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
mysql:
extends:
Expand All @@ -10,7 +8,7 @@ services:
extends:
file: ../../../../metricbeat/module/postgresql/docker-compose.yml
service: postgresql

oracle:
extends:
file: ../../../../x-pack/metricbeat/module/oracle/docker-compose.yml
Expand Down
2 changes: 0 additions & 2 deletions x-pack/metricbeat/module/stan/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.3'

services:
stan:
image: docker.elastic.co/integrations-ci/beats-stan:${STAN_VERSION:-0.15.1}-1
Expand Down
Loading