rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-08-31 12:48:45 +00:00
Code Issues Releases Wiki Activity

add logging ssl

Browse Source
This commit is contained in:
Aiwantaozi
2018-06-12 09:37:13 +08:00
committed by Alena Prokharchyk
parent 206bab2696
commit c475cc0c27
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apis/management.cattle.io/v3/k8s_defaults.go
View File

@@ -300,7 +300,7 @@ var (
PluginsDocker: m("plugins/docker:17.12"),
},
LoggingSystemImages: LoggingSystemImages{
Fluentd: m("rancher/fluentd:v0.1.7"),
Fluentd: m("rancher/fluentd:v0.1.8"),
FluentdHelper: m("rancher/fluentd-helper:v0.1.2"),
LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.3"),
Elaticsearch: m("quay.io/pires/docker-elasticsearch-kubernetes:5.6.2"),

38
apis/management.cattle.io/v3/logging_types.go
View File

@@ -40,9 +40,9 @@ type ProjectLogging struct {
type LoggingCommonSpec struct {
DisplayName string `json:"displayName,omitempty"`
OutputFlushInterval int `json:"outputFlushInterval,omitempty" norman:"default=3"`
OutputTags map[string]string `json:"outputTags,omitempty"`
OutputFlushInterval int `json:"outputFlushInterval,omitempty" norman:"default=3"`
OutputTags map[string]string `json:"outputTags,omitempty"`
DockerRootDir string `json:"dockerRootDir" norman:"default=/var/lib/docker/containers"`
ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty"`
SplunkConfig *SplunkConfig `json:"splunkConfig,omitempty"`
KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty"`
@@ -94,19 +94,28 @@ type LoggingCondition struct {
}
type ElasticsearchConfig struct {
Endpoint string `json:"endpoint,omitempty" norman:"required"`
IndexPrefix string `json:"indexPrefix,omitempty" norman:"required"`
DateFormat string `json:"dateFormat,omitempty" norman:"required,type=enum,options=YYYY-MM-DD|YYYY-MM|YYYY,default=YYYY-MM-DD"`
AuthUserName string `json:"authUsername,omitempty"` //secret
AuthPassword string `json:"authPassword,omitempty"` //secret
SSLVerify bool `json:"sslVerify,omitempty" norman:"required,default=true"`
Endpoint string `json:"endpoint,omitempty" norman:"required"`
IndexPrefix string `json:"indexPrefix,omitempty" norman:"required"`
DateFormat string `json:"dateFormat,omitempty" norman:"required,type=enum,options=YYYY-MM-DD|YYYY-MM|YYYY,default=YYYY-MM-DD"`
AuthUserName string `json:"authUsername,omitempty"` //secret
AuthPassword string `json:"authPassword,omitempty"` //secret
Certificate string `json:"certificate"`
ClientCert string `json:"clientCert"`
ClientKey string `json:"clientKey"`
ClientKeyPass string `json:"clientKeyPass"`
SSLVerify bool `json:"sslVerify"`
}
type SplunkConfig struct {
Endpoint string `json:"endpoint,omitempty" norman:"required"`
Source string `json:"source,omitempty"`
Token string `json:"token,omitempty" norman:"required"` //secret
SSLVerify bool `json:"sslVerify,omitempty" norman:"required,default=true"`
Endpoint string `json:"endpoint,omitempty" norman:"required"`
Source string `json:"source,omitempty"`
Token string `json:"token,omitempty" norman:"required"` //secret
Certificate string `json:"certificate"`
ClientCert string `json:"clientCert"`
ClientKey string `json:"clientKey"`
ClientKeyPass string `json:"clientKeyPass"`
SSLVerify bool `json:"sslVerify"`
Index string `json:"index"`
}
type EmbeddedConfig struct {
@@ -124,6 +133,9 @@ type KafkaConfig struct {
ZookeeperEndpoint string `json:"zookeeperEndpoint,omitempty"`
BrokerEndpoints []string `json:"brokerEndpoints,omitempty"`
Topic string `json:"topic,omitempty" norman:"required"`
Certificate string `json:"certificate"`
ClientCert string `json:"clientCert"`
ClientKey string `json:"clientKey"`
}
type SyslogConfig struct {