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

fix events search bug when no events

Browse Source 
Signed-off-by: junotx <junotx@126.com>
This commit is contained in:
junotx
2020-07-22 11:25:59 +08:00
parent 26ac41d086
commit 393386a32a
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/simple/client/events/elasticsearch/clients.go
View File

@@ -98,7 +98,7 @@ func (c *ClientV6) parse(resp *es6api.Response, err error) (*Response, error) {
return nil, fmt.Errorf(resp.String()) return nil, fmt.Errorf(resp.String())
} }
var r struct { var r struct {
Hits *struct { Hits struct {
Total int64 `json:"total"` Total int64 `json:"total"`
Hits jsoniter.RawMessage `json:"hits"` Hits jsoniter.RawMessage `json:"hits"`
} `json:"hits"` } `json:"hits"`
@@ -128,7 +128,7 @@ func (c *ClientV7) parse(resp *es7api.Response, err error) (*Response, error) {
return nil, fmt.Errorf(resp.String()) return nil, fmt.Errorf(resp.String())
} }
var r struct { var r struct {
Hits *struct { Hits struct {
Total struct { Total struct {
Value int64 `json:"value"` Value int64 `json:"value"`
} `json:"total"` } `json:"total"`

25
pkg/simple/client/events/elasticsearch/elasticsearch.go
View File

@@ -49,9 +49,12 @@ func (es *elasticsearch) SearchEvents(filter *events.Filter, from, size int64,
Index: resolveIndexNames(es.opts.indexPrefix, filter.StartTime, filter.EndTime), Index: resolveIndexNames(es.opts.indexPrefix, filter.StartTime, filter.EndTime),
Body: bytes.NewBuffer(body), Body: bytes.NewBuffer(body),
}) })
if err != nil || resp == nil { if err != nil {
return nil, err return nil, err
} }
if resp == nil || len(resp.Hits.Hits) == 0 {
return &events.Events{}, nil
}
var innerHits []struct { var innerHits []struct {
*corev1.Event `json:"_source"` *corev1.Event `json:"_source"`
@@ -95,11 +98,17 @@ func (es *elasticsearch) CountOverTime(filter *events.Filter, interval string) (
Index: resolveIndexNames(es.opts.indexPrefix, filter.StartTime, filter.EndTime), Index: resolveIndexNames(es.opts.indexPrefix, filter.StartTime, filter.EndTime),
Body: bytes.NewBuffer(body), Body: bytes.NewBuffer(body),
}) })
if err != nil || resp == nil { if err != nil {
return nil, err return nil, err
} }
if resp == nil || resp.Aggregations == nil {
return &events.Histogram{}, nil
}
raw := resp.Aggregations[aggName] raw, ok := resp.Aggregations[aggName]
if !ok || len(raw) == 0 {
return &events.Histogram{}, nil
}
var agg struct { var agg struct {
Buckets []struct { Buckets []struct {
KeyAsString string `json:"key_as_string"` KeyAsString string `json:"key_as_string"`
@@ -142,11 +151,17 @@ func (es *elasticsearch) StatisticsOnResources(filter *events.Filter) (*events.S
Index: resolveIndexNames(es.opts.indexPrefix, filter.StartTime, filter.EndTime), Index: resolveIndexNames(es.opts.indexPrefix, filter.StartTime, filter.EndTime),
Body: bytes.NewBuffer(body), Body: bytes.NewBuffer(body),
}) })
if err != nil || resp == nil { if err != nil {
return nil, err return nil, err
} }
if resp == nil || resp.Aggregations == nil {
return &events.Statistics{}, nil
}
raw := resp.Aggregations[aggName] raw, ok := resp.Aggregations[aggName]
if !ok || len(raw) == 0 {
return &events.Statistics{}, nil
}
var agg struct { var agg struct {
Value int64 `json:"value"` Value int64 `json:"value"`
} }