feat(persistentevent): allow es user and passowrd; update image versi…

…on (tkestack#903) [+] add domain regex, es auth add(logc): es password base64 add(persistentevent): UI support ES Auth add(persistentevent): psw encode, %{} to fluentd add(persistentevent): fixed input style width ES: es detection add(web): logc es detection, http request timeout add(web): persistentEvent es detection add(web): ES detection button disabled add(web): es host and index required feat(es auth): update pb Co-authored-by: yiwenshao <[email protected]>
k8ssphere · Nov 17, 2020 · 02b5b3b · 02b5b3b
1 parent 627ed57
commit 02b5b3b
Show file tree

Hide file tree

Showing 49 changed files with 1,688 additions and 438 deletions.
diff --git a/api/logagent/register.go b/api/logagent/register.go
@@ -66,6 +66,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
  &LogFileTree{},
  &LogFileContent{},
  &LogFileProxyOptions{},
+ &LogEsDetection{},
  &ConfigMap{},
  &ConfigMapList{},
  )

diff --git a/api/logagent/types.go b/api/logagent/types.go
@@ -163,7 +163,18 @@ type LogFileProxyOptions struct {
  Container string `json:"container,omitempty"`
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// LogEsDetection
+type LogEsDetection struct {
+ metav1.TypeMeta `json:",inline"`
 
+ Scheme string `json:"scheme,omitempty"`
+ IP string `json:"ip,omitempty"`
+ Port string `json:"port,omitempty"`
+ User string `json:"user,omitempty"`
+ Password string `json:"password,omitempty"`
+}
 
 // +genclient
 // +genclient:nonNamespaced

diff --git a/api/logagent/v1/generated.pb.go b/api/logagent/v1/generated.pb.go
diff --git a/api/logagent/v1/generated.proto b/api/logagent/v1/generated.proto
diff --git a/api/logagent/v1/register.go b/api/logagent/v1/register.go
@@ -54,6 +54,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
  &LogFileTree{},
  &LogFileContent{},
  &LogFileProxyOptions{},
+ &LogEsDetection{},
  &ConfigMap{},
  &ConfigMapList{},
  )

diff --git a/api/logagent/v1/types.go b/api/logagent/v1/types.go
@@ -150,6 +150,19 @@ type LogFileProxyOptions struct {
  Container string `json:"container,omitempty" protobuf:"bytes,3,opt,name=container"`
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// LogEsDetection
+type LogEsDetection struct {
+ metav1.TypeMeta `json:",inline"`
+
+ Scheme string `json:"scheme,omitempty" protobuf:"bytes,1,opt,name=scheme"`
+ IP string `json:"ip,omitempty" protobuf:"bytes,2,opt,name=ip"`
+ Port string `json:"port,omitempty" protobuf:"bytes,3,opt,name=port"`
+ User string `json:"user,omitempty" protobuf:"bytes,4,opt,name=user"`
+ Password string `json:"password,omitempty" protobuf:"bytes,5,opt,name=password"`
+}
+
 // +genclient
 // +genclient:nonNamespaced
 // +genclient:skipVerbs=deleteCollection

diff --git a/api/logagent/v1/types_swagger_doc_generated.go b/api/logagent/v1/types_swagger_doc_generated.go
diff --git a/api/logagent/v1/zz_generated.conversion.go b/api/logagent/v1/zz_generated.conversion.go
diff --git a/api/logagent/v1/zz_generated.deepcopy.go b/api/logagent/v1/zz_generated.deepcopy.go
diff --git a/api/logagent/zz_generated.deepcopy.go b/api/logagent/zz_generated.deepcopy.go
diff --git a/api/openapi/zz_generated.openapi.go b/api/openapi/zz_generated.openapi.go
diff --git a/api/platform/types.go b/api/platform/types.go
@@ -758,6 +758,9 @@ type StorageBackEndES struct {
  Port int32
  Scheme string
  IndexName string
+ User string
+ Password string
+ ReserveDays int32
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object