From 846e8fe069144d51a476e9e8fde383a3dc7be0b9 Mon Sep 17 00:00:00 2001 From: Kameron Kenny - pi501 Date: Sat, 20 Apr 2024 18:00:42 -0400 Subject: [PATCH] compose --- docker-compose.yml | 109 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 89 insertions(+), 20 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 343f948..9a524f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,8 @@ volumes: driver: local logstashdata01: driver: local + fleetserverdata: + driver: local networks: infra_dev_net: @@ -46,13 +48,19 @@ services: " - es01\n"\ " - localhost\n"\ " ip:\n"\ - " - 127.0.0.1\n"\ + " - 10.99.23.71\n"\ " - name: kibana\n"\ " dns:\n"\ " - kibana\n"\ " - localhost\n"\ " ip:\n"\ - " - 127.0.0.1\n"\ + " - 10.99.23.72\n"\ + " - name: fleet-server\n"\ + " dns:\n"\ + " - fleet-server\n"\ + " - localhost\n"\ + " ip:\n"\ + " - 10.99.23.76\n"\ > config/certs/instances.yml; bin/elasticsearch-certutil cert --silent --pem -out config/certs/certs.zip --in config/certs/instances.yml --ca-cert config/certs/ca/ca.crt --ca-key config/certs/ca/ca.key; unzip config/certs/certs.zip -d config/certs; @@ -62,16 +70,18 @@ services: find . -type d -exec chmod 750 \{\} \;; find . -type f -exec chmod 640 \{\} \;; echo "Waiting for Elasticsearch availability"; - until curl -s --cacert config/certs/ca/ca.crt https://es01:9200 | grep -q "missing authentication credentials"; do sleep 30; done; + until curl -s --cacert config/certs/ca/ca.crt https://10.99.23.71: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; + until curl -s -X POST --cacert config/certs/ca/ca.crt -u "elastic:${ELASTIC_PASSWORD}" -H "Content-Type: application/json" https://10.99.23.71:9200/_security/user/kibana_system/_password -d "{\"password\":\"${KIBANA_PASSWORD}\"}" | grep -q "^{}"; do sleep 10; done; echo "All done!";' healthcheck: test: ["CMD-SHELL", "[ -f config/certs/es01/es01.crt ]"] interval: 1s timeout: 5s retries: 120 - + networks: + infra_dev_net: + ipv4_address: 10.99.23.70 es01: depends_on: setup: @@ -92,7 +102,7 @@ services: - cluster.name=${CLUSTER_NAME} - discovery.type=single-node - ELASTIC_PASSWORD=${ELASTIC_PASSWORD} - - bootstrap.memory_lock=true + - bootstrap.memory_lock=false - xpack.security.enabled=true - xpack.security.http.ssl.enabled=true - xpack.security.http.ssl.key=certs/es01/es01.key @@ -104,11 +114,11 @@ services: - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt - xpack.security.transport.ssl.verification_mode=certificate - xpack.license.self_generated.type=${LICENSE} - mem_limit: ${ES_MEM_LIMIT} - ulimits: - memlock: - soft: -1 - hard: -1 + #mem_limit: ${ES_MEM_LIMIT} + # ulimits: + #memlock: + #soft: -1 + #hard: -1 healthcheck: test: [ @@ -128,6 +138,7 @@ services: co.elastic.logs/module: kibana volumes: - certs:/usr/share/kibana/config/certs + - ./kibana.yml:/usr/share/kibana/config/kibana.yml:ro - kibanadata:/usr/share/kibana/data networks: infra_dev_net: @@ -136,14 +147,15 @@ services: - ${KIBANA_PORT}:5601 environment: - SERVERNAME=kibana - - ELASTICSEARCH_HOSTS=https://es01:9200 + - ELASTICSEARCH_HOSTS=https://10.99.23.71:9200 - ELASTICSEARCH_USERNAME=kibana_system - ELASTICSEARCH_PASSWORD=${KIBANA_PASSWORD} - ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES=config/certs/ca/ca.crt - XPACK_SECURITY_ENCRYPTIONKEY=${ENCRYPTION_KEY} - XPACK_ENCRYPTEDSAVEDOBJECTS_ENCRYPTIONKEY=${ENCRYPTION_KEY} - XPACK_REPORTING_ENCRYPTIONKEY=${ENCRYPTION_KEY} - mem_limit: ${KB_MEM_LIMIT} + - ELASTIC_APM_SECRET_TOKEN=${ELASTIC_APM_SECRET_TOKEN} + #mem_limit: ${KB_MEM_LIMIT} healthcheck: test: [ @@ -176,9 +188,9 @@ services: environment: - ELASTIC_USER=elastic - ELASTIC_PASSWORD=${ELASTIC_PASSWORD} - - ELASTIC_HOSTS=https://es01:9200 - - KIBANA_HOSTS=http://kibana:5601 - - LOGSTASH_HOSTS=http://logstash01:9600 + - ELASTIC_HOSTS=https://10.99.23.71:9200 + - KIBANA_HOSTS=http://10.99.23.72:5601 + - LOGSTASH_HOSTS=http://10.99.23.75:9600 command: - --strict.perms=false @@ -198,9 +210,9 @@ services: environment: - ELASTIC_USER=elastic - ELASTIC_PASSWORD=${ELASTIC_PASSWORD} - - ELASTIC_HOSTS=https://es01:9200 - - KIBANA_HOSTS=http://kibana:5601 - - LOGSTASH_HOSTS=http://logstash01:9600 + - ELASTIC_HOSTS=https://10.99.23.71:9200 + - KIBANA_HOSTS=http://10.99.23.72:5601 + - LOGSTASH_HOSTS=http://10.99.23.75:9600 networks: infra_dev_net: ipv4_address: 10.99.23.74 @@ -229,4 +241,61 @@ services: - xpack.monitoring.enabled=false - ELASTIC_USER=elastic - ELASTIC_PASSWORD=${ELASTIC_PASSWORD} - - ELASTIC_HOSTS=https://es01:9200 + - ELASTIC_HOSTS=https://10.99.23.71:9200 + fleet-server: + depends_on: + kibana: + condition: service_healthy + es01: + condition: service_healthy + image: docker.elastic.co/beats/elastic-agent:${STACK_VERSION} + volumes: + - certs:/certs + - fleetserverdata:/usr/share/elastic-agent + - "/var/lib/docker/containers:/var/lib/docker/containers:ro" + - "/var/run/docker.sock:/var/run/docker.sock:ro" + - "/sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro" + - "/proc:/hostfs/proc:ro" + - "/:/hostfs:ro" + networks: + infra_dev_net: + ipv4_address: 10.99.23.76 + ports: + - ${FLEET_PORT}:8220 + - ${APMSERVER_PORT}:8200 + user: root + environment: + - SSL_CERTIFICATE_AUTHORITIES=/certs/ca/ca.crt + - CERTIFICATE_AUTHORITIES=/certs/ca/ca.crt + - FLEET_CA=/certs/ca/ca.crt + - FLEET_ENROLL=1 + - FLEET_INSECURE=true + - FLEET_SERVER_ELASTICSEARCH_CA=/certs/ca/ca.crt + - FLEET_SERVER_ELASTICSEARCH_HOST=https://10.99.23.71:9200 + - FLEET_SERVER_ELASTICSEARCH_INSECURE=true + - FLEET_SERVER_ENABLE=1 + - FLEET_SERVER_CERT=/certs/fleet-server/fleet-server.crt + - FLEET_SERVER_CERT_KEY=/certs/fleet-server/fleet-server.key + - FLEET_SERVER_INSECURE_HTTP=true + - FLEET_SERVER_POLICY_ID=fleet-server-policy + - FLEET_URL=https://10.99.23.76:8220 + - KIBANA_FLEET_CA=/certs/ca/ca.crt + - KIBANA_FLEET_SETUP=1 + - KIBANA_FLEET_USERNAME=elastic + - KIBANA_FLEET_PASSWORD=${ELASTIC_PASSWORD} + - KIBANA_HOST=https://10.99.23.72:5601 + + # webapp: + # build: + # context: app + # volumes: + # - "/var/lib/docker/containers:/var/lib/docker/containers:ro" + # - "/var/run/docker.sock:/var/run/docker.sock:ro" + # - "/sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro" + # - "/proc:/hostfs/proc:ro" + # - "/:/hostfs:ro" + # networks: + # infra_dev_net: + # ipv4_address: 10.99.23.77 + # ports: + # - 8000:8000