yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity

log4j workaround

Browse Source
This commit is contained in:
vcerenu
2021-12-15 11:03:50 -03:00
parent da2f257f00
commit f769c53716
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
disabledlog4j.options
-1
View File
@@ -1 +0,0 @@
-Dlog4j2.formatMsgNoLookups=true
production-cluster.yml
+5 -8
View File
@@ -73,7 +73,7 @@ services:
ports: ports:
- "9200:9200" - "9200:9200"
environment: environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m" - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Dlog4j2.formatMsgNoLookups=true"
ulimits: ulimits:
memlock: memlock:
soft: -1 soft: -1
@@ -90,14 +90,13 @@ services:
- ./production_cluster/ssl_certs/admin.key:/usr/share/elasticsearch/config/admin.key - ./production_cluster/ssl_certs/admin.key:/usr/share/elasticsearch/config/admin.key
- ./production_cluster/elastic_opendistro/elasticsearch-node1.yml:/usr/share/elasticsearch/config/elasticsearch.yml - ./production_cluster/elastic_opendistro/elasticsearch-node1.yml:/usr/share/elasticsearch/config/elasticsearch.yml
- ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
- ./disabledlog4j.options:/etc/elasticsearch/jvm.options.d/disabledlog4j.options
elasticsearch-2: elasticsearch-2:
image: amazon/opendistro-for-elasticsearch:1.13.2 image: amazon/opendistro-for-elasticsearch:1.13.2
hostname: elasticsearch-2 hostname: elasticsearch-2
restart: always restart: always
environment: environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m" - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Dlog4j2.formatMsgNoLookups=true"
ulimits: ulimits:
memlock: memlock:
soft: -1 soft: -1
@@ -112,14 +111,13 @@ services:
- ./production_cluster/ssl_certs/node2.pem:/usr/share/elasticsearch/config/node2.pem - ./production_cluster/ssl_certs/node2.pem:/usr/share/elasticsearch/config/node2.pem
- ./production_cluster/elastic_opendistro/elasticsearch-node2.yml:/usr/share/elasticsearch/config/elasticsearch.yml - ./production_cluster/elastic_opendistro/elasticsearch-node2.yml:/usr/share/elasticsearch/config/elasticsearch.yml
- ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
- ./disabledlog4j.options:/etc/elasticsearch/jvm.options.d/disabledlog4j.options
elasticsearch-3: elasticsearch-3:
image: amazon/opendistro-for-elasticsearch:1.13.2 image: amazon/opendistro-for-elasticsearch:1.13.2
hostname: elasticsearch-3 hostname: elasticsearch-3
restart: always restart: always
environment: environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m" - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Dlog4j2.formatMsgNoLookups=true"
ulimits: ulimits:
memlock: memlock:
soft: -1 soft: -1
@@ -134,8 +132,7 @@ services:
- ./production_cluster/ssl_certs/node3.pem:/usr/share/elasticsearch/config/node3.pem - ./production_cluster/ssl_certs/node3.pem:/usr/share/elasticsearch/config/node3.pem
- ./production_cluster/elastic_opendistro/elasticsearch-node3.yml:/usr/share/elasticsearch/config/elasticsearch.yml - ./production_cluster/elastic_opendistro/elasticsearch-node3.yml:/usr/share/elasticsearch/config/elasticsearch.yml
- ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
- ./disabledlog4j.options:/etc/elasticsearch/jvm.options.d/disabledlog4j.options
kibana: kibana:
image: wazuh/wazuh-kibana-odfe:4.3.0 image: wazuh/wazuh-kibana-odfe:4.3.0
hostname: kibana hostname: kibana
xpack-compose.yml
+3 -6
View File
@@ -48,7 +48,7 @@ services:
- discovery.seed_hosts=elasticsearch,elasticsearch2,elasticsearch3 - discovery.seed_hosts=elasticsearch,elasticsearch2,elasticsearch3
- cluster.initial_master_nodes=elasticsearch,elasticsearch2,elasticsearch3 - cluster.initial_master_nodes=elasticsearch,elasticsearch2,elasticsearch3
- ELASTIC_PASSWORD=SecretPassword - ELASTIC_PASSWORD=SecretPassword
- "ES_JAVA_OPTS=-Xms512m -Xmx512m" - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Dlog4j2.formatMsgNoLookups=true"
- bootstrap.memory_lock=true - bootstrap.memory_lock=true
- xpack.license.self_generated.type=basic - xpack.license.self_generated.type=basic
- xpack.security.enabled=true - xpack.security.enabled=true
@@ -72,7 +72,6 @@ services:
- ./xpack/ca/ca.crt:/usr/share/elasticsearch/config/ca.crt - ./xpack/ca/ca.crt:/usr/share/elasticsearch/config/ca.crt
- ./xpack/elasticsearch/elasticsearch.key:/usr/share/elasticsearch/config/elasticsearch.key - ./xpack/elasticsearch/elasticsearch.key:/usr/share/elasticsearch/config/elasticsearch.key
- ./xpack/elasticsearch/elasticsearch.crt:/usr/share/elasticsearch/config/elasticsearch.crt - ./xpack/elasticsearch/elasticsearch.crt:/usr/share/elasticsearch/config/elasticsearch.crt
- ./disabledlog4j.options:/etc/elasticsearch/jvm.options.d/disabledlog4j.options
elasticsearch2: elasticsearch2:
image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2 image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2
@@ -84,7 +83,7 @@ services:
- discovery.seed_hosts=elasticsearch,elasticsearch2,elasticsearch3 - discovery.seed_hosts=elasticsearch,elasticsearch2,elasticsearch3
- cluster.initial_master_nodes=elasticsearch,elasticsearch2,elasticsearch3 - cluster.initial_master_nodes=elasticsearch,elasticsearch2,elasticsearch3
- ELASTIC_PASSWORD=SecretPassword - ELASTIC_PASSWORD=SecretPassword
- "ES_JAVA_OPTS=-Xms512m -Xmx512m" - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Dlog4j2.formatMsgNoLookups=true"
- bootstrap.memory_lock=true - bootstrap.memory_lock=true
- xpack.license.self_generated.type=basic - xpack.license.self_generated.type=basic
- xpack.security.enabled=true - xpack.security.enabled=true
@@ -108,7 +107,6 @@ services:
- ./xpack/ca/ca.crt:/usr/share/elasticsearch/config/ca.crt - ./xpack/ca/ca.crt:/usr/share/elasticsearch/config/ca.crt
- ./xpack/elasticsearch2/elasticsearch2.key:/usr/share/elasticsearch/config/elasticsearch.key - ./xpack/elasticsearch2/elasticsearch2.key:/usr/share/elasticsearch/config/elasticsearch.key
- ./xpack/elasticsearch2/elasticsearch2.crt:/usr/share/elasticsearch/config/elasticsearch.crt - ./xpack/elasticsearch2/elasticsearch2.crt:/usr/share/elasticsearch/config/elasticsearch.crt
- ./disabledlog4j.options:/etc/elasticsearch/jvm.options.d/disabledlog4j.options
elasticsearch3: elasticsearch3:
image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2 image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2
@@ -120,7 +118,7 @@ services:
- discovery.seed_hosts=elasticsearch,elasticsearch2,elasticsearch3 - discovery.seed_hosts=elasticsearch,elasticsearch2,elasticsearch3
- cluster.initial_master_nodes=elasticsearch,elasticsearch2,elasticsearch3 - cluster.initial_master_nodes=elasticsearch,elasticsearch2,elasticsearch3
- ELASTIC_PASSWORD=SecretPassword - ELASTIC_PASSWORD=SecretPassword
- "ES_JAVA_OPTS=-Xms512m -Xmx512m" - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Dlog4j2.formatMsgNoLookups=true"
- bootstrap.memory_lock=true - bootstrap.memory_lock=true
- xpack.license.self_generated.type=basic - xpack.license.self_generated.type=basic
- xpack.security.enabled=true - xpack.security.enabled=true
@@ -144,7 +142,6 @@ services:
- ./xpack/ca/ca.crt:/usr/share/elasticsearch/config/ca.crt - ./xpack/ca/ca.crt:/usr/share/elasticsearch/config/ca.crt
- ./xpack/elasticsearch3/elasticsearch3.key:/usr/share/elasticsearch/config/elasticsearch.key - ./xpack/elasticsearch3/elasticsearch3.key:/usr/share/elasticsearch/config/elasticsearch.key
- ./xpack/elasticsearch3/elasticsearch3.crt:/usr/share/elasticsearch/config/elasticsearch.crt - ./xpack/elasticsearch3/elasticsearch3.crt:/usr/share/elasticsearch/config/elasticsearch.crt
- ./disabledlog4j.options:/etc/elasticsearch/jvm.options.d/disabledlog4j.options
kibana: kibana: