Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(es-7-migration): Add to docker compose and update create_indices script #2262

Merged
merged 2 commits into from
Mar 19, 2021
Merged

feat(es-7-migration): Add to docker compose and update create_indices script #2262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64bf162
Add to docker compose and update create_indices script
Mar 19, 2021
2eebb00
Upgrade kibana
Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ services:
- schema-registry

elasticsearch:
image: elasticsearch:5.6.8
image: elasticsearch:7.9.3
env_file: elasticsearch/env/docker.env
container_name: elasticsearch
hostname: elasticsearch
Expand All @@ -96,7 +96,7 @@ services:
- esdata:/usr/share/elasticsearch/data

kibana:
image: kibana:5.6.8
image: kibana:7.9.3
env_file: kibana/env/docker.env
container_name: kibana
hostname: kibana
Expand Down
4 changes: 2 additions & 2 deletions docker/elasticsearch-setup/create-indices.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ function create_index {
jq -n \
--slurpfile settings index/$2 \
--slurpfile mappings index/$3 \
'.settings=$settings[0] | .mappings.doc=$mappings[0]' > /tmp/data
'.settings=$settings[0] | .mappings=$mappings[0]' > /tmp/data

curl -XPUT $ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT/$1 --data @/tmp/data
curl -XPUT $ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT/$1 -H 'Content-Type: application/json' --data @/tmp/data
}

create_index chartdocument chart/settings.json chart/mappings.json
Expand Down
1 change: 1 addition & 0 deletions gms/impl/src/main/resources/index/chart/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"index": {
"max_ngram_diff": 17,
"analysis": {
"filter": {
"autocomplete_filter": {
Expand Down
1 change: 1 addition & 0 deletions gms/impl/src/main/resources/index/corp-user/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"index": {
"max_ngram_diff": 17,
"analysis": {
"filter": {
"autocomplete_filter": {
Expand Down
1 change: 1 addition & 0 deletions gms/impl/src/main/resources/index/dashboard/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"index": {
"max_ngram_diff": 17,
"analysis": {
"filter": {
"autocomplete_filter": {
Expand Down
1 change: 1 addition & 0 deletions gms/impl/src/main/resources/index/dataflow/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"index": {
"max_ngram_diff": 17,
"analysis": {
"filter": {
"autocomplete_filter": {
Expand Down
1 change: 1 addition & 0 deletions gms/impl/src/main/resources/index/datajob/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"index": {
"max_ngram_diff": 17,
"analysis": {
"filter": {
"autocomplete_filter": {
Expand Down
4 changes: 2 additions & 2 deletions gms/impl/src/main/resources/index/ml-model/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"index": {
"max_ngram_diff": 47,
"analysis": {
"filter": {
"autocomplete_filter": {
Expand Down Expand Up @@ -128,7 +129,6 @@
"pattern": "[:\\s(),]"
}
}
},
"max_ngram_diff": 47
}
}
}
1 change: 1 addition & 0 deletions gms/impl/src/main/resources/index/tags/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"index": {
"max_ngram_diff": 19,
"analysis": {
"filter": {
"autocomplete_filter": {
Expand Down