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

remove sample agg when filter is not empty

This commit is contained in:
liugq 2022-08-15 15:26:00 +08:00
parent 8bdc07e041
commit 959132f067
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/permission.json
View File

@ -281,6 +281,9 @@
{"name": "indices.exists_template", "methods":["get"], {"name": "indices.exists_template", "methods":["get"],
"path": "/_template/:name" "path": "/_template/:name"
}, },
{"name": "indices.field_usage_stats", "methods":["get"],
"path": "/:index_name/_field_usage_stats"
},
{"name": "doc.*", "methods": ["*"], {"name": "doc.*", "methods": ["*"],
"path": "/:index_name/:doctype" "path": "/:index_name/:doctype"
}, },

2
env_check.go
View File

@ -67,7 +67,7 @@ func checkElasticsearchRequire() error{
versionNumber, err := jsonparser.GetString(result.Body, "version", "number") versionNumber, err := jsonparser.GetString(result.Body, "version", "number")
if err != nil { if err != nil {
return fmt.Errorf("check elasticsearch requirement error: %v", err) return fmt.Errorf("check elasticsearch requirement error: %v, got response: %s", err, string(result.Body))
} }
cr, err := util.VersionCompare(versionNumber, "7.3") cr, err := util.VersionCompare(versionNumber, "7.3")
if err !=nil { if err !=nil {

2
main.go
View File

@ -15,6 +15,7 @@ import (
_ "infini.sh/framework/core/log" _ "infini.sh/framework/core/log"
"infini.sh/framework/core/module" "infini.sh/framework/core/module"
"infini.sh/framework/core/orm" "infini.sh/framework/core/orm"
"infini.sh/framework/modules/agent"
_ "infini.sh/framework/modules/api" _ "infini.sh/framework/modules/api"
elastic2 "infini.sh/framework/modules/elastic" elastic2 "infini.sh/framework/modules/elastic"
"infini.sh/framework/modules/filter" "infini.sh/framework/modules/filter"
@ -73,6 +74,7 @@ func main() {
module.RegisterSystemModule(&ui.UIModule{}) module.RegisterSystemModule(&ui.UIModule{})
module.RegisterSystemModule(&pipeline.PipeModule{}) module.RegisterSystemModule(&pipeline.PipeModule{})
module.RegisterSystemModule(&task.TaskModule{}) module.RegisterSystemModule(&task.TaskModule{})
module.RegisterSystemModule(&agent.AgentModule{})
module.RegisterUserPlugin(&metrics.MetricsModule{}) module.RegisterUserPlugin(&metrics.MetricsModule{})

11
plugin/api/insight/metadata.go
View File

@ -335,10 +335,10 @@ func getMetadataByIndexPattern(clusterID, indexPattern, timeField string, filter
if timeField == "" { if timeField == "" {
seriesType = "pie" seriesType = "pie"
}else { }else {
//if aggField.Type == "string"{ if aggField.Type == "string"{
seriesType = "column" seriesType = "column"
options["seriesField"] = "group" options["seriesField"] = "group"
//} }
} }
} }
var defaultAggType string var defaultAggType string
@ -414,6 +414,7 @@ func countFieldValue(fields []string, clusterID, indexPattern string, filter int
} }
if filter != nil { if filter != nil {
queryDsl["query"] = filter queryDsl["query"] = filter
queryDsl["aggs"] = aggs
} }
esClient := elastic.GetClient(clusterID) esClient := elastic.GetClient(clusterID)
searchRes, err := esClient.SearchWithRawQueryDSL(indexPattern, util.MustToJSONBytes(queryDsl)) searchRes, err := esClient.SearchWithRawQueryDSL(indexPattern, util.MustToJSONBytes(queryDsl))
@ -433,6 +434,12 @@ func countFieldValue(fields []string, clusterID, indexPattern string, filter int
fieldsCount[key] = mAgg["value"].(float64) fieldsCount[key] = mAgg["value"].(float64)
} }
} }
}else{
for key, agg := range aggsM {
if mAgg, ok := agg.(map[string]interface{});ok{
fieldsCount[key] = mAgg["value"].(float64)
}
}
} }
} }