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

improve logging

Browse Source
This commit is contained in:
Aiwantaozi
2018-04-12 19:50:57 +08:00
parent 9edf6680b4
commit 61637dec1e
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,9 +193,9 @@ var (
PluginsDocker: m("plugins/docker"),
},
LoggingSystemImages: LoggingSystemImages{
Fluentd: m("rancher/fluentd:v0.1.6"),
Fluentd: m("rancher/fluentd:v0.1.7"),
FluentdHelper: m("rancher/fluentd-helper:v0.1.2"),
LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.2"),
LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.3"),
Elaticsearch: m("quay.io/pires/docker-elasticsearch-kubernetes:5.6.2"),
Kibana: m("kibana:5.6.4"),
Busybox: ToolsImage,

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

@@ -19,7 +19,7 @@ type ClusterLogging struct {
Spec ClusterLoggingSpec `json:"spec"`
// Most recent observed status of the cluster. More info:
// https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
Status LoggingStatus `json:"status"`
Status ClusterLoggingStatus `json:"status"`
}
type ProjectLogging struct {
@@ -34,7 +34,7 @@ type ProjectLogging struct {
Spec ProjectLoggingSpec `json:"spec"`
// Most recent observed status of the cluster. More info:
// https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#spec-and-status
Status LoggingStatus `json:"status"`
Status ProjectLoggingStatus `json:"status"`
}
type LoggingCommonSpec struct {
@@ -62,13 +62,19 @@ type ProjectLoggingSpec struct {
ProjectName string `json:"projectName" norman:"type=reference[project]"`
}
type LoggingStatus struct {
Conditions []LoggingCondition `json:"conditions,omitempty"`
type ClusterLoggingStatus struct {
Conditions []LoggingCondition `json:"conditions,omitempty"`
AppliedSpec ClusterLoggingSpec `json:"appliedSpec,omitempty"`
}
type ProjectLoggingStatus struct {
Conditions []LoggingCondition `json:"conditions,omitempty"`
AppliedSpec ProjectLoggingSpec `json:"appliedSpec,omitempty"`
}
var (
ClusterLoggingConditionInitialized condition.Cond = "Initialized"
ClusterLoggingConditionProvisioned condition.Cond = "Provisioned"
LoggingConditionProvisioned condition.Cond = "Provisioned"
LoggingConditionUpdated condition.Cond = "Updated"
)
type LoggingCondition struct {
@@ -105,10 +111,10 @@ type EmbeddedConfig struct {
DateFormat string `json:"dateFormat,omitempty" norman:"required,type=enum,options=YYYY-MM-DD|YYYY-MM|YYYY,default=YYYY-MM-DD"`
ElasticsearchEndpoint string `json:"elasticsearchEndpoint,omitempty" norman:"nocreate"`
KibanaEndpoint string `json:"kibanaEndpoint,omitempty" norman:"nocreate"`
RequestsMemery int `json:"requestsMemory,omitempty" norman:"default=500,min=500"`
RequestsCPU int `json:"requestsCpu,omitempty" norman:"default=1000,min=1000"`
LimitsMemery int `json:"limitsMemory,omitempty"`
LimitsCPU int `json:"limitsCpu,omitempty"`
RequestsMemery int `json:"requestsMemory,omitempty" norman:"default=4096,min=512"`
RequestsCPU int `json:"requestsCpu,omitempty" norman:"default=2000,min=1000"`
LimitsMemery int `json:"limitsMemory,omitempty" norman:"default=4096,min=512"`
LimitsCPU int `json:"limitsCpu,omitempty" norman:"default=2000,min=1000"`
}
type KafkaConfig struct {