IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Elasticsearch: Fix adding correct min_doc_count to all aggregation types in backend implementation (#59713)

Browse Source 
* Elasticsearch: Fix adding correct min_doc_count to all aggregation types in backend implementation

* Update snapshot tests

* Fix linting
This commit is contained in:
Ivana Huckova 2022-12-07 09:47:31 +01:00 committed by GitHub
parent dce7f50d59
commit 13acddd605
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/tsdb/elasticsearch/testdata_request/metric_complex.request.line1.json
View File

@ -29,6 +29,7 @@
}, },
"terms": { "terms": {
"field": "label", "field": "label",
"min_doc_count": 1,
"order": { "order": {
"_key": "desc" "_key": "desc"
}, },

1
pkg/tsdb/elasticsearch/testdata_request/metric_simple.request.line1.json
View File

@ -17,6 +17,7 @@
}, },
"terms": { "terms": {
"field": "label", "field": "label",
"min_doc_count": 1,
"order": { "order": {
"_key": "desc" "_key": "desc"
}, },

6
pkg/tsdb/elasticsearch/time_series_query.go
View File

@ -227,11 +227,7 @@ func (metricAggregation MetricAgg) generateSettingsForDSL() map[string]interface
} }
func (bucketAgg BucketAgg) generateSettingsForDSL() map[string]interface{} { func (bucketAgg BucketAgg) generateSettingsForDSL() map[string]interface{} {
// TODO: This might also need to be applied to other bucket aggregations and other fields. setIntPath(bucketAgg.Settings, "min_doc_count")
switch bucketAgg.Type {
case "date_histogram":
setIntPath(bucketAgg.Settings, "min_doc_count")
}
return bucketAgg.Settings.MustMap() return bucketAgg.Settings.MustMap()
} }

6
pkg/tsdb/elasticsearch/time_series_query_test.go
View File

@ -310,9 +310,9 @@ func TestExecuteTimeSeriesQuery(t *testing.T) {
sr := c.multisearchRequests[0].Requests[0] sr := c.multisearchRequests[0].Requests[0]
firstLevel := sr.Aggs[0] firstLevel := sr.Aggs[0]
require.Equal(t, firstLevel.Key, "2") require.Equal(t, firstLevel.Key, "2")
// FIXME: This is a bug in the current implementation. The min_doc_count is not set. termsAgg := firstLevel.Aggregation.Aggregation.(*es.TermsAggregation)
// termsAgg := firstLevel.Aggregation.Aggregation.(*es.TermsAggregation) expectedMinDocCount := 1
// require.Equal(t, termsAgg.MinDocCount, "1") require.Equal(t, termsAgg.MinDocCount, &expectedMinDocCount)
}) })
t.Run("With metric percentiles", func(t *testing.T) { t.Run("With metric percentiles", func(t *testing.T) {