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

Merge pull request #3447 from wanjunlei/es

Browse Source 
fix bug can not search auditing logs with nil namespace
This commit is contained in:
KubeSphere CI Bot
2021-03-11 11:40:01 +08:00
committed by GitHub
parent 93ede4b770 a6cb91e6fb
commit 4f8fc3d483
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,14 +114,14 @@ func parseToQueryPart(f *auditing.Filter) *query.Query {
bi := query.NewBool().WithMinimumShouldMatch(mini)
for k, v := range f.ObjectRefNamespaceMap {
bi.AppendShould(query.NewBool().
AppendFilter(query.NewMatchPhrase("ObjectRef.Namespace", k)).
AppendFilter(query.NewMatchPhrase("ObjectRef.Namespace.keyword", k)).
AppendFilter(query.NewRange("RequestReceivedTimestamp").
WithGTE(v)))
}
for k, v := range f.WorkspaceMap {
bi.AppendShould(query.NewBool().
AppendFilter(query.NewMatchPhrase("Workspace", k)).
AppendFilter(query.NewMatchPhrase("Workspace.keyword", k)).
AppendFilter(query.NewRange("RequestReceivedTimestamp").
WithGTE(v)))
}
@@ -159,10 +159,10 @@ func parseToQueryPart(f *auditing.Filter) *query.Query {
b.AppendFilter(bi)
b.AppendFilter(query.NewBool().
AppendMultiShould(query.NewMultiMatchPhrase("Verb", f.Verbs)).
AppendMultiShould(query.NewMultiMatchPhrase("Verb.keyword", f.Verbs)).
WithMinimumShouldMatch(mini))
b.AppendFilter(query.NewBool().
AppendMultiShould(query.NewMultiMatchPhrase("Level", f.Levels)).
AppendMultiShould(query.NewMultiMatchPhrase("Level.keyword", f.Levels)).
WithMinimumShouldMatch(mini))
bi = query.NewBool().WithMinimumShouldMatch(mini)
@@ -197,7 +197,7 @@ func parseToQueryPart(f *auditing.Filter) *query.Query {
AppendShould(query.NewTerms("ResponseStatus.code", f.ResponseCodes)).
WithMinimumShouldMatch(mini))
b.AppendFilter(query.NewBool().
AppendMultiShould(query.NewMultiMatchPhrase("ResponseStatus.status", f.ResponseStatus)).
AppendMultiShould(query.NewMultiMatchPhrase("ResponseStatus.status.keyword", f.ResponseStatus)).
WithMinimumShouldMatch(mini))
r := query.NewRange("RequestReceivedTimestamp")

10
pkg/simple/client/auditing/elasticsearch/elasticsearch_test.go
View File

@@ -154,7 +154,7 @@ func TestParseToQueryPart(t *testing.T) {
"filter":[
{
"match_phrase":{
"ObjectRef.Namespace":"kubesphere-system"
"ObjectRef.Namespace.keyword":"kubesphere-system"
}
},
{
@@ -172,7 +172,7 @@ func TestParseToQueryPart(t *testing.T) {
"filter":[
{
"match_phrase":{
"Workspace":"system-workspace"
"Workspace.keyword":"system-workspace"
}
},
{
@@ -218,7 +218,7 @@ func TestParseToQueryPart(t *testing.T) {
"should":[
{
"match_phrase":{
"Verb":"create"
"Verb.keyword":"create"
}
}
],
@@ -230,7 +230,7 @@ func TestParseToQueryPart(t *testing.T) {
"should":[
{
"match_phrase":{
"Level":"Metadata"
"Level.keyword":"Metadata"
}
}
],
@@ -328,7 +328,7 @@ func TestParseToQueryPart(t *testing.T) {
"should":[
{
"match_phrase":{
"ResponseStatus.status":"Failure"
"ResponseStatus.status.keyword":"Failure"
}
}
],

10
pkg/simple/client/es/response.go
View File

@@ -6,9 +6,9 @@ import (
)
type Response struct {
ScrollId string `json:"_scroll_id,omitempty"`
Hits `json:"hits,omitempty"`
*Aggregations `json:"aggregations,omitempty"`
ScrollId string `json:"_scroll_id,omitempty"`
Hits `json:"hits,omitempty"`
Aggregations `json:"aggregations,omitempty"`
}
type Hits struct {
@@ -22,8 +22,8 @@ type Hit struct {
}
type Aggregations struct {
*CardinalityAggregation `json:"cardinality_aggregation,omitempty"`
*DateHistogramAggregation `json:"date_histogram_aggregation,omitempty"`
CardinalityAggregation `json:"cardinality_aggregation,omitempty"`
DateHistogramAggregation `json:"date_histogram_aggregation,omitempty"`
}
type CardinalityAggregation struct {

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

@@ -74,9 +74,6 @@ func (c *client) CountOverTime(filter *events.Filter, interval string) (*events.
if err != nil {
return nil, err
}
if resp == nil || resp.Aggregations.DateHistogramAggregation == nil {
return &events.Histogram{}, nil
}
histo := events.Histogram{Total: c.c.GetTotalHitCount(resp.Total)}
for _, bucket := range resp.Buckets {
@@ -98,9 +95,6 @@ func (c *client) StatisticsOnResources(filter *events.Filter) (*events.Statistic
if err != nil {
return nil, err
}
if resp == nil || resp.Aggregations.CardinalityAggregation == nil {
return &events.Statistics{}, nil
}
return &events.Statistics{
Resources: resp.Value,