Merge pull request #84 from KourokiTakuto/master

Fixed about ElasticSearch 6.6.1 correspondence
personium · Mar 16, 2019 · 6be8727 · 6be8727
2 parents 73cda50 + 847a215
commit 6be8727
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 31 deletions.
diff --git 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
@@ -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
@@ -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/...search-5.6.14/config/elasticsearch.yml.j2 → ...csearch-6.6.1/config/elasticsearch.yml.j2 b/...search-5.6.14/config/elasticsearch.yml.j2 → ...csearch-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/...t/elasticsearch-5.6.14/config/jvm.options → ...pt/elasticsearch-6.6.1/config/jvm.options b/...t/elasticsearch-5.6.14/config/jvm.options → ...pt/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
@@ -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
@@ -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
@@ -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/...search-5.6.14/config/elasticsearch.yml.j2 → ...csearch-6.6.1/config/elasticsearch.yml.j2 b/...search-5.6.14/config/elasticsearch.yml.j2 → ...csearch-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/...t/elasticsearch-5.6.14/config/jvm.options → ...pt/elasticsearch-6.6.1/config/jvm.options b/...t/elasticsearch-5.6.14/config/jvm.options → ...pt/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
@@ -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.