Merge 9fe3827e72 into fe03f32597

apis/management.cattle.io/v3/logging_types.go

@@ -61,6 +61,7 @@ type LoggingTargets struct {
 	SyslogConfig          *SyslogConfig          `json:"syslogConfig,omitempty"`
 	FluentForwarderConfig *FluentForwarderConfig `json:"fluentForwarderConfig,omitempty"`
 	CustomTargetConfig    *CustomTargetConfig    `json:"customTargetConfig,omitempty"`
+	GraylogConfig         *GraylogConfig         `json:"graylogConfig,omitempty"`
 }
 
 type ClusterLoggingSpec struct {
@@ -198,6 +199,16 @@ type CustomTargetConfig struct {
 	ClientKey   string `json:"clientKey,omitempty"`
 }
 
+type GraylogConfig struct {
+	Endpoint    string `json:"endpoint,omitempty" norman:"required"`
+	Protocol    string `json:"protocol,omitempty" norman:"default=udp,type=enum,options=udp|tcp"`
+	EnableTLS   bool   `json:"enableTls,omitempty" norman:"default=false"`
+	Certificate string `json:"certificate,omitempty"`
+	ClientCert  string `json:"clientCert,omitempty"`
+	ClientKey   string `json:"clientKey,omitempty"`
+	SSLVerify   bool   `json:"sslVerify,omitempty"`
+}
+
 type ClusterTestInput struct {
 	ClusterName string `json:"clusterId" norman:"required,type=reference[cluster]"`
 	LoggingTargets

apis/management.cattle.io/v3/zz_generated_deepcopy.go

@@ -4291,6 +4291,22 @@ func (in *GoogleOauthConfigTestOutput) DeepCopy() *GoogleOauthConfigTestOutput {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *GraylogConfig) DeepCopyInto(out *GraylogConfig) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GraylogConfig.
+func (in *GraylogConfig) DeepCopy() *GraylogConfig {
+	if in == nil {
+		return nil
+	}
+	out := new(GraylogConfig)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Group) DeepCopyInto(out *Group) {
 	*out = *in
@@ -5236,6 +5252,11 @@ func (in *LoggingTargets) DeepCopyInto(out *LoggingTargets) {
 		*out = new(CustomTargetConfig)
 		**out = **in
 	}
+	if in.GraylogConfig != nil {
+		in, out := &in.GraylogConfig, &out.GraylogConfig
+		*out = new(GraylogConfig)
+		**out = **in
+	}
 	return
 }