Merge branch 'master' into vmware-log-intelligence-output

kube-logging · Mar 5, 2024 · 8abdae6 · 8abdae6
2 parents d2f2b1f + 2a5dcab
commit 8abdae6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 0 deletions.
diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusteroutputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusteroutputs.yaml
@@ -138,6 +138,8 @@ spec:
                     type: object
                   retries:
                     type: integer
+                  template:
+                    type: string
                   time_reopen:
                     type: integer
                   timeout:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngoutputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngoutputs.yaml
@@ -138,6 +138,8 @@ spec:
                     type: object
                   retries:
                     type: integer
+                  template:
+                    type: string
                   time_reopen:
                     type: integer
                   timeout:

diff --git a/config/crd/bases/logging.banzaicloud.io_syslogngclusteroutputs.yaml b/config/crd/bases/logging.banzaicloud.io_syslogngclusteroutputs.yaml
@@ -138,6 +138,8 @@ spec:
                     type: object
                   retries:
                     type: integer
+                  template:
+                    type: string
                   time_reopen:
                     type: integer
                   timeout:

diff --git a/config/crd/bases/logging.banzaicloud.io_syslogngoutputs.yaml b/config/crd/bases/logging.banzaicloud.io_syslogngoutputs.yaml
@@ -138,6 +138,8 @@ spec:
                     type: object
                   retries:
                     type: integer
+                  template:
+                    type: string
                   time_reopen:
                     type: integer
                   timeout:

diff --git a/docs/configuration/plugins/syslogng-outputs/elasticsearch.md b/docs/configuration/plugins/syslogng-outputs/elasticsearch.md
@@ -61,6 +61,11 @@ Set the prefix for logs in logstash format. If set, then the Index field will be
 Set the separator between LogstashPrefix and LogStashDateformat. Default: "-" 
 
 
+### template (string, optional) {#elasticsearchoutput-template}
+
+The template to format the record itself inside the payload body 
+
+
 ### type (*string, optional) {#elasticsearchoutput-type}
 
 The document type associated with the operation. Elasticsearch indices now support a single document type: `_doc` 

diff --git a/pkg/sdk/logging/model/syslogng/output/elasticsearch.go b/pkg/sdk/logging/model/syslogng/output/elasticsearch.go
@@ -59,6 +59,8 @@ type ElasticsearchOutput struct {
 	Index string `json:"index,omitempty"`
 	// The document type associated with the operation. Elasticsearch indices now support a single document type: `_doc`
 	Type *string `json:"type,omitempty"`
+	// The template to format the record itself inside the payload body
+	Template string `json:"template,omitempty"`
 	// The document ID. If no ID is specified, a document ID is automatically generated.
 	CustomID string `json:"custom_id,omitempty"`
 	// Set the prefix for logs in logstash format. If set, then the Index field will be ignored.