diff --git a/Dockerfile.logstash b/Dockerfile.logstash index 05f374d..a51d8e6 100644 --- a/Dockerfile.logstash +++ b/Dockerfile.logstash @@ -2,4 +2,4 @@ FROM opensearchproject/logstash-oss-with-opensearch-output-plugin:7.16.2 COPY ./elk/logstash/logstash.prod.conf /usr/share/logstash/pipeline/ COPY ./elk/logstash/mysql-connector-java-8.0.28.jar /usr/share/logstash/ -COPY ./elk/logstash/auto_template3.json /usr/share/logstash/ \ No newline at end of file +COPY ./elk/logstash/auto_template.json /usr/share/logstash/ \ No newline at end of file diff --git a/README.md b/README.md index 022cf0f..d8692bf 100644 --- a/README.md +++ b/README.md @@ -229,12 +229,10 @@ │ ├── 📝 app.controller.ts │ ├── 📝 app.module.ts │ └── 📝 main.ts -├── 🐳 .dockerignore -├── 📝 .env.docker -├── 📝 .env.prod ├── 📝 .eslintrc.js ├── 📝 .gitignore ├── 📝 .prettierrc +├── 🐳 .dockerignore ├── 🐳 docker-compose.prod.yaml ├── 🐳 docker-compose.yaml ├── 🐳 Dockerfile @@ -243,7 +241,6 @@ ├── 🐳 Dockerfile.prod ├── 🧸 nest-cli.json ├── 🧸 package.json -├── 🧸 project-groomeong-34231f48bd14.json ├── 📝 README.md ├── 🧸 settings.json ├── 🧸 tsconfig.build.json diff --git a/elk/logstash/auto_template copy.json b/elk/logstash/auto_template copy.json deleted file mode 100644 index 1e9489c..0000000 --- a/elk/logstash/auto_template copy.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "template": "auto-*", - "index_patterns": ["autocomplete-shop-*"], - "order": "1", - "settings": { - "analysis": { - "analyzer": { - "my_ngram_analyzer": { - "tokenizer": "my_ngram_tokenizer" - } - }, - "tokenizer": { - "my_ngram_tokenizer": { - "type": "nGram", - "min_gram": "2", - "max_gram": "30" - } - } - }, - "max_ngram_diff": "30" - }, - "mappings": { - "properties": { - "name": { - "type": "text", - "analyzer": "my_ngram_analyzer" - }, - "address": { - "type": "text", - "analyzer": "my_ngram_analyzer" - }, - "images": { - "properties": { - "type": "nested", - "id": { - "type": "text" - }, - "isthumbnail": { - "type": "integer" - }, - "imageurl": { - "type": "text" - } - } - } - } - } -} diff --git a/elk/logstash/auto_template.json b/elk/logstash/auto_template.json index 62bfcf6..c24f7b0 100644 --- a/elk/logstash/auto_template.json +++ b/elk/logstash/auto_template.json @@ -1,37 +1,33 @@ { "template": "auto-*", - "index_patterns": ["autocomplete-shop-*"], + "index_patterns": ["auto_shop_*"], "order": "1", "settings": { "analysis": { "analyzer": { - "address_ngram_analyzer": { - "tokenizer": "address_ngram_tokenizer" - }, - "name_ngram_analyzer": { - "tokenizer": "name_ngram_tokenizer" + "korean": { + "type": "custom", + "tokenizer": "seunjeon" } }, "tokenizer": { - "address_ngram_tokenizer": { - "type": "nGram", - "min_gram": "2", - "max_gram": "30" - }, - "name_ngram_tokenizer": { - "type": "nGram", - "min_gram": "2", - "max_gram": "30" + "seunjeon": { + "type": "seunjeon_tokenizer", + "decompound": "true" } } - }, - "max_ngram_diff": "30" + } }, "mappings": { "properties": { "address": { "type": "text", - "analyzer": "address_ngram_analyzer" + "fields": { + "analyzed": { + "type": "text", + "analyzer": "korean" + } + } } } } diff --git a/elk/logstash/auto_template2.json b/elk/logstash/auto_template2.json deleted file mode 100644 index 6b27e7d..0000000 --- a/elk/logstash/auto_template2.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "template": "auto-*", - "index_patterns": ["auto_shop_*"], - "order": "1", - "settings": { - "analysis": { - "analyzer": { - "nori": { - "type": "custom", - "tokenizer": "nori_mixed" - } - }, - "tokenizer": { - "nori_mixed": { - "type": "nori_tokenizer", - "decompound_mode": "mixed" - } - } - } - }, - "mappings": { - "properties": { - "address": { - "type": "text", - "fields": { - "analyzed": { - "type": "text", - "analyzer": "nori" - } - } - } - } - } -} diff --git a/elk/logstash/auto_template3.json b/elk/logstash/auto_template3.json deleted file mode 100644 index c24f7b0..0000000 --- a/elk/logstash/auto_template3.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "template": "auto-*", - "index_patterns": ["auto_shop_*"], - "order": "1", - "settings": { - "analysis": { - "analyzer": { - "korean": { - "type": "custom", - "tokenizer": "seunjeon" - } - }, - "tokenizer": { - "seunjeon": { - "type": "seunjeon_tokenizer", - "decompound": "true" - } - } - } - }, - "mappings": { - "properties": { - "address": { - "type": "text", - "fields": { - "analyzed": { - "type": "text", - "analyzer": "korean" - } - } - } - } - } -} diff --git a/elk/logstash/logstash.prod.conf b/elk/logstash/logstash.prod.conf index f850e4f..291d745 100644 --- a/elk/logstash/logstash.prod.conf +++ b/elk/logstash/logstash.prod.conf @@ -25,12 +25,12 @@ filter { output { opensearch { hosts => "https://search-groomeong-elasticsearch-7mvk7xnf5m2a6tcx6p5ro5qste.ap-southeast-2.es.amazonaws.com:443" - user => "groomeong11" - password => "QKQHwngus1!" + user => "opensearchID" + password => "opensearchPWD" index => "auto_shop_2" document_id => "%{shopid}" manage_template => true - template => "/usr/share/logstash/auto_template3.json" + template => "/usr/share/logstash/auto_template.json" template_name => "auto" template_overwrite => true }