Resolved conflicts

This commit is contained in:
manuasir 2019-11-11 18:31:43 +01:00
parent d384c7397f
commit 699cbccf7e
3 changed files with 6 additions and 3 deletions

View File

@ -4,7 +4,10 @@ elasticsearch_node_name: node-1
elasticsearch_http_port: 9200 elasticsearch_http_port: 9200
elasticsearch_network_host: 127.0.0.1 elasticsearch_network_host: 127.0.0.1
elasticsearch_jvm_xms: null elasticsearch_jvm_xms: null
elastic_stack_version: 7.3.2 elastic_stack_version: 7.4.2
elasticsearch_lower_disk_requirements: false
# Cluster Settings
single_node: true single_node: true
elasticsearch_bootstrap_node: false elasticsearch_bootstrap_node: false
elasticsearch_master_candidate: false elasticsearch_master_candidate: false

View File

@ -5,7 +5,7 @@ elasticsearch_http_port: "9200"
elasticsearch_network_host: "127.0.0.1" elasticsearch_network_host: "127.0.0.1"
kibana_server_host: "0.0.0.0" kibana_server_host: "0.0.0.0"
kibana_server_port: "5601" kibana_server_port: "5601"
elastic_stack_version: 7.3.2 elastic_stack_version: 7.4.2
wazuh_version: 3.10.2 wazuh_version: 3.10.2
# Xpack Security # Xpack Security

View File

@ -1,5 +1,5 @@
--- ---
filebeat_version: 7.3.2 filebeat_version: 7.4.2
filebeat_create_config: true filebeat_create_config: true