From b2713b1b34a1800bbd11ca399ae40feb5c2d61ad Mon Sep 17 00:00:00 2001
From: Dave Waters <dave@1waters.com>
Date: Thu, 1 Aug 2019 14:20:39 -0400
Subject: [PATCH] fix EID 148

---
 CHANGELOG.md                             | 4 ++++
 lib/logstash/codecs/netflow/netflow.yaml | 4 ++--
 logstash-codec-netflow.gemspec           | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ca773c..9bea751 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.2.2
+
+  - Fix incorrect definition for EID 148
+
 ## 4.2.1
 
   - Fix sub-second timestamp math
diff --git a/lib/logstash/codecs/netflow/netflow.yaml b/lib/logstash/codecs/netflow/netflow.yaml
index c82ca80..78e0c5e 100644
--- a/lib/logstash/codecs/netflow/netflow.yaml
+++ b/lib/logstash/codecs/netflow/netflow.yaml
@@ -310,8 +310,8 @@
 - :string
 - :wlanSSID
 148:
-- :uint32
-- :conn_id
+- :uint64
+- :flowId
 149:
 - :uint32
 - :observationDomainId
diff --git a/logstash-codec-netflow.gemspec b/logstash-codec-netflow.gemspec
index c119ea7..05a3800 100644
--- a/logstash-codec-netflow.gemspec
+++ b/logstash-codec-netflow.gemspec
@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-netflow'
-  s.version         = '4.2.1'
+  s.version         = '4.2.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads Netflow v5, Netflow v9 and IPFIX data"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"