iac
/
docker-elk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Clean up config

This commit is contained in:
Antoine Cotten 2022-11-17 21:01:15 +01:00
parent eba8d3837d
commit 9f674eca40
No known key found for this signature in database
GPG Key ID: 94637E68D4A79DD0
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker-compose.yml
View File

@ -32,11 +32,11 @@ services:
args: args:
ELASTIC_VERSION: ${ELASTIC_VERSION} ELASTIC_VERSION: ${ELASTIC_VERSION}
volumes: volumes:
- ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro,z - ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro,Z
- elasticsearch:/usr/share/elasticsearch/data:z - elasticsearch:/usr/share/elasticsearch/data:Z
ports: ports:
- "9200:9200" - 9200:9200
- "9300:9300" - 9300:9300
environment: environment:
ES_JAVA_OPTS: -Xms512m -Xmx512m ES_JAVA_OPTS: -Xms512m -Xmx512m
# Bootstrap password. # Bootstrap password.
@ -58,10 +58,10 @@ services:
- ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro,Z - ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro,Z
- ./logstash/pipeline:/usr/share/logstash/pipeline:ro,Z - ./logstash/pipeline:/usr/share/logstash/pipeline:ro,Z
ports: ports:
- "5044:5044" - 5044:5044
- "50000:50000/tcp" - 50000:50000/tcp
- "50000:50000/udp" - 50000:50000/udp
- "9600:9600" - 9600:9600
environment: environment:
LS_JAVA_OPTS: -Xms256m -Xmx256m LS_JAVA_OPTS: -Xms256m -Xmx256m
LOGSTASH_INTERNAL_PASSWORD: ${LOGSTASH_INTERNAL_PASSWORD:-} LOGSTASH_INTERNAL_PASSWORD: ${LOGSTASH_INTERNAL_PASSWORD:-}
@ -78,7 +78,7 @@ services:
volumes: volumes:
- ./kibana/config/kibana.yml:/usr/share/kibana/config/kibana.yml:ro,Z - ./kibana/config/kibana.yml:/usr/share/kibana/config/kibana.yml:ro,Z
ports: ports:
- "5601:5601" - 5601:5601
environment: environment:
KIBANA_SYSTEM_PASSWORD: ${KIBANA_SYSTEM_PASSWORD:-} KIBANA_SYSTEM_PASSWORD: ${KIBANA_SYSTEM_PASSWORD:-}
networks: networks:

2
elasticsearch/config/elasticsearch.yml
View File

@ -2,7 +2,7 @@
## Default Elasticsearch configuration from Elasticsearch base image. ## Default Elasticsearch configuration from Elasticsearch base image.
## https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/config/elasticsearch.yml ## https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/config/elasticsearch.yml
# #
cluster.name: "docker-cluster" cluster.name: docker-cluster
network.host: 0.0.0.0 network.host: 0.0.0.0
## X-Pack settings ## X-Pack settings

2
extensions/enterprise-search/enterprise-search-compose.yml
View File

@ -13,7 +13,7 @@ services:
ENT_SEARCH_DEFAULT_PASSWORD: 'changeme' ENT_SEARCH_DEFAULT_PASSWORD: 'changeme'
ELASTIC_PASSWORD: ${ELASTIC_PASSWORD:-} ELASTIC_PASSWORD: ${ELASTIC_PASSWORD:-}
ports: ports:
- '3002:3002' - 3002:3002
networks: networks:
- elk - elk
depends_on: depends_on:

2
extensions/filebeat/config/filebeat.yml
View File

@ -18,7 +18,7 @@ processors:
- add_cloud_metadata: ~ - add_cloud_metadata: ~
output.elasticsearch: output.elasticsearch:
hosts: ['http://elasticsearch:9200'] hosts: [ http://elasticsearch:9200 ]
username: elastic username: elastic
password: ${ELASTIC_PASSWORD} password: ${ELASTIC_PASSWORD}

2
extensions/fleet/agent-apmserver-compose.yml
View File

@ -17,7 +17,7 @@ services:
args: args:
ELASTIC_VERSION: ${ELASTIC_VERSION} ELASTIC_VERSION: ${ELASTIC_VERSION}
volumes: volumes:
- apm-server:/usr/share/elastic-agent/state:z - apm-server:/usr/share/elastic-agent/state:Z
environment: environment:
FLEET_ENROLL: '1' FLEET_ENROLL: '1'
FLEET_TOKEN_POLICY_NAME: Agent Policy APM Server FLEET_TOKEN_POLICY_NAME: Agent Policy APM Server

2
extensions/fleet/fleet-compose.yml
View File

@ -7,7 +7,7 @@ services:
args: args:
ELASTIC_VERSION: ${ELASTIC_VERSION} ELASTIC_VERSION: ${ELASTIC_VERSION}
volumes: volumes:
- fleet-server:/usr/share/elastic-agent/state:z - fleet-server:/usr/share/elastic-agent/state:Z
environment: environment:
FLEET_SERVER_ENABLE: '1' FLEET_SERVER_ENABLE: '1'
FLEET_SERVER_INSECURE_HTTP: '1' FLEET_SERVER_INSECURE_HTTP: '1'

2
extensions/heartbeat/config/heartbeat.yml
View File

@ -19,7 +19,7 @@ processors:
- add_cloud_metadata: ~ - add_cloud_metadata: ~
output.elasticsearch: output.elasticsearch:
hosts: ['http://elasticsearch:9200'] hosts: [ http://elasticsearch:9200 ]
username: elastic username: elastic
password: ${ELASTIC_PASSWORD} password: ${ELASTIC_PASSWORD}

4
extensions/metricbeat/config/metricbeat.yml
View File

@ -24,7 +24,7 @@ metricbeat.modules:
#- image #- image
- memory - memory
- network - network
hosts: ['unix:///var/run/docker.sock'] hosts: [ unix:///var/run/docker.sock ]
period: 10s period: 10s
enabled: true enabled: true
@ -32,7 +32,7 @@ processors:
- add_cloud_metadata: ~ - add_cloud_metadata: ~
output.elasticsearch: output.elasticsearch:
hosts: ['http://elasticsearch:9200'] hosts: [ http://elasticsearch:9200 ]
username: elastic username: elastic
password: ${ELASTIC_PASSWORD} password: ${ELASTIC_PASSWORD}

2
logstash/config/logstash.yml
View File

@ -2,4 +2,4 @@
## Default Logstash configuration from Logstash base image. ## Default Logstash configuration from Logstash base image.
## https://github.com/elastic/logstash/blob/main/docker/data/logstash/config/logstash-full.yml ## https://github.com/elastic/logstash/blob/main/docker/data/logstash/config/logstash-full.yml
# #
http.host: "0.0.0.0" http.host: 0.0.0.0