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

resolve conversation

Browse Source 
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
This commit is contained in:
wanjunlei
2020-12-21 17:10:33 +08:00
parent 039507c9ae
commit 83c010c691
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/auditing/backend.go
View File

@@ -23,7 +23,7 @@ import (
"encoding/json" "encoding/json"
"k8s.io/klog" "k8s.io/klog"
"kubesphere.io/kubesphere/pkg/apiserver/auditing/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/auditing/v1alpha1"
options "kubesphere.io/kubesphere/pkg/simple/client/auditing/elasticsearch" options "kubesphere.io/kubesphere/pkg/simple/client/auditing"
"net/http" "net/http"
"time" "time"
) )

2
pkg/apiserver/auditing/types.go
View File

@@ -37,7 +37,7 @@ import (
"kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/informers"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/devops" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/devops"
options "kubesphere.io/kubesphere/pkg/simple/client/auditing/elasticsearch" options "kubesphere.io/kubesphere/pkg/simple/client/auditing"
"kubesphere.io/kubesphere/pkg/utils/iputil" "kubesphere.io/kubesphere/pkg/utils/iputil"
"net" "net"
"net/http" "net/http"

1
pkg/simple/client/auditing/options.go
View File

@@ -65,7 +65,6 @@ func (s *Options) AddFlags(fs *pflag.FlagSet, c *Options) {
"The batch size of auditing events.") "The batch size of auditing events.")
fs.DurationVar(&s.EventBatchInterval, "auditing-event-batch-interval", c.EventBatchInterval, fs.DurationVar(&s.EventBatchInterval, "auditing-event-batch-interval", c.EventBatchInterval,
"The batch interval of auditing events.") "The batch interval of auditing events.")
fs.StringVar(&s.WebhookUrl, "auditing-webhook-url", c.WebhookUrl, "Auditing webhook url")
fs.StringVar(&s.Host, "auditing-elasticsearch-host", c.Host, ""+ fs.StringVar(&s.Host, "auditing-elasticsearch-host", c.Host, ""+
"Elasticsearch service host. KubeSphere is using elastic as auditing store, "+ "Elasticsearch service host. KubeSphere is using elastic as auditing store, "+

2
pkg/simple/client/es/query/builder.go
View File

@@ -334,7 +334,7 @@ func (m *Regexp) IsValid() bool {
return true return true
} }
func NewRegexp(key, val string) *Regexp { func NewRegex(key, val string) *Regexp {
return &Regexp{ return &Regexp{
Regexp: map[string]string{ Regexp: map[string]string{
key: val, key: val,

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

@@ -236,7 +236,7 @@ func parseToQueryPart(sf logging.SearchFilter) *query.Query {
if sf.WorkloadFilter != nil { if sf.WorkloadFilter != nil {
bi := query.NewBool().WithMinimumShouldMatch(mini) bi := query.NewBool().WithMinimumShouldMatch(mini)
for _, wk := range sf.WorkloadFilter { for _, wk := range sf.WorkloadFilter {
bi.AppendShould(query.NewRegexp("kubernetes.pod_name.keyword", podNameRegexp(wk))) bi.AppendShould(query.NewRegex("kubernetes.pod_name.keyword", podNameRegex(wk)))
} }
b.AppendFilter(bi) b.AppendFilter(bi)
@@ -280,27 +280,27 @@ func parseToQueryPart(sf logging.SearchFilter) *query.Query {
return query.NewQuery().WithBool(b) return query.NewQuery().WithBool(b)
} }
func podNameRegexp(workloadName string) string { func podNameRegex(workloadName string) string {
var regexp string var regex string
if len(workloadName) <= podNameMaxLength-replicaSetSuffixMaxLength-podNameSuffixLength { if len(workloadName) <= podNameMaxLength-replicaSetSuffixMaxLength-podNameSuffixLength {
// match deployment pods, eg. <deploy>-579dfbcddd-24znw // match deployment pods, eg. <deploy>-579dfbcddd-24znw
// replicaset rand string is limited to vowels // replicaset rand string is limited to vowels
// https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/util/rand/rand.go#L83 // https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/util/rand/rand.go#L83
regexp += workloadName + "-[bcdfghjklmnpqrstvwxz2456789]{1,10}-[a-z0-9]{5}|" regex += workloadName + "-[bcdfghjklmnpqrstvwxz2456789]{1,10}-[a-z0-9]{5}|"
// match statefulset pods, eg. <sts>-0 // match statefulset pods, eg. <sts>-0
regexp += workloadName + "-[0-9]+|" regex += workloadName + "-[0-9]+|"
// match pods of daemonset or job, eg. <ds>-29tdk, <job>-5xqvl // match pods of daemonset or job, eg. <ds>-29tdk, <job>-5xqvl
regexp += workloadName + "-[a-z0-9]{5}" regex += workloadName + "-[a-z0-9]{5}"
} else if len(workloadName) <= podNameMaxLength-podNameSuffixLength { } else if len(workloadName) <= podNameMaxLength-podNameSuffixLength {
replicaSetSuffixLength := podNameMaxLength - podNameSuffixLength - len(workloadName) replicaSetSuffixLength := podNameMaxLength - podNameSuffixLength - len(workloadName)
regexp += fmt.Sprintf("%s%d%s", workloadName+"-[bcdfghjklmnpqrstvwxz2456789]{", replicaSetSuffixLength, "}[a-z0-9]{5}|") regex += fmt.Sprintf("%s%d%s", workloadName+"-[bcdfghjklmnpqrstvwxz2456789]{", replicaSetSuffixLength, "}[a-z0-9]{5}|")
regexp += workloadName + "-[0-9]+|" regex += workloadName + "-[0-9]+|"
regexp += workloadName + "-[a-z0-9]{5}" regex += workloadName + "-[a-z0-9]{5}"
} else { } else {
// Rand suffix may overwrites the workload name if the name is too long // Rand suffix may overwrites the workload name if the name is too long
// This won't happen for StatefulSet because long name will cause ReplicaSet fails during StatefulSet creation. // This won't happen for StatefulSet because long name will cause ReplicaSet fails during StatefulSet creation.
regexp += workloadName[:podNameMaxLength-podNameSuffixLength+1] + "[a-z0-9]{5}|" regex += workloadName[:podNameMaxLength-podNameSuffixLength+1] + "[a-z0-9]{5}|"
regexp += workloadName + "-[0-9]+" regex += workloadName + "-[0-9]+"
} }
return regexp return regex
} }