Skip to content

Commit 3f9de95

Browse files
feat: rollup init template update
1 parent f3417ee commit 3f9de95

File tree

2 files changed

+93
-36
lines changed

2 files changed

+93
-36
lines changed

config/setup/easysearch/template_rollup.tpl

+92-35
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
1-
PUT /.easysearch-ilm-config/_settings
2-
{
3-
"index": {
4-
"mapping": {
5-
"nested_fields": {
6-
"limit": 1000
7-
},
8-
"nested_objects": {
9-
"limit": 20000
10-
},
11-
"total_fields": {
12-
"limit": 30000
13-
}
14-
}
15-
}
16-
}
17-
18-
DELETE _rollup/jobs/rollup_index_stats
19-
PUT _rollup/jobs/rollup_index_stats?replace
1+
DELETE /_rollup/jobs/rollup_index_stats
2+
PUT /_rollup/jobs/rollup_index_stats
203
{
214
"rollup": {
225
"source_index": ".infini_metrics",
@@ -30,6 +13,9 @@ PUT _rollup/jobs/rollup_index_stats?replace
3013
{
3114
"max": {}
3215
},
16+
{
17+
"min": {}
18+
},
3319
{
3420
"value_count": {}
3521
}
@@ -56,8 +42,8 @@ PUT _rollup/jobs/rollup_index_stats?replace
5642
}
5743
}
5844

59-
DELETE _rollup/jobs/rollup_index_health
60-
PUT _rollup/jobs/rollup_index_health?replace
45+
DELETE /_rollup/jobs/rollup_index_health
46+
PUT /_rollup/jobs/rollup_index_health
6147
{
6248
"rollup": {
6349
"source_index": ".infini_metrics",
@@ -96,8 +82,8 @@ PUT _rollup/jobs/rollup_index_health?replace
9682
}
9783
}
9884

99-
DELETE _rollup/jobs/rollup_cluster_stats
100-
PUT _rollup/jobs/rollup_cluster_stats?replace
85+
DELETE /_rollup/jobs/rollup_cluster_stats
86+
PUT /_rollup/jobs/rollup_cluster_stats
10187
{
10288
"rollup": {
10389
"source_index": ".infini_metrics",
@@ -136,8 +122,8 @@ PUT _rollup/jobs/rollup_cluster_stats?replace
136122
}
137123
}
138124

139-
DELETE _rollup/jobs/rollup_cluster_health
140-
PUT _rollup/jobs/rollup_cluster_health?replace
125+
DELETE /_rollup/jobs/rollup_cluster_health
126+
PUT /_rollup/jobs/rollup_cluster_health
141127
{
142128
"rollup": {
143129
"source_index": ".infini_metrics",
@@ -175,16 +161,15 @@ PUT _rollup/jobs/rollup_cluster_health?replace
175161
}
176162
}
177163

178-
# 高级 节点
179-
DELETE _rollup/jobs/rollup_node_stats
180-
PUT _rollup/jobs/rollup_node_stats?replace
164+
DELETE /_rollup/jobs/rollup_node_stats
165+
PUT /_rollup/jobs/rollup_node_stats
181166
{
182167
"rollup": {
183168
"source_index": ".infini_metrics",
184169
"target_index": "rollup_node_stats_{{ctx.source_index}}",
185170
"timestamp": "timestamp",
186171
"continuous": true,
187-
"page_size": 100,
172+
"page_size": 200,
188173
"cron": "*/10 1-23 * * *",
189174
"timezone": "UTC",
190175
"stats": [
@@ -198,6 +183,42 @@ PUT _rollup/jobs/rollup_node_stats?replace
198183
"value_count": {}
199184
}
200185
],
186+
"special_metrics": [
187+
{
188+
"source_field": "payload.elasticsearch.node_stats.process.cpu.percent",
189+
"metrics": [
190+
{
191+
"avg": {}
192+
},
193+
{
194+
"max": {}
195+
},
196+
{
197+
"min": {}
198+
},
199+
{
200+
"percentiles": {}
201+
}
202+
]
203+
},
204+
{
205+
"source_field": "payload.elasticsearch.node_stats.jvm.mem.heap_used_in_bytes",
206+
"metrics": [
207+
{
208+
"avg": {}
209+
},
210+
{
211+
"max": {}
212+
},
213+
{
214+
"min": {}
215+
},
216+
{
217+
"percentiles": {}
218+
}
219+
]
220+
}
221+
],
201222
"interval": "1m",
202223
"identity": [
203224
"metadata.labels.cluster_id",
@@ -222,21 +243,24 @@ PUT _rollup/jobs/rollup_node_stats?replace
222243
}
223244
}
224245

225-
DELETE _rollup/jobs/rollup_shard_stats_metrics
226-
PUT _rollup/jobs/rollup_shard_stats_metrics?replace
246+
DELETE /_rollup/jobs/rollup_shard_stats_metrics
247+
PUT /_rollup/jobs/rollup_shard_stats_metrics
227248
{
228249
"rollup": {
229250
"source_index": ".infini_metrics",
230251
"target_index": "rollup_shard_stats_metrics_{{ctx.source_index}}",
231252
"timestamp": "timestamp",
232253
"continuous": true,
233-
"page_size": 100,
254+
"page_size": 200,
234255
"cron": "*/5 1-23 * * *",
235256
"timezone": "UTC",
236257
"stats": [
237258
{
238259
"max": {}
239260
},
261+
{
262+
"min": {}
263+
},
240264
{
241265
"value_count": {}
242266
}
@@ -265,8 +289,8 @@ PUT _rollup/jobs/rollup_shard_stats_metrics?replace
265289
}
266290
}
267291

268-
DELETE _rollup/jobs/rollup_shard_stats_state
269-
PUT _rollup/jobs/rollup_shard_stats_state?replace
292+
DELETE /_rollup/jobs/rollup_shard_stats_state
293+
PUT /_rollup/jobs/rollup_shard_stats_state
270294
{
271295
"rollup": {
272296
"source_index": ".infini_metrics",
@@ -301,4 +325,37 @@ PUT _rollup/jobs/rollup_shard_stats_state?replace
301325
"metadata.name": "shard_stats"
302326
}
303327
}
304-
}
328+
}
329+
330+
# enable rollup search
331+
PUT /_cluster/settings
332+
{
333+
"persistent": {
334+
"rollup": {
335+
"search": {
336+
"enabled": "true"
337+
}
338+
}
339+
}
340+
}
341+
342+
# update index settings
343+
PUT /.easysearch-ilm-config/_settings
344+
{
345+
"index": {
346+
"mapping": {
347+
"nested_fields": {
348+
"limit": 1000
349+
},
350+
"nested_objects": {
351+
"limit": 20000
352+
},
353+
"total_fields": {
354+
"limit": 30000
355+
}
356+
}
357+
}
358+
}
359+
360+
# start all rollup jobs
361+
POST /_rollup/jobs/rollup*/_start

plugin/setup/setup.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ func (module *Module) initializeTemplate(w http.ResponseWriter, r *http.Request,
708708
elastic2.InitTemplate(true)
709709
case "rollup":
710710
if ver.Distribution == elastic.Easysearch {
711-
if large, _ := util.VersionCompare(ver.Number, "1.9.2"); large > 0 {
711+
if large, _ := util.VersionCompare(ver.Number, "1.10.0"); large > 0 {
712712
useCommon = false
713713
dslTplFileName = "template_rollup.tpl"
714714
}

0 commit comments

Comments
 (0)