small fixes for elasticsearch parameters

Author: tarokkk

docs/plugins/elasticsearch.md

@@ -1,20 +1,24 @@
-# Plugin azure
+# Plugin elasticsearch
 ## Variables
 | Variable name | Default | Applied function |
 |---|---|---|
 | pattern | - |  |
 | logLevel | info |  |
 | host | - |  |
 | port | - |  |
-| schema | - |  |
+| scheme | scheme |  |
 | logstashFormat | true |  |
 | logstashPrefix | logstash |  |
 | bufferPath | /buffers/elasticsearch |  |
-| chunkLimit | 2M |  |
-| queueLimit | 8  |  |
 | timekey | 1h |  |
 | timekey_wait | 10m |  |
 | timekey_use_utc | true |  |
+| flush_thread_count | 2 |  |
+| flush_interval | 5s |  |
+| retry_forever | true |  |
+| retry_max_interval | 30 |  |
+| chunkLimit | 2M |  |
+| queueLimit | 8 |  |
 ## Plugin template
 ```
 <match {{ .pattern }}.**>
@@ -24,10 +28,16 @@
   type_name fluentd
   host {{ .host }}
   port {{ .port }}
-  scheme  {{ .schema }}
-  logstash_format true
+  scheme  {{ .scheme }}
+  logstash_format {{ .logstashFormat }}
   logstash_prefix {{ .logstashPrefix }}
   reconnect_on_error true
+  {{- if .user }}
+  user {{ .user }}
+  {{- end}}
+  {{- if .password }}
+  password {{ .password }}
+  {{- end}}
   <buffer tag, time>
     @type file
     path {{ .bufferPath }}
@@ -36,13 +46,13 @@
     timekey_use_utc {{ .timekey_use_utc }}
     flush_mode interval
     retry_type exponential_backoff
-    flush_thread_count 2
-    flush_interval 5s
-    retry_forever
-    retry_max_interval 30
+    flush_thread_count {{ .flush_thread_count }}
+    flush_interval {{ .flush_interval }}
+    retry_forever {{ .retry_forever }}
+    retry_max_interval {{ .retry_max_interval }}
     chunk_limit_size {{ .chunkLimit }}
     queue_limit_length {{ .queueLimit }}
     overflow_action block
   </buffer>
-</match>`
+</match>
 ```

docs/plugins/s3.md

@@ -22,6 +22,10 @@
   aws_sec_key {{ .aws_sec_key }}
   s3_bucket {{ .s3_bucket }}
   s3_region {{ .s3_region }}
+  {{- if .s3_endpoint }}
+  s3_endpoint {{ .s3_endpoint }}
+  force_path_style true   # This prevents AWS SDK from breaking endpoint URL
+  {{- end }}
   store_as gzip_command
 
   path logs/${tag}/%Y/%m/%d/

pkg/resources/plugins/elasticsearch.go

@@ -5,15 +5,22 @@ const ElasticsearchOutput = "elasticsearch"
 
 // ElasticsearchDefaultValues for Elasticsearch output plugin
 var ElasticsearchDefaultValues = map[string]string{
-	"bufferPath":      "/buffers/elasticsearch",
-	"logLevel":        "info",
-	"logstashFormat":  "true",
-	"logstashPrefix":  "logstash",
-	"chunkLimit":      "2M",
-	"queueLimit":      "8",
-	"timekey":         "1h",
-	"timekey_wait":    "10m",
-	"timekey_use_utc": "true",
+	"bufferPath":         "/buffers/elasticsearch",
+	"logLevel":           "info",
+	"logstashFormat":     "true",
+	"logstashPrefix":     "logstash",
+	"scheme":             "scheme",
+	"chunkLimit":         "2M",
+	"queueLimit":         "8",
+	"timekey":            "1h",
+	"timekey_wait":       "10m",
+	"timekey_use_utc":    "true",
+	"retry_max_interval": "30",
+	"flush_interval":     "5s",
+	"flush_thread_count": "2",
+	"retry_forever":      "true",
+	"user":               "",
+	"password":           "",
 }
 
 // ElasticsearchTemplate for Elasticsearch output plugin
@@ -25,10 +32,16 @@ const ElasticsearchTemplate = `
   type_name fluentd
   host {{ .host }}
   port {{ .port }}
-  scheme  {{ .schema }}
+  scheme  {{ .scheme }}
   logstash_format {{ .logstashFormat }}
   logstash_prefix {{ .logstashPrefix }}
   reconnect_on_error true
+  {{- if .user }}
+  user {{ .user }}
+  {{- end}}
+  {{- if .password }}
+  password {{ .password }}
+  {{- end}}
   <buffer tag, time>
     @type file
     path {{ .bufferPath }}
@@ -37,10 +50,10 @@ const ElasticsearchTemplate = `
     timekey_use_utc {{ .timekey_use_utc }}
     flush_mode interval
     retry_type exponential_backoff
-    flush_thread_count 2
-    flush_interval 5s
-    retry_forever
-    retry_max_interval 30
+    flush_thread_count {{ .flush_thread_count }}
+    flush_interval {{ .flush_interval }}
+    retry_forever {{ .retry_forever }}
+    retry_max_interval {{ .retry_max_interval }}
     chunk_limit_size {{ .chunkLimit }}
     queue_limit_length {{ .queueLimit }}
     overflow_action block