Skip to content

chore: moving primary shard filter from aggregations to query #31

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

Merged
luohoufu merged 1 commit into from
Dec 14, 2024
Merged

chore: moving primary shard filter from aggregations to query #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
82 changes: 36 additions & 46 deletions modules/elastic/api/index_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,30 +119,6 @@ func (h *APIHandler) getIndexMetrics(ctx context.Context, req *http.Request, clu
}

query:=map[string]interface{}{}
query["query"]=util.MapStr{
"bool": util.MapStr{
"must": must,
"must_not": []util.MapStr{
{
"term": util.MapStr{
"metadata.labels.index_name": util.MapStr{
"value": "_all",
},
},
},
},
"filter": []util.MapStr{
{
"range": util.MapStr{
"timestamp": util.MapStr{
"gte": min,
"lte": max,
},
},
},
},
},
}
indexMetricItems := []GroupMetricItem{}
switch metricKey {
case v1.IndexStorageMetricKey:
Expand Down Expand Up @@ -617,7 +593,6 @@ func (h *APIHandler) getIndexMetrics(ctx context.Context, req *http.Request, clu

aggs:=map[string]interface{}{}
sumAggs := util.MapStr{}
var filterSubAggs = util.MapStr{}

for _,metricItem:=range indexMetricItems {
leafAgg := util.MapStr{
Expand All @@ -626,22 +601,7 @@ func (h *APIHandler) getIndexMetrics(ctx context.Context, req *http.Request, clu
},
}
var sumBucketPath = "term_shard>"+ metricItem.ID
if metricItem.MetricItem.OnlyPrimary {
filterSubAggs[metricItem.ID] = leafAgg
aggs["filter_pri"]=util.MapStr{
"filter": util.MapStr{
"term": util.MapStr{
"payload.elasticsearch.shard_stats.routing.primary": util.MapStr{
"value": true,
},
},
},
"aggs": filterSubAggs,
}
sumBucketPath = "term_shard>filter_pri>"+ metricItem.ID
}else{
aggs[metricItem.ID]= leafAgg
}
aggs[metricItem.ID]= leafAgg

sumAggs[metricItem.ID] = util.MapStr{
"sum_bucket": util.MapStr{
Expand All @@ -655,11 +615,7 @@ func (h *APIHandler) getIndexMetrics(ctx context.Context, req *http.Request, clu
"field": metricItem.Field2,
},
}
if metricItem.MetricItem.OnlyPrimary {
filterSubAggs[metricItem.ID+"_field2"] = leafAgg2
}else{
aggs[metricItem.ID+"_field2"] = leafAgg2
}
aggs[metricItem.ID+"_field2"] = leafAgg2
sumAggs[metricItem.ID + "_field2"] = util.MapStr{
"sum_bucket": util.MapStr{
"buckets_path": sumBucketPath + "_field2",
Expand Down Expand Up @@ -695,6 +651,40 @@ func (h *APIHandler) getIndexMetrics(ctx context.Context, req *http.Request, clu
panic(err)
}

//we can do this because we are querying one metric once time
if indexMetricItems[0].MetricItem.OnlyPrimary {
must = append(must, util.MapStr{
"term": util.MapStr{
"payload.elasticsearch.shard_stats.routing.primary": util.MapStr{
"value": true,
},
},
})
}
query["query"]=util.MapStr{
"bool": util.MapStr{
"must": must,
"must_not": []util.MapStr{
{
"term": util.MapStr{
"metadata.labels.index_name": util.MapStr{
"value": "_all",
},
},
},
},
"filter": []util.MapStr{
{
"range": util.MapStr{
"timestamp": util.MapStr{
"gte": min,
"lte": max,
},
},
},
},
},
}
query["size"]=0
query["aggs"]= util.MapStr{
"group_by_level": util.MapStr{
Expand Down
Loading