diff --git a/docker-compose.yml b/docker-compose.yml index f103fe2..343f948 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,4 @@ -version: "3.8" - +--- volumes: certs: driver: local @@ -15,9 +14,8 @@ volumes: driver: local networks: - default: - name: elastic - external: false + infra_dev_net: + external: true services: setup: @@ -67,8 +65,7 @@ services: until curl -s --cacert config/certs/ca/ca.crt https://es01:9200 | grep -q "missing authentication credentials"; do sleep 30; done; echo "Setting kibana_system password"; until curl -s -X POST --cacert config/certs/ca/ca.crt -u "elastic:${ELASTIC_PASSWORD}" -H "Content-Type: application/json" https://es01:9200/_security/user/kibana_system/_password -d "{\"password\":\"${KIBANA_PASSWORD}\"}" | grep -q "^{}"; do sleep 10; done; - echo "All done!"; - ' + echo "All done!";' healthcheck: test: ["CMD-SHELL", "[ -f config/certs/es01/es01.crt ]"] interval: 1s @@ -85,6 +82,9 @@ services: volumes: - certs:/usr/share/elasticsearch/config/certs - esdata01:/usr/share/elasticsearch/data + networks: + infra_dev_net: + ipv4_address: 10.99.23.71 ports: - ${ES_PORT}:9200 environment: @@ -129,6 +129,9 @@ services: volumes: - certs:/usr/share/kibana/config/certs - kibanadata:/usr/share/kibana/data + networks: + infra_dev_net: + ipv4_address: 10.99.23.72 ports: - ${KIBANA_PORT}:5601 environment: @@ -167,6 +170,9 @@ services: - "/sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro" - "/proc:/hostfs/proc:ro" - "/:/hostfs:ro" + networks: + infra_dev_net: + ipv4_address: 10.99.23.73 environment: - ELASTIC_USER=elastic - ELASTIC_PASSWORD=${ELASTIC_PASSWORD} @@ -195,6 +201,9 @@ services: - ELASTIC_HOSTS=https://es01:9200 - KIBANA_HOSTS=http://kibana:5601 - LOGSTASH_HOSTS=http://logstash01:9600 + networks: + infra_dev_net: + ipv4_address: 10.99.23.74 command: - --strict.perms=false @@ -213,8 +222,11 @@ services: - logstashdata01:/usr/share/logstash/data - "./logstash_ingest_data/:/usr/share/logstash/ingest_data/" - "./logstash.conf:/usr/share/logstash/pipeline/logstash.conf:ro" + networks: + infra_dev_net: + ipv4_address: 10.99.23.75 environment: - xpack.monitoring.enabled=false - ELASTIC_USER=elastic - ELASTIC_PASSWORD=${ELASTIC_PASSWORD} - - ELASTIC_HOSTS=https://es01:9200 \ No newline at end of file + - ELASTIC_HOSTS=https://es01:9200