File tree Expand file tree Collapse file tree 4 files changed +32
-3
lines changed
cmd/logging-operator/fluentd Expand file tree Collapse file tree 4 files changed +32
-3
lines changed Original file line number Diff line number Diff line change @@ -424,7 +424,7 @@ func newFluentdDeployment(fdc *fluentdDeploymentConfig) *extensionv1.Deployment
424424 Containers : []corev1.Container {
425425 {
426426 Name : "fluentd" ,
427- Image : "banzaicloud/fluentd:v1.1.3 " ,
427+ Image : "banzaicloud/fluentd:v1.1.4 " ,
428428 Ports : []corev1.ContainerPort {
429429 {
430430 Name : "monitor" ,
Original file line number Diff line number Diff line change 1+ package plugins
2+
3+ // AlibabaOutput CRD name
4+ const AlibabaOutput = "alibaba"
5+
6+ // AlibabaDefaultValues for Alibaba OSS output plugin
7+ var AlibabaDefaultValues = map [string ]string {
8+ "buffer_chunk_limit" : "256m" ,
9+ "buffer_path" : "/buffers/ali" ,
10+ "time_slice_format" : "%Y%m%d" ,
11+ "time_slice_wait" : "10m" ,
12+ }
13+
14+ // AlibabaTemplate for Alibaba OSS output plugin
15+ const AlibabaTemplate = `
16+ <match {{ .pattern }}.**>
17+ @type oss
18+ oss_key_id {{ .aliKeyId }}
19+ oss_key_secret {{ .aliKeySecret }}
20+ oss_bucket {{ .bucket }}
21+ oss_endpoint {{ .aliBucketEndpoint }}
22+ oss_object_key_format "%{time_slice}/%{host}-%{uuid}.%{file_ext}"
23+
24+ buffer_path /buffers/ali
25+ buffer_chunk_limit 256m
26+ time_slice_format %Y%m%d
27+ time_slice_wait 10m
28+ </match>`
Original file line number Diff line number Diff line change @@ -3,15 +3,15 @@ package plugins
33// AzureOutput CRD name
44const AzureOutput = "azure"
55
6- // AzureDefaultValues for Google Cloud Storage output plugin
6+ // AzureDefaultValues for Azure ObjectStore output plugin
77var AzureDefaultValues = map [string ]string {
88 "bufferTimeKey" : "3600" ,
99 "bufferTimeWait" : "10m" ,
1010 "bufferPath" : "/buffers/azure" ,
1111 "format" : "json" ,
1212}
1313
14- // AzureTemplate for Google Cloud Storage output plugin
14+ // AzureTemplate for Azure ObjectStore output plugin
1515const AzureTemplate = `
1616<match {{ .pattern }}.**>
1717 @type azurestorage
Original file line number Diff line number Diff line change @@ -45,5 +45,6 @@ func init() {
4545 RegisterPlugin (S3Output , S3Template , S3DefaultValues )
4646 RegisterPlugin (GCSOutput , GCSTemplate , GCSDefaultValues )
4747 RegisterPlugin (AzureOutput , AzureTemplate , AzureDefaultValues )
48+ RegisterPlugin (AlibabaOutput , AlibabaTemplate , AlibabaDefaultValues )
4849 RegisterPlugin (ParserFilter , ParserFilterTemplate , ParserFilterDefaultValues )
4950}
You can’t perform that action at this time.
0 commit comments