admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log: remove redudant wrapper

Browse Source 
Signed-off-by: huanggze <loganhuang@yunify.com>
This commit is contained in:
huanggze
2019-05-06 21:54:39 +08:00
committed by zryfish
parent e115feeb8a
commit 85836e2e1a
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/simple/client/elasticsearch/esclient.go
View File

@@ -76,14 +76,6 @@ type MainQuery struct {
} }
type MainBoolQuery struct { type MainBoolQuery struct {
MainFilter MainFilter `json:"filter"`
}
type MainFilter struct {
FilterBoolQuery FilterBoolQuery `json:"bool"`
}
type FilterBoolQuery struct {
Musts []interface{} `json:"must"` Musts []interface{} `json:"must"`
} }
@@ -195,7 +187,7 @@ func createQueryRequest(param QueryParameters) (int, []byte, error) {
} }
} }
shouldMatchPhrase.MinimumShouldMatch = 1 shouldMatchPhrase.MinimumShouldMatch = 1
mainBoolQuery.MainFilter.FilterBoolQuery.Musts = append(mainBoolQuery.MainFilter.FilterBoolQuery.Musts, BoolShouldMatchPhrase{shouldMatchPhrase}) mainBoolQuery.Musts = append(mainBoolQuery.Musts, BoolShouldMatchPhrase{shouldMatchPhrase})
} }
if param.PodFilled { if param.PodFilled {
var shouldMatchPhrase ShouldMatchPhrase var shouldMatchPhrase ShouldMatchPhrase
@@ -209,7 +201,7 @@ func createQueryRequest(param QueryParameters) (int, []byte, error) {
} }
} }
shouldMatchPhrase.MinimumShouldMatch = 1 shouldMatchPhrase.MinimumShouldMatch = 1
mainBoolQuery.MainFilter.FilterBoolQuery.Musts = append(mainBoolQuery.MainFilter.FilterBoolQuery.Musts, BoolShouldMatchPhrase{shouldMatchPhrase}) mainBoolQuery.Musts = append(mainBoolQuery.Musts, BoolShouldMatchPhrase{shouldMatchPhrase})
} }
if param.ContainerFilled { if param.ContainerFilled {
var shouldMatchPhrase ShouldMatchPhrase var shouldMatchPhrase ShouldMatchPhrase
@@ -223,29 +215,29 @@ func createQueryRequest(param QueryParameters) (int, []byte, error) {
} }
} }
shouldMatchPhrase.MinimumShouldMatch = 1 shouldMatchPhrase.MinimumShouldMatch = 1
mainBoolQuery.MainFilter.FilterBoolQuery.Musts = append(mainBoolQuery.MainFilter.FilterBoolQuery.Musts, BoolShouldMatchPhrase{shouldMatchPhrase}) mainBoolQuery.Musts = append(mainBoolQuery.Musts, BoolShouldMatchPhrase{shouldMatchPhrase})
} }
if param.NamespaceQuery != "" { if param.NamespaceQuery != "" {
match := Match{map[string]interface{}{"kubernetes.namespace_name": QueryWord{param.NamespaceQuery}}} match := Match{map[string]interface{}{"kubernetes.namespace_name": QueryWord{param.NamespaceQuery}}}
mainBoolQuery.MainFilter.FilterBoolQuery.Musts = append(mainBoolQuery.MainFilter.FilterBoolQuery.Musts, match) mainBoolQuery.Musts = append(mainBoolQuery.Musts, match)
} }
if param.PodQuery != "" { if param.PodQuery != "" {
match := Match{map[string]interface{}{"kubernetes.pod_name": QueryWord{param.PodQuery}}} match := Match{map[string]interface{}{"kubernetes.pod_name": QueryWord{param.PodQuery}}}
mainBoolQuery.MainFilter.FilterBoolQuery.Musts = append(mainBoolQuery.MainFilter.FilterBoolQuery.Musts, match) mainBoolQuery.Musts = append(mainBoolQuery.Musts, match)
} }
if param.ContainerQuery != "" { if param.ContainerQuery != "" {
match := Match{map[string]interface{}{"kubernetes.container_name": QueryWord{param.ContainerQuery}}} match := Match{map[string]interface{}{"kubernetes.container_name": QueryWord{param.ContainerQuery}}}
mainBoolQuery.MainFilter.FilterBoolQuery.Musts = append(mainBoolQuery.MainFilter.FilterBoolQuery.Musts, match) mainBoolQuery.Musts = append(mainBoolQuery.Musts, match)
} }
if param.LogQuery != "" { if param.LogQuery != "" {
match := Match{map[string]interface{}{"log": QueryWord{param.LogQuery}}} match := Match{map[string]interface{}{"log": QueryWord{param.LogQuery}}}
mainBoolQuery.MainFilter.FilterBoolQuery.Musts = append(mainBoolQuery.MainFilter.FilterBoolQuery.Musts, match) mainBoolQuery.Musts = append(mainBoolQuery.Musts, match)
} }
rangeQuery := RangeQuery{RangeSpec{TimeRange{param.StartTime, param.EndTime}}} rangeQuery := RangeQuery{RangeSpec{TimeRange{param.StartTime, param.EndTime}}}
mainBoolQuery.MainFilter.FilterBoolQuery.Musts = append(mainBoolQuery.MainFilter.FilterBoolQuery.Musts, rangeQuery) mainBoolQuery.Musts = append(mainBoolQuery.Musts, rangeQuery)
var operation int var operation int