bump to 3.5.3

robcowart · Dec 19, 2019 · bdde96b · bdde96b
1 parent 4c5e960
commit bdde96b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 ---
 
+## v3.5.3
+
+v3.5.3 is a minor release. No migration of data from v3.5.x to v3.5.3 is required.
+
+### Breaking Changes
+
+ElastiFlow v3.5.x provides support Elastic Stack 7.x. The support for document types has been completely removed in Elasticsearch 7.0.0. This has required changes to the index templates provided with ElastiFlow. You _MUST_ first successfully upgrade to Elastic Stack 7.x _PRIOR_ to using ElastiFlow v3.5.3.
+
+### New Features
+
+* Added support for pmacct IEs (needed for VyOS 1.2.x).
+
+------
+
 ## v3.5.2
 
 v3.5.2 is a minor release. No migration of data from v3.5.1 to v3.5.2 is required.

diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@ LABEL org.opencontainers.image.created="$BUILD_DATE" \
       org.opencontainers.image.url="https://github.com/robcowart/elastiflow/README.md" \
       org.opencontainers.image.documentation="https://github.com/robcowart/elastiflow/DOCKER.md" \
       org.opencontainers.image.source="https://github.com/robcowart/elastiflow" \
-      org.opencontainers.image.version="3.5.2" \
+      org.opencontainers.image.version="3.5.3" \
       org.opencontainers.image.vendor="Robert Cowart" \
       org.opencontainers.image.title="ElastiFlow™ - Logstash" \
       org.opencontainers.image.description="Logstash with the ElastiFlow™ pipeline."

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -71,7 +71,7 @@ services:
       LOGGING_QUIET: 'false'
 
   elastiflow-logstash-oss:
-    image: robcowart/elastiflow-logstash-oss:3.5.2
+    image: robcowart/elastiflow-logstash-oss:3.5.3
     container_name: elastiflow-logstash-oss
     restart: 'no'
     depends_on:

diff --git a/docker_build.sh b/docker_build.sh
@@ -15,4 +15,4 @@
 # Robert Cowart are Copyright (C)2019 Robert Cowart. All Rights Reserved.
 #------------------------------------------------------------------------------
 
-docker build --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --no-cache --squash -t robcowart/elastiflow-logstash-oss:3.5.2 .
+docker build --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --no-cache --squash -t robcowart/elastiflow-logstash-oss:3.5.3 .
diff --git a/logstash/elastiflow/conf.d/20_filter_10_begin.logstash.conf b/logstash/elastiflow/conf.d/20_filter_10_begin.logstash.conf
@@ -27,7 +27,7 @@ filter {
       "[node][ipaddr]" => "%{host}"
       "[node][hostname]" => "%{host}"
     }
-    replace => { "@version" => "3.5.2" }
+    replace => { "@version" => "3.5.3" }
   }
 
   # Add Logstash hostname.

diff --git a/logstash/elastiflow/conf.d/30_output_10_single.logstash.conf b/logstash/elastiflow/conf.d/30_output_10_single.logstash.conf
@@ -25,9 +25,9 @@ output {
     #cacert => "/PATH/TO/CERT"
     user => "${ELASTIFLOW_ES_USER:elastic}"
     password => "${ELASTIFLOW_ES_PASSWD:changeme}"
-    index => "elastiflow-3.5.2-%{+YYYY.MM.dd}"
+    index => "elastiflow-3.5.3-%{+YYYY.MM.dd}"
     template => "${ELASTIFLOW_TEMPLATE_PATH:/etc/logstash/elastiflow/templates}/elastiflow.template.json"
-    template_name => "elastiflow-3.5.2"
+    template_name => "elastiflow-3.5.3"
     template_overwrite => "true"
   }
 }
diff --git a/logstash/elastiflow/conf.d/30_output_20_multi.logstash.conf.disabled b/logstash/elastiflow/conf.d/30_output_20_multi.logstash.conf.disabled
@@ -25,9 +25,9 @@ output {
     #cacert => "/PATH/TO/CERT"
     user => "${ELASTIFLOW_ES_USER:elastic}"
     password => "${ELASTIFLOW_ES_PASSWD:changeme}"
-    index => "elastiflow-3.5.2-%{+YYYY.MM.dd}"
+    index => "elastiflow-3.5.3-%{+YYYY.MM.dd}"
     template => "${ELASTIFLOW_TEMPLATE_PATH:/etc/logstash/elastiflow/templates}/elastiflow.template.json"
-    template_name => "elastiflow-3.5.2"
+    template_name => "elastiflow-3.5.3"
     template_overwrite => "true"
   }
 }
diff --git a/logstash/elastiflow/templates/elastiflow.template.json b/logstash/elastiflow/templates/elastiflow.template.json
@@ -1,7 +1,7 @@
 {
   "order": 0,
   "version": 30502,
-  "index_patterns": "elastiflow-3.5.2-*",
+  "index_patterns": "elastiflow-3.5.3-*",
   "settings": {
     "index": {
       "number_of_shards": 3,