Compare commits
No commits in common. "846e8fe069144d51a476e9e8fde383a3dc7be0b9" and "2370dfe9c63e5aafcc2a253238fd31db71254d45" have entirely different histories.
846e8fe069
...
2370dfe9c6
4
.env
4
.env
|
|
@ -2,10 +2,10 @@
|
|||
#COMPOSE_PROJECT_NAME=myproject
|
||||
|
||||
# Password for the 'elastic' user (at least 6 characters)
|
||||
ELASTIC_PASSWORD=forty6and2
|
||||
ELASTIC_PASSWORD=changeme
|
||||
|
||||
# Password for the 'kibana_system' user (at least 6 characters)
|
||||
KIBANA_PASSWORD=forty6and2
|
||||
KIBANA_PASSWORD=changeme
|
||||
|
||||
# Version of Elastic products
|
||||
STACK_VERSION=8.7.1
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
---
|
||||
version: "3.8"
|
||||
|
||||
volumes:
|
||||
certs:
|
||||
driver: local
|
||||
|
|
@ -12,12 +13,11 @@ volumes:
|
|||
driver: local
|
||||
logstashdata01:
|
||||
driver: local
|
||||
fleetserverdata:
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
infra_dev_net:
|
||||
external: true
|
||||
default:
|
||||
name: elastic
|
||||
external: false
|
||||
|
||||
services:
|
||||
setup:
|
||||
|
|
@ -48,19 +48,13 @@ services:
|
|||
" - es01\n"\
|
||||
" - localhost\n"\
|
||||
" ip:\n"\
|
||||
" - 10.99.23.71\n"\
|
||||
" - 127.0.0.1\n"\
|
||||
" - name: kibana\n"\
|
||||
" dns:\n"\
|
||||
" - kibana\n"\
|
||||
" - localhost\n"\
|
||||
" ip:\n"\
|
||||
" - 10.99.23.72\n"\
|
||||
" - name: fleet-server\n"\
|
||||
" dns:\n"\
|
||||
" - fleet-server\n"\
|
||||
" - localhost\n"\
|
||||
" ip:\n"\
|
||||
" - 10.99.23.76\n"\
|
||||
" - 127.0.0.1\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;
|
||||
|
|
@ -70,18 +64,17 @@ 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://10.99.23.71:9200 | grep -q "missing authentication credentials"; do sleep 30; done;
|
||||
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://10.99.23.71:9200/_security/user/kibana_system/_password -d "{\"password\":\"${KIBANA_PASSWORD}\"}" | grep -q "^{}"; do sleep 10; done;
|
||||
echo "All done!";'
|
||||
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!";
|
||||
'
|
||||
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,9 +85,6 @@ 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:
|
||||
|
|
@ -102,7 +92,7 @@ services:
|
|||
- cluster.name=${CLUSTER_NAME}
|
||||
- discovery.type=single-node
|
||||
- ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
|
||||
- bootstrap.memory_lock=false
|
||||
- bootstrap.memory_lock=true
|
||||
- xpack.security.enabled=true
|
||||
- xpack.security.http.ssl.enabled=true
|
||||
- xpack.security.http.ssl.key=certs/es01/es01.key
|
||||
|
|
@ -114,11 +104,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:
|
||||
[
|
||||
|
|
@ -138,24 +128,19 @@ 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:
|
||||
ipv4_address: 10.99.23.72
|
||||
ports:
|
||||
- ${KIBANA_PORT}:5601
|
||||
environment:
|
||||
- SERVERNAME=kibana
|
||||
- ELASTICSEARCH_HOSTS=https://10.99.23.71:9200
|
||||
- ELASTICSEARCH_HOSTS=https://es01: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}
|
||||
- ELASTIC_APM_SECRET_TOKEN=${ELASTIC_APM_SECRET_TOKEN}
|
||||
#mem_limit: ${KB_MEM_LIMIT}
|
||||
mem_limit: ${KB_MEM_LIMIT}
|
||||
healthcheck:
|
||||
test:
|
||||
[
|
||||
|
|
@ -182,15 +167,12 @@ 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}
|
||||
- ELASTIC_HOSTS=https://10.99.23.71:9200
|
||||
- KIBANA_HOSTS=http://10.99.23.72:5601
|
||||
- LOGSTASH_HOSTS=http://10.99.23.75:9600
|
||||
- ELASTIC_HOSTS=https://es01:9200
|
||||
- KIBANA_HOSTS=http://kibana:5601
|
||||
- LOGSTASH_HOSTS=http://logstash01:9600
|
||||
command:
|
||||
- --strict.perms=false
|
||||
|
||||
|
|
@ -210,12 +192,9 @@ services:
|
|||
environment:
|
||||
- ELASTIC_USER=elastic
|
||||
- ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
|
||||
- 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
|
||||
- ELASTIC_HOSTS=https://es01:9200
|
||||
- KIBANA_HOSTS=http://kibana:5601
|
||||
- LOGSTASH_HOSTS=http://logstash01:9600
|
||||
command:
|
||||
- --strict.perms=false
|
||||
|
||||
|
|
@ -234,68 +213,8 @@ 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://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
|
||||
- ELASTIC_HOSTS=https://es01:9200
|
||||
Loading…
Reference in New Issue