Skip to content

Commit ece4ad8

Browse files
authored
fix: remove deprecated fields from default template (#91)
1 parent 49f2462 commit ece4ad8

File tree

1 file changed

+75
-78
lines changed

1 file changed

+75
-78
lines changed

util/es_template.go

Lines changed: 75 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -10,72 +10,77 @@ import (
1010
// SetDefaultIndexTemplate to set default template for indexes
1111
func SetDefaultIndexTemplate() error {
1212

13-
analyzers := `{
14-
"analyzer": {
15-
"universal": {
16-
"tokenizer": "standard",
17-
"filter": [
18-
"universal_stop"
19-
]
20-
},
21-
"autosuggest_analyzer": {
22-
"filter": [
23-
"lowercase",
24-
"asciifolding",
25-
"autosuggest_filter"
26-
],
27-
"tokenizer": "standard",
28-
"type": "custom"
29-
},
30-
"ngram_analyzer": {
31-
"filter": [
32-
"lowercase",
33-
"asciifolding",
34-
"ngram_filter"
35-
],
36-
"tokenizer": "standard",
37-
"type": "custom"
38-
},
39-
"synonyms": {
40-
"tokenizer": "standard",
41-
"filter": [
42-
"synonym_graph",
43-
"lowercase"
44-
]
45-
}
46-
},
47-
"filter": {
48-
"synonym_graph": {
49-
"type": "synonym_graph",
50-
"synonyms": []
51-
},
52-
"universal_stop": {
53-
"type": "stop",
54-
"stopwords": "_english_"
55-
},
56-
"autosuggest_filter": {
57-
"max_gram": "20",
58-
"min_gram": "1",
59-
"token_chars": [
60-
"letter",
61-
"digit",
62-
"punctuation",
63-
"symbol"
64-
],
65-
"type": "edge_ngram"
13+
settings := `{
14+
"number_of_shards": 1,
15+
"max_ngram_diff": 8,
16+
"max_shingle_diff": 8,
17+
"analysis": {
18+
"analyzer": {
19+
"universal": {
20+
"tokenizer": "standard",
21+
"filter": [
22+
"universal_stop"
23+
]
24+
},
25+
"autosuggest_analyzer": {
26+
"filter": [
27+
"lowercase",
28+
"asciifolding",
29+
"autosuggest_filter"
30+
],
31+
"tokenizer": "standard",
32+
"type": "custom"
33+
},
34+
"ngram_analyzer": {
35+
"filter": [
36+
"lowercase",
37+
"asciifolding",
38+
"ngram_filter"
39+
],
40+
"tokenizer": "standard",
41+
"type": "custom"
42+
},
43+
"synonyms": {
44+
"tokenizer": "standard",
45+
"filter": [
46+
"synonym_graph",
47+
"lowercase"
48+
]
49+
}
6650
},
67-
"ngram_filter": {
68-
"max_gram": "9",
69-
"min_gram": "2",
70-
"token_chars": [
71-
"letter",
72-
"digit",
73-
"punctuation",
74-
"symbol"
75-
],
76-
"type": "ngram"
51+
"filter": {
52+
"synonym_graph": {
53+
"type": "synonym_graph",
54+
"synonyms": []
55+
},
56+
"universal_stop": {
57+
"type": "stop",
58+
"stopwords": "_english_"
59+
},
60+
"autosuggest_filter": {
61+
"max_gram": "20",
62+
"min_gram": "1",
63+
"token_chars": [
64+
"letter",
65+
"digit",
66+
"punctuation",
67+
"symbol"
68+
],
69+
"type": "edge_ngram"
70+
},
71+
"ngram_filter": {
72+
"max_gram": "9",
73+
"min_gram": "2",
74+
"token_chars": [
75+
"letter",
76+
"digit",
77+
"punctuation",
78+
"symbol"
79+
],
80+
"type": "ngram"
81+
}
7782
}
78-
}
83+
}
7984
}`
8085

8186
mappings := `{
@@ -118,15 +123,10 @@ func SetDefaultIndexTemplate() error {
118123
version := GetVersion()
119124
if version == 7 {
120125
defaultSetting := fmt.Sprintf(`{
121-
"template": "*",
122-
"settings": {
123-
"number_of_shards": 1,
124-
"max_ngram_diff": 8,
125-
"max_shingle_diff": 8,
126-
"analysis": %s
127-
},
126+
"index_patterns": ["*"],
127+
"settings": %s,
128128
"mappings": %s
129-
}`, analyzers, mappings)
129+
}`, settings, mappings)
130130
_, err := GetClient7().IndexPutTemplate("default_temp").BodyString(defaultSetting).Do(context.Background())
131131
if err != nil {
132132
log.Errorln("[SET TEMPLATE ERROR V7]", ": ", err)
@@ -136,15 +136,12 @@ func SetDefaultIndexTemplate() error {
136136

137137
if version == 6 {
138138
defaultSetting := fmt.Sprintf(`{
139-
"template": "*",
140-
"settings": {
141-
"number_of_shards": 1,
142-
"analysis": %s
143-
},
139+
"index_patterns": ["*"],
140+
"settings": %s,
144141
"mappings": {
145142
"_doc": %s
146143
}
147-
}`, analyzers, mappings)
144+
}`, settings, mappings)
148145
_, err := GetClient6().IndexPutTemplate("default_temp").BodyString(defaultSetting).Do(context.Background())
149146
if err != nil {
150147
log.Errorln("[SET TEMPLATE ERROR V6]", ": ", err)

0 commit comments

Comments
 (0)