From e3a41c2a944370725c4baac95e102123d0d2db51 Mon Sep 17 00:00:00 2001 From: weslambert Date: Tue, 24 Nov 2020 11:20:09 -0500 Subject: [PATCH 1/4] Changes for ES7 elasticsearch.yml --- salt/thehive/etc/es/elasticsearch.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/thehive/etc/es/elasticsearch.yml b/salt/thehive/etc/es/elasticsearch.yml index 7f268a671..3465ec7dc 100644 --- a/salt/thehive/etc/es/elasticsearch.yml +++ b/salt/thehive/etc/es/elasticsearch.yml @@ -4,6 +4,8 @@ discovery.zen.minimum_master_nodes: 1 # This is a test -- if this is here, then the volume is mounted correctly. path.logs: /var/log/elasticsearch action.destructive_requires_name: true +discovery.type: single-node +script.allowed_types: inline transport.bind_host: 0.0.0.0 transport.publish_host: 0.0.0.0 transport.publish_port: 9500 @@ -11,6 +13,5 @@ http.host: 0.0.0.0 http.port: 9400 transport.tcp.port: 9500 transport.host: 0.0.0.0 -thread_pool.index.queue_size: 100000 thread_pool.search.queue_size: 100000 -thread_pool.bulk.queue_size: 100000 +thread_pool.write.queue_size: 10000 From eb2364b926346dcf9cf3018ffc226592226833af Mon Sep 17 00:00:00 2001 From: weslambert Date: Tue, 24 Nov 2020 11:49:08 -0500 Subject: [PATCH 2/4] Changes for ES7 --- salt/thehive/init.sls | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/salt/thehive/init.sls b/salt/thehive/init.sls index e695c237f..c89017dda 100644 --- a/salt/thehive/init.sls +++ b/salt/thehive/init.sls @@ -89,14 +89,6 @@ so-thehive-es: - /opt/so/conf/thehive/etc/es/log4j2.properties:/usr/share/elasticsearch/config/log4j2.properties:ro - /opt/so/log/thehive:/var/log/elasticsearch:rw - environment: - - http.host=0.0.0.0 - - http.port=9400 - - transport.tcp.port=9500 - - transport.host=0.0.0.0 - - cluster.name=thehive - - thread_pool.index.queue_size=100000 - - thread_pool.search.queue_size=100000 - - thread_pool.bulk.queue_size=100000 - ES_JAVA_OPTS=-Xms512m -Xmx512m - port_bindings: - 0.0.0.0:9400:9400 @@ -164,4 +156,4 @@ thehive_state_not_allowed: test.fail_without_changes: - name: thehive_state_not_allowed -{% endif %} \ No newline at end of file +{% endif %} From 35653d2e66f63f1dd029e3ee7f2d2f77ebf80d82 Mon Sep 17 00:00:00 2001 From: weslambert Date: Tue, 24 Nov 2020 11:51:19 -0500 Subject: [PATCH 3/4] Changes for ES7 --- salt/thehive/etc/es/elasticsearch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/thehive/etc/es/elasticsearch.yml b/salt/thehive/etc/es/elasticsearch.yml index 3465ec7dc..1f1518299 100644 --- a/salt/thehive/etc/es/elasticsearch.yml +++ b/salt/thehive/etc/es/elasticsearch.yml @@ -1,4 +1,4 @@ -cluster.name: "thehive" +cluster.name: thehive network.host: 0.0.0.0 discovery.zen.minimum_master_nodes: 1 # This is a test -- if this is here, then the volume is mounted correctly. From 39bf60feb7f26ba8b9e7b484ee80bbb2653c613c Mon Sep 17 00:00:00 2001 From: weslambert Date: Tue, 24 Nov 2020 11:52:20 -0500 Subject: [PATCH 4/4] Add digit --- salt/thehive/etc/es/elasticsearch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/thehive/etc/es/elasticsearch.yml b/salt/thehive/etc/es/elasticsearch.yml index 1f1518299..8abeb2d93 100644 --- a/salt/thehive/etc/es/elasticsearch.yml +++ b/salt/thehive/etc/es/elasticsearch.yml @@ -14,4 +14,4 @@ http.port: 9400 transport.tcp.port: 9500 transport.host: 0.0.0.0 thread_pool.search.queue_size: 100000 -thread_pool.write.queue_size: 10000 +thread_pool.write.queue_size: 100000