6.8.2 release

Author: marcinc

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 6.8.2-1
+
+* Removes previously added `INPUT_KUBERNETES_FILE_CHUNK_COUNT`, `INPUT_KUBERNETES_FILE_CHUNK_SIZE` environment variables 
+  due to the version of `logstash-input-file` plugin used.
+* Preinstalls `logstash-input-file` plugin v4.0.5 due to log change tracking issues in v.4.1.10.
+* Renames `logstash.yml` config option:
+	`xpack.monitoring.elasticsearch.url` -> `xpack.monitoring.elasticsearch.hosts`
+
 ## 6.8.1-3
 
 * Removes `ELASTICSEARCH_FLUSH_SIZE` as it's now obsolete.

Dockerfile

@@ -5,13 +5,14 @@ RUN dnf upgrade -y -q && \
     dnf install -y -q java-headless which hostname tar wget && \
     dnf clean all
 
-ENV LS_VERSION 6.8.1
+ENV LS_VERSION 6.8.2
 
 RUN wget -q https://artifacts.elastic.co/downloads/logstash/logstash-${LS_VERSION}.tar.gz -O - | tar -xzf -; \
   mv logstash-${LS_VERSION} /logstash
 
 RUN JARS_SKIP=true /logstash/bin/logstash-plugin install --version 0.3.1 logstash-filter-kubernetes && \
     JARS_SKIP=true /logstash/bin/logstash-plugin install --version 2.0.2 logstash-input-journald && \
+    JARS_SKIP=true /logstash/bin/logstash-plugin install --version 4.0.5 logstash-input-file && \
     JARS_SKIP=true /logstash/bin/logstash-plugin install --version 3.2.0 logstash-output-statsd
 
 COPY run.sh /run.sh

README.md

@@ -39,8 +39,6 @@ As usual, configuration is passed through environment variables.
 - `LS_JAVA_OPTS` - JVM Options. Default: `-Djava.io.tmpdir=${HOME}`
 - `INPUT_KUBERNETES` - Enable kubernetes logs ingestion. Default: `true`.
 - `INPUT_KUBERNETES_EXCLUDE_PATTERNS` - Comma separated list of log file path patterns to be excluded from processing. Example: `"*.gz", "*.tar"`. Default: `""`.
-- `INPUT_KUBERNETES_FILE_CHUNK_COUNT` - [file_chunk_count](https://www.elastic.co/guide/en/logstash/6.8/plugins-inputs-file.html#plugins-inputs-file-file_chunk_count). Default: 32.
-- `INPUT_KUBERNETES_FILE_CHUNK_SIZE` - [file_chunk_size](https://www.elastic.co/guide/en/logstash/6.8/plugins-inputs-file.html#plugins-inputs-file-file_chunk_size). Default: 32768 (32KB).
 - `INPUT_JOURNALD` - Enable logs ingestion from journald. Default: `true`.
 - `INPUT_KUBERNETES_AUDIT` - Enable kubernetes audit logs ingestion. Default: `true`.
 - `OUTPUT_ELASTICSEARCH` - Enable logs output to Elasticsearch. Default `true`.

conf.d/10_input_kubernetes.conf

@@ -5,8 +5,6 @@ input {
     tags => ["kubernetes", "docker"]
     start_position => "beginning"
     sincedb_path => "/var/lib/logstash/sincedb_kubernetes"
-    file_chunk_count => %INPUT_KUBERNETES_FILE_CHUNK_COUNT%
-    file_chunk_size => %INPUT_KUBERNETES_FILE_CHUNK_SIZE%
     %INPUT_KUBERNETES_EXCLUDE_PATTERNS%
   }
 }

config/logstash.yml

@@ -2,6 +2,6 @@
 node.name: %LS_NODE_NAME%
 http.host: %LS_HTTP_HOST%
 xpack.monitoring.enabled: %LS_MONITORING_ENABLE%
-xpack.monitoring.elasticsearch.url: %ELASTICSEARCH_SCHEME%://%ELASTICSEARCH_HOST%
+xpack.monitoring.elasticsearch.hosts: [ %ELASTICSEARCH_SCHEME%://%ELASTICSEARCH_HOST% ]
 xpack.monitoring.elasticsearch.username: %ELASTICSEARCH_USER%
 xpack.monitoring.elasticsearch.password: %ELASTICSEARCH_PASSWORD%

run.sh

@@ -12,8 +12,6 @@ export HOME=/var/lib/logstash
 : ${LS_NODE_NAME:=$HOSTNAME}
 : ${LS_HTTP_HOST:=0.0.0.0}
 : ${INPUT_KUBERNETES_EXCLUDE_PATTERNS:=}
-: ${INPUT_KUBERNETES_FILE_CHUNK_COUNT:=32} # 1MB chunks as default chunk size is 32KB
-: ${INPUT_KUBERNETES_FILE_CHUNK_SIZE:=32768} # 32KB
 : ${INPUT_JOURNALD:=true}
 : ${INPUT_KUBERNETES_AUDIT:=true}
 : ${INPUT_KUBERNETES:=true}
@@ -41,10 +39,6 @@ else
       -i /logstash/conf.d/10_input_kubernetes.conf
 fi
 
-sed -e "s/%INPUT_KUBERNETES_FILE_CHUNK_COUNT%/${INPUT_KUBERNETES_FILE_CHUNK_COUNT}/" \
-    -e "s/%INPUT_KUBERNETES_FILE_CHUNK_SIZE%/${INPUT_KUBERNETES_FILE_CHUNK_SIZE}/" \
-    -i /logstash/conf.d/10_input_kubernetes.conf
-
 if [[ ${INPUT_JOURNALD} != 'true' ]]; then
   rm -f /logstash/conf.d/10_input_journald.conf
 fi