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

fix bug auditing search error when es index is not exist

Browse Source
This commit is contained in:
wanjunlei
2020-06-28 14:40:44 +08:00
parent 52abbeb355
commit c4dcd086d0
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/simple/client/auditing/elasticsearch/elasticsearch.go
View File

@@ -112,7 +112,10 @@ func (es *Elasticsearch) CountOverTime(filter *auditing.Filter, interval string)
return nil, err return nil, err
} }
raw := resp.Aggregations[aggName] raw, ok := resp.Aggregations[aggName]
if !ok || len(raw) == 0 {
return &auditing.Histogram{}, nil
}
var agg struct { var agg struct {
Buckets []struct { Buckets []struct {
KeyAsString string `json:"key_as_string"` KeyAsString string `json:"key_as_string"`
@@ -123,12 +126,12 @@ func (es *Elasticsearch) CountOverTime(filter *auditing.Filter, interval string)
if err := json.Unmarshal(raw, &agg); err != nil { if err := json.Unmarshal(raw, &agg); err != nil {
return nil, err return nil, err
} }
histo := auditing.Histogram{Total: resp.Hits.Total} h := auditing.Histogram{Total: resp.Hits.Total}
for _, b := range agg.Buckets { for _, b := range agg.Buckets {
histo.Buckets = append(histo.Buckets, h.Buckets = append(h.Buckets,
auditing.Bucket{Time: b.Key, Count: b.DocCount}) auditing.Bucket{Time: b.Key, Count: b.DocCount})
} }
return &histo, nil return &h, nil
} }
func (es *Elasticsearch) StatisticsOnResources(filter *auditing.Filter) (*auditing.Statistics, error) { func (es *Elasticsearch) StatisticsOnResources(filter *auditing.Filter) (*auditing.Statistics, error) {
@@ -159,7 +162,10 @@ func (es *Elasticsearch) StatisticsOnResources(filter *auditing.Filter) (*auditi
return nil, err return nil, err
} }
raw := resp.Aggregations[aggName] raw, ok := resp.Aggregations[aggName]
if !ok || len(raw) == 0 {
return &auditing.Statistics{}, nil
}
var agg struct { var agg struct {
Value int64 `json:"value"` Value int64 `json:"value"`
} }