floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed date histogram agg search error

This commit is contained in:
liugq 2022-08-10 18:58:13 +08:00
parent 35b01d6645
commit c314e44b34
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/api/insight/metric_util.go
View File

@ -76,7 +76,7 @@ func GenerateQuery(metric *insight.Metric) (interface{}, error) {
} }
} }
targetESVersion := elastic.GetMetadata(metric.ClusterId).Config.Version targetESVersion := elastic.GetMetadata(metric.ClusterId).Config.Version
intervalField, err := elastic.GetDateHistogramIntervalField(targetESVersion) intervalField, err := elastic.GetDateHistogramIntervalField(targetESVersion, metric.BucketSize)
if err != nil { if err != nil {
return nil, fmt.Errorf("get interval field error: %w", err) return nil, fmt.Errorf("get interval field error: %w", err)
} }

8
service/alerting/elasticsearch/engine.go
View File

@ -58,14 +58,14 @@ func (engine *Engine) GenerateQuery(rule *alerting.Rule, filterParam *alerting.F
} }
} }
targetESVersion := elastic.GetMetadata(rule.Resource.ID).Config.Version targetESVersion := elastic.GetMetadata(rule.Resource.ID).Config.Version
intervalField, err := elastic.GetDateHistogramIntervalField(targetESVersion)
if err != nil {
return nil, fmt.Errorf("get interval field error: %w", err)
}
var periodInterval = rule.Metrics.BucketSize var periodInterval = rule.Metrics.BucketSize
if filterParam != nil && filterParam.BucketSize != "" { if filterParam != nil && filterParam.BucketSize != "" {
periodInterval = filterParam.BucketSize periodInterval = filterParam.BucketSize
} }
intervalField, err := elastic.GetDateHistogramIntervalField(targetESVersion, periodInterval )
if err != nil {
return nil, fmt.Errorf("get interval field error: %w", err)
}
timeAggs := util.MapStr{ timeAggs := util.MapStr{
"time_buckets": util.MapStr{ "time_buckets": util.MapStr{
"date_histogram": util.MapStr{ "date_histogram": util.MapStr{