From 9f674eca404e27292b51e828ef0f2009d882318f Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Thu, 17 Nov 2022 21:01:15 +0100 Subject: [PATCH] chore: Clean up config --- docker-compose.yml | 18 +++++++++--------- elasticsearch/config/elasticsearch.yml | 2 +- .../enterprise-search-compose.yml | 2 +- extensions/filebeat/config/filebeat.yml | 2 +- extensions/fleet/agent-apmserver-compose.yml | 2 +- extensions/fleet/fleet-compose.yml | 2 +- extensions/heartbeat/config/heartbeat.yml | 2 +- extensions/metricbeat/config/metricbeat.yml | 4 ++-- logstash/config/logstash.yml | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6cc590b4b0..a0b91c31d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,11 +32,11 @@ services: args: ELASTIC_VERSION: ${ELASTIC_VERSION} volumes: - - ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro,z - - elasticsearch:/usr/share/elasticsearch/data:z + - ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro,Z + - elasticsearch:/usr/share/elasticsearch/data:Z ports: - - "9200:9200" - - "9300:9300" + - 9200:9200 + - 9300:9300 environment: ES_JAVA_OPTS: -Xms512m -Xmx512m # Bootstrap password. @@ -58,10 +58,10 @@ services: - ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro,Z - ./logstash/pipeline:/usr/share/logstash/pipeline:ro,Z ports: - - "5044:5044" - - "50000:50000/tcp" - - "50000:50000/udp" - - "9600:9600" + - 5044:5044 + - 50000:50000/tcp + - 50000:50000/udp + - 9600:9600 environment: LS_JAVA_OPTS: -Xms256m -Xmx256m LOGSTASH_INTERNAL_PASSWORD: ${LOGSTASH_INTERNAL_PASSWORD:-} @@ -78,7 +78,7 @@ services: volumes: - ./kibana/config/kibana.yml:/usr/share/kibana/config/kibana.yml:ro,Z ports: - - "5601:5601" + - 5601:5601 environment: KIBANA_SYSTEM_PASSWORD: ${KIBANA_SYSTEM_PASSWORD:-} networks: diff --git a/elasticsearch/config/elasticsearch.yml b/elasticsearch/config/elasticsearch.yml index b2147a4d5e..d66f071aad 100644 --- a/elasticsearch/config/elasticsearch.yml +++ b/elasticsearch/config/elasticsearch.yml @@ -2,7 +2,7 @@ ## Default Elasticsearch configuration from Elasticsearch base image. ## 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 ## X-Pack settings diff --git a/extensions/enterprise-search/enterprise-search-compose.yml b/extensions/enterprise-search/enterprise-search-compose.yml index ad2573975a..585dda9380 100644 --- a/extensions/enterprise-search/enterprise-search-compose.yml +++ b/extensions/enterprise-search/enterprise-search-compose.yml @@ -13,7 +13,7 @@ services: ENT_SEARCH_DEFAULT_PASSWORD: 'changeme' ELASTIC_PASSWORD: ${ELASTIC_PASSWORD:-} ports: - - '3002:3002' + - 3002:3002 networks: - elk depends_on: diff --git a/extensions/filebeat/config/filebeat.yml b/extensions/filebeat/config/filebeat.yml index 9512a2daab..e5095d5139 100644 --- a/extensions/filebeat/config/filebeat.yml +++ b/extensions/filebeat/config/filebeat.yml @@ -18,7 +18,7 @@ processors: - add_cloud_metadata: ~ output.elasticsearch: - hosts: ['http://elasticsearch:9200'] + hosts: [ http://elasticsearch:9200 ] username: elastic password: ${ELASTIC_PASSWORD} diff --git a/extensions/fleet/agent-apmserver-compose.yml b/extensions/fleet/agent-apmserver-compose.yml index 2ed87f868b..06e201a9ee 100644 --- a/extensions/fleet/agent-apmserver-compose.yml +++ b/extensions/fleet/agent-apmserver-compose.yml @@ -17,7 +17,7 @@ services: args: ELASTIC_VERSION: ${ELASTIC_VERSION} volumes: - - apm-server:/usr/share/elastic-agent/state:z + - apm-server:/usr/share/elastic-agent/state:Z environment: FLEET_ENROLL: '1' FLEET_TOKEN_POLICY_NAME: Agent Policy APM Server diff --git a/extensions/fleet/fleet-compose.yml b/extensions/fleet/fleet-compose.yml index 3694cd3a16..5f19abc9bf 100644 --- a/extensions/fleet/fleet-compose.yml +++ b/extensions/fleet/fleet-compose.yml @@ -7,7 +7,7 @@ services: args: ELASTIC_VERSION: ${ELASTIC_VERSION} volumes: - - fleet-server:/usr/share/elastic-agent/state:z + - fleet-server:/usr/share/elastic-agent/state:Z environment: FLEET_SERVER_ENABLE: '1' FLEET_SERVER_INSECURE_HTTP: '1' diff --git a/extensions/heartbeat/config/heartbeat.yml b/extensions/heartbeat/config/heartbeat.yml index b5276c0b9c..1d700a630c 100644 --- a/extensions/heartbeat/config/heartbeat.yml +++ b/extensions/heartbeat/config/heartbeat.yml @@ -19,7 +19,7 @@ processors: - add_cloud_metadata: ~ output.elasticsearch: - hosts: ['http://elasticsearch:9200'] + hosts: [ http://elasticsearch:9200 ] username: elastic password: ${ELASTIC_PASSWORD} diff --git a/extensions/metricbeat/config/metricbeat.yml b/extensions/metricbeat/config/metricbeat.yml index ccdde4c579..ae9836ce4c 100644 --- a/extensions/metricbeat/config/metricbeat.yml +++ b/extensions/metricbeat/config/metricbeat.yml @@ -24,7 +24,7 @@ metricbeat.modules: #- image - memory - network - hosts: ['unix:///var/run/docker.sock'] + hosts: [ unix:///var/run/docker.sock ] period: 10s enabled: true @@ -32,7 +32,7 @@ processors: - add_cloud_metadata: ~ output.elasticsearch: - hosts: ['http://elasticsearch:9200'] + hosts: [ http://elasticsearch:9200 ] username: elastic password: ${ELASTIC_PASSWORD} diff --git a/logstash/config/logstash.yml b/logstash/config/logstash.yml index 58e996b189..7c8baa92ed 100644 --- a/logstash/config/logstash.yml +++ b/logstash/config/logstash.yml @@ -2,4 +2,4 @@ ## Default Logstash configuration from Logstash base image. ## 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