From 847a215efbe8152d891f042edbdf9110babbdfb5 Mon Sep 17 00:00:00 2001 From: KourokiTakuto Date: Fri, 15 Mar 2019 23:18:58 +0900 Subject: [PATCH] Fixed about ElasticSearch 6.6.1 correspondence --- 1-server_unit/Ansible_Settings_Instruction.md | 2 +- 1-server_unit/group_vars/es.yml | 2 +- .../es/etc/systemd/system/elasticsearch.service | 17 ++++++++--------- .../config/elasticsearch.yml.j2 | 4 +--- .../config/jvm.options | 2 +- 3-server_unit/Ansible_Settings_Instruction.md | 2 +- 3-server_unit/group_vars/es.yml | 2 +- .../es/etc/systemd/system/elasticsearch.service | 17 ++++++++--------- .../config/elasticsearch.yml.j2 | 4 +--- .../config/jvm.options | 2 +- README.md | 2 +- 11 files changed, 25 insertions(+), 31 deletions(-) rename 1-server_unit/resource/es/opt/{elasticsearch-5.6.14 => elasticsearch-6.6.1}/config/elasticsearch.yml.j2 (96%) rename 1-server_unit/resource/es/opt/{elasticsearch-5.6.14 => elasticsearch-6.6.1}/config/jvm.options (98%) rename 3-server_unit/resource/es/opt/{elasticsearch-5.6.14 => elasticsearch-6.6.1}/config/elasticsearch.yml.j2 (96%) rename 3-server_unit/resource/es/opt/{elasticsearch-5.6.14 => elasticsearch-6.6.1}/config/jvm.options (98%) diff --git a/1-server_unit/Ansible_Settings_Instruction.md b/1-server_unit/Ansible_Settings_Instruction.md index 92f01f2..8e14577 100644 --- a/1-server_unit/Ansible_Settings_Instruction.md +++ b/1-server_unit/Ansible_Settings_Instruction.md @@ -125,7 +125,7 @@ Below are the files where modification is required. ```yaml tag_ServerType: es - version: 5.6.14 + version: 6.6.1 es_heapsize: 1875 ``` diff --git a/1-server_unit/group_vars/es.yml b/1-server_unit/group_vars/es.yml index cc414dc..de23db5 100644 --- a/1-server_unit/group_vars/es.yml +++ b/1-server_unit/group_vars/es.yml @@ -3,7 +3,7 @@ tag_ServerType: es # elasictsearch version -version: 5.6.14 +version: 6.6.1 # elasticsearch heapsize es_heapsize: 1875 diff --git a/1-server_unit/resource/es/etc/systemd/system/elasticsearch.service b/1-server_unit/resource/es/etc/systemd/system/elasticsearch.service index 887d2ef..e0b83db 100644 --- a/1-server_unit/resource/es/etc/systemd/system/elasticsearch.service +++ b/1-server_unit/resource/es/etc/systemd/system/elasticsearch.service @@ -5,21 +5,20 @@ Wants=network-online.target After=network-online.target [Service] -Environment=ES_HOME=/opt/elasticsearch-5.6.14 -Environment=CONF_DIR=/opt/elasticsearch-5.6.14/config -Environment=DATA_DIR=/personium/elasticsearch-5.6.14/data -Environment=LOG_DIR=/personium/elasticsearch-5.6.14/log -Environment=PID_DIR=/var/run/elasticsearch-5.6.14 -EnvironmentFile=-/opt/elasticsearch-5.6.14/config +Environment=ES_HOME=/opt/elasticsearch-6.6.1 +Environment=CONF_DIR=/opt/elasticsearch-6.6.1/config +Environment=DATA_DIR=/personium/elasticsearch-6.6.1/data +Environment=LOG_DIR=/personium/elasticsearch-6.6.1/log +Environment=ES_PATH_CONF=/opt/elasticsearch-6.6.1/config +Environment=PID_DIR=/var/run/elasticsearch-6.6.1 +EnvironmentFile=-/opt/elasticsearch-6.6.1/config Environment=JAVA_HOME=/opt/jdk User=elasticsearch Group=elasticsearch -ExecStartPre=/opt/elasticsearch-5.6.14/bin/elasticsearch.in.sh - -ExecStart=/opt/elasticsearch-5.6.14/bin/elasticsearch +ExecStart=/opt/elasticsearch-6.6.1/bin/elasticsearch StandardOutput=journal StandardError=inherit diff --git a/1-server_unit/resource/es/opt/elasticsearch-5.6.14/config/elasticsearch.yml.j2 b/1-server_unit/resource/es/opt/elasticsearch-6.6.1/config/elasticsearch.yml.j2 similarity index 96% rename from 1-server_unit/resource/es/opt/elasticsearch-5.6.14/config/elasticsearch.yml.j2 rename to 1-server_unit/resource/es/opt/elasticsearch-6.6.1/config/elasticsearch.yml.j2 index 25ce796..0f9f58d 100644 --- a/1-server_unit/resource/es/opt/elasticsearch-5.6.14/config/elasticsearch.yml.j2 +++ b/1-server_unit/resource/es/opt/elasticsearch-6.6.1/config/elasticsearch.yml.j2 @@ -40,8 +40,6 @@ path.data: /personium/elasticsearch-{{ version }}/data # path.logs: /personium/elasticsearch-{{ version }}/log # -path.conf: /opt/elasticsearch-{{ version }}/config -# # ----------------------------------- Memory ----------------------------------- # # Lock the memory on startup: @@ -94,7 +92,7 @@ discovery.zen.ping.unicast.hosts: ["127.0.0.1"] # #action.destructive_requires_name: true -action.auto_create_index: false +action.auto_create_index: ".security,.monitoring*,.watches,.triggered_watches,.watcher-history*" http.cors.enabled: true http.cors.allow-origin: "*" indices.fielddata.cache.size: 80% diff --git a/1-server_unit/resource/es/opt/elasticsearch-5.6.14/config/jvm.options b/1-server_unit/resource/es/opt/elasticsearch-6.6.1/config/jvm.options similarity index 98% rename from 1-server_unit/resource/es/opt/elasticsearch-5.6.14/config/jvm.options rename to 1-server_unit/resource/es/opt/elasticsearch-6.6.1/config/jvm.options index a7e8f86..c71fecb 100644 --- a/1-server_unit/resource/es/opt/elasticsearch-5.6.14/config/jvm.options +++ b/1-server_unit/resource/es/opt/elasticsearch-6.6.1/config/jvm.options @@ -110,4 +110,4 @@ # only for migration purposes. #-Delasticsearch.json.allow_unquoted_field_names=true --Des.pidfile=/var/run/elasticsearch-5.6.14/elasticsearch.pid +-Des.pidfile=/var/run/elasticsearch-6.6.1/elasticsearch.pid diff --git a/3-server_unit/Ansible_Settings_Instruction.md b/3-server_unit/Ansible_Settings_Instruction.md index 84459df..169ca1b 100644 --- a/3-server_unit/Ansible_Settings_Instruction.md +++ b/3-server_unit/Ansible_Settings_Instruction.md @@ -192,7 +192,7 @@ Below are the files where modification is required. ```yaml tag_ServerType: es - version: 5.6.14 + version: 6.6.1 es_heapsize: 3328 ``` diff --git a/3-server_unit/group_vars/es.yml b/3-server_unit/group_vars/es.yml index 2b1fe07..236ad6e 100644 --- a/3-server_unit/group_vars/es.yml +++ b/3-server_unit/group_vars/es.yml @@ -3,7 +3,7 @@ tag_ServerType: es # elasictsearch version -version: 5.6.14 +version: 6.6.1 # elasticsearch heapsize es_heapsize: 3328 diff --git a/3-server_unit/resource/es/etc/systemd/system/elasticsearch.service b/3-server_unit/resource/es/etc/systemd/system/elasticsearch.service index 887d2ef..e0b83db 100644 --- a/3-server_unit/resource/es/etc/systemd/system/elasticsearch.service +++ b/3-server_unit/resource/es/etc/systemd/system/elasticsearch.service @@ -5,21 +5,20 @@ Wants=network-online.target After=network-online.target [Service] -Environment=ES_HOME=/opt/elasticsearch-5.6.14 -Environment=CONF_DIR=/opt/elasticsearch-5.6.14/config -Environment=DATA_DIR=/personium/elasticsearch-5.6.14/data -Environment=LOG_DIR=/personium/elasticsearch-5.6.14/log -Environment=PID_DIR=/var/run/elasticsearch-5.6.14 -EnvironmentFile=-/opt/elasticsearch-5.6.14/config +Environment=ES_HOME=/opt/elasticsearch-6.6.1 +Environment=CONF_DIR=/opt/elasticsearch-6.6.1/config +Environment=DATA_DIR=/personium/elasticsearch-6.6.1/data +Environment=LOG_DIR=/personium/elasticsearch-6.6.1/log +Environment=ES_PATH_CONF=/opt/elasticsearch-6.6.1/config +Environment=PID_DIR=/var/run/elasticsearch-6.6.1 +EnvironmentFile=-/opt/elasticsearch-6.6.1/config Environment=JAVA_HOME=/opt/jdk User=elasticsearch Group=elasticsearch -ExecStartPre=/opt/elasticsearch-5.6.14/bin/elasticsearch.in.sh - -ExecStart=/opt/elasticsearch-5.6.14/bin/elasticsearch +ExecStart=/opt/elasticsearch-6.6.1/bin/elasticsearch StandardOutput=journal StandardError=inherit diff --git a/3-server_unit/resource/es/opt/elasticsearch-5.6.14/config/elasticsearch.yml.j2 b/3-server_unit/resource/es/opt/elasticsearch-6.6.1/config/elasticsearch.yml.j2 similarity index 96% rename from 3-server_unit/resource/es/opt/elasticsearch-5.6.14/config/elasticsearch.yml.j2 rename to 3-server_unit/resource/es/opt/elasticsearch-6.6.1/config/elasticsearch.yml.j2 index 55afcf9..a809da0 100644 --- a/3-server_unit/resource/es/opt/elasticsearch-5.6.14/config/elasticsearch.yml.j2 +++ b/3-server_unit/resource/es/opt/elasticsearch-6.6.1/config/elasticsearch.yml.j2 @@ -40,8 +40,6 @@ path.data: /personium/elasticsearch-{{ version }}/data # path.logs: /personium/elasticsearch-{{ version }}/log # -path.conf: /opt/elasticsearch-{{ version }}/config -# # ----------------------------------- Memory ----------------------------------- # # Lock the memory on startup: @@ -94,7 +92,7 @@ discovery.zen.ping.unicast.hosts: ["{{ es_private_ip }}"] # #action.destructive_requires_name: true -action.auto_create_index: false +action.auto_create_index: ".security,.monitoring*,.watches,.triggered_watches,.watcher-history*" http.cors.enabled: true http.cors.allow-origin: "*" indices.fielddata.cache.size: 80% diff --git a/3-server_unit/resource/es/opt/elasticsearch-5.6.14/config/jvm.options b/3-server_unit/resource/es/opt/elasticsearch-6.6.1/config/jvm.options similarity index 98% rename from 3-server_unit/resource/es/opt/elasticsearch-5.6.14/config/jvm.options rename to 3-server_unit/resource/es/opt/elasticsearch-6.6.1/config/jvm.options index a7e8f86..c71fecb 100644 --- a/3-server_unit/resource/es/opt/elasticsearch-5.6.14/config/jvm.options +++ b/3-server_unit/resource/es/opt/elasticsearch-6.6.1/config/jvm.options @@ -110,4 +110,4 @@ # only for migration purposes. #-Delasticsearch.json.allow_unquoted_field_names=true --Des.pidfile=/var/run/elasticsearch-5.6.14/elasticsearch.pid +-Des.pidfile=/var/run/elasticsearch-6.6.1/elasticsearch.pid diff --git a/README.md b/README.md index 1a13647..b069c7d 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ For the setting procedure, please refer to [setup-vagrant](https://github.com/pe | logback | logback | 1.0.3 | -- | | | slf4j | 1.6.4 | -- | | memcached | memcached | 1.4.21 | cache | - | elasticsearch | elasticsearch | 5.6.14 | db & search engine| + | elasticsearch | elasticsearch | 6.6.1 | db & search engine| This document introduced pattern based initial requirements to construct the Personium unit. Please choose the right pattern that suits your purpose. Please go thru with other documents to learn about the process to construct the Personium unit.