fix fluentbit operator not support Time_Key_Nanos field bug

fluent · Mar 24, 2022 · 190bb88 · 190bb88
1 parent 2885c57
commit 190bb88
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/apis/fluentbit/v1alpha2/plugins/output/elasticsearch_types.go b/apis/fluentbit/v1alpha2/plugins/output/elasticsearch_types.go
@@ -70,6 +70,8 @@ type Elasticsearch struct {
 	TimeKey string `json:"timeKey,omitempty"`
 	// When Logstash_Format is enabled, this property defines the format of the timestamp.
 	TimeKeyFormat string `json:"timeKeyFormat,omitempty"`
+	// When Logstash_Format is enabled, enabling this property sends nanosecond precision timestamps.
+	TimeKeyNanos *bool `json:"timeKeyNanos,omitempty"`
 	// When enabled, it append the Tag name to the record.
 	IncludeTagKey *bool `json:"includeTagKey,omitempty"`
 	// When Include_Tag_Key is enabled, this property defines the key name for the tag.
@@ -173,6 +175,9 @@ func (es *Elasticsearch) Params(sl plugins.SecretLoader) (*params.KVs, error) {
 	if es.TimeKeyFormat != "" {
 		kvs.Insert("Time_Key_Format", es.TimeKeyFormat)
 	}
+	if es.TimeKeyNanos != nil {
+		kvs.Insert("Time_Key_Nanos", fmt.Sprint(*es.TimeKeyNanos))
+	}
 	if es.IncludeTagKey != nil {
 		kvs.Insert("Include_Tag_Key", fmt.Sprint(*es.IncludeTagKey))
 	}

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -268,6 +268,10 @@ spec:
                     description: When Logstash_Format is enabled, this property defines
                       the format of the timestamp.
                     type: string
+                  timeKeyNanos:
+                    description: When Logstash_Format is enabled, enabling this property
+                      sends nanosecond precision timestamps.
+                    type: boolean
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer

diff --git a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
@@ -268,6 +268,10 @@ spec:
                     description: When Logstash_Format is enabled, this property defines
                       the format of the timestamp.
                     type: string
+                  timeKeyNanos:
+                    description: When Logstash_Format is enabled, enabling this property
+                      sends nanosecond precision timestamps.
+                    type: boolean
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer

diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
@@ -1958,6 +1958,10 @@ spec:
                     description: When Logstash_Format is enabled, this property defines
                       the format of the timestamp.
                     type: string
+                  timeKeyNanos:
+                    description: When Logstash_Format is enabled, enabling this property
+                      sends nanosecond precision timestamps.
+                    type: boolean
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer

diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
@@ -1958,6 +1958,10 @@ spec:
                     description: When Logstash_Format is enabled, this property defines
                       the format of the timestamp.
                     type: string
+                  timeKeyNanos:
+                    description: When Logstash_Format is enabled, enabling this property
+                      sends nanosecond precision timestamps.
+                    type: boolean
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer