diff --git a/pkg/apiserver/auditing/backend.go b/pkg/apiserver/auditing/backend.go
index 078010156..57060bbf8 100644
--- a/pkg/apiserver/auditing/backend.go
+++ b/pkg/apiserver/auditing/backend.go
@@ -23,7 +23,7 @@ import (
 	"encoding/json"
 	"k8s.io/klog"
 	"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"
 	"time"
 )
diff --git a/pkg/apiserver/auditing/types.go b/pkg/apiserver/auditing/types.go
index 14e92f1bc..332af205e 100644
--- a/pkg/apiserver/auditing/types.go
+++ b/pkg/apiserver/auditing/types.go
@@ -37,7 +37,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/informers"
 	"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3"
 	"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"
 	"net"
 	"net/http"
diff --git a/pkg/simple/client/auditing/options.go b/pkg/simple/client/auditing/options.go
index 11824a9ca..bd3f2ee25 100644
--- a/pkg/simple/client/auditing/options.go
+++ b/pkg/simple/client/auditing/options.go
@@ -65,7 +65,6 @@ func (s *Options) AddFlags(fs *pflag.FlagSet, c *Options) {
 		"The batch size of auditing events.")
 	fs.DurationVar(&s.EventBatchInterval, "auditing-event-batch-interval", c.EventBatchInterval,
 		"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, ""+
 		"Elasticsearch service host. KubeSphere is using elastic as auditing store, "+
diff --git a/pkg/simple/client/es/query/builder.go b/pkg/simple/client/es/query/builder.go
index ec40a6077..27a4fa1b2 100644
--- a/pkg/simple/client/es/query/builder.go
+++ b/pkg/simple/client/es/query/builder.go
@@ -334,7 +334,7 @@ func (m *Regexp) IsValid() bool {
 	return true
 }
 
-func NewRegexp(key, val string) *Regexp {
+func NewRegex(key, val string) *Regexp {
 	return &Regexp{
 		Regexp: map[string]string{
 			key: val,
diff --git a/pkg/simple/client/logging/elasticsearch/elasticsearch.go b/pkg/simple/client/logging/elasticsearch/elasticsearch.go
index aa192799e..874f9e681 100644
--- a/pkg/simple/client/logging/elasticsearch/elasticsearch.go
+++ b/pkg/simple/client/logging/elasticsearch/elasticsearch.go
@@ -236,7 +236,7 @@ func parseToQueryPart(sf logging.SearchFilter) *query.Query {
 	if sf.WorkloadFilter != nil {
 		bi := query.NewBool().WithMinimumShouldMatch(mini)
 		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)
@@ -280,27 +280,27 @@ func parseToQueryPart(sf logging.SearchFilter) *query.Query {
 	return query.NewQuery().WithBool(b)
 }
 
-func podNameRegexp(workloadName string) string {
-	var regexp string
+func podNameRegex(workloadName string) string {
+	var regex string
 	if len(workloadName) <= podNameMaxLength-replicaSetSuffixMaxLength-podNameSuffixLength {
 		// match deployment pods, eg. <deploy>-579dfbcddd-24znw
 		// 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
-		regexp += workloadName + "-[bcdfghjklmnpqrstvwxz2456789]{1,10}-[a-z0-9]{5}|"
+		regex += workloadName + "-[bcdfghjklmnpqrstvwxz2456789]{1,10}-[a-z0-9]{5}|"
 		// 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
-		regexp += workloadName + "-[a-z0-9]{5}"
+		regex += workloadName + "-[a-z0-9]{5}"
 	} else if len(workloadName) <= podNameMaxLength-podNameSuffixLength {
 		replicaSetSuffixLength := podNameMaxLength - podNameSuffixLength - len(workloadName)
-		regexp += fmt.Sprintf("%s%d%s", workloadName+"-[bcdfghjklmnpqrstvwxz2456789]{", replicaSetSuffixLength, "}[a-z0-9]{5}|")
-		regexp += workloadName + "-[0-9]+|"
-		regexp += workloadName + "-[a-z0-9]{5}"
+		regex += fmt.Sprintf("%s%d%s", workloadName+"-[bcdfghjklmnpqrstvwxz2456789]{", replicaSetSuffixLength, "}[a-z0-9]{5}|")
+		regex += workloadName + "-[0-9]+|"
+		regex += workloadName + "-[a-z0-9]{5}"
 	} else {
 		// 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.
-		regexp += workloadName[:podNameMaxLength-podNameSuffixLength+1] + "[a-z0-9]{5}|"
-		regexp += workloadName + "-[0-9]+"
+		regex += workloadName[:podNameMaxLength-podNameSuffixLength+1] + "[a-z0-9]{5}|"
+		regex += workloadName + "-[0-9]+"
 	}
-	return regexp
+	return regex
 }