From b4b72906a26a0ad2275bdf4212276464fabaf305 Mon Sep 17 00:00:00 2001
From: Luke Waite <lwaite@gmail.com>
Date: Wed, 28 Jun 2017 12:13:50 -0400
Subject: [PATCH] Prepare release 1.0.0.pre2

Feat: Un-break the 1.0 breaking change

Fix: Relax constraint and fix logging to support Logstash 2.4
---
 CHANGELOG.md                           | 7 ++++++-
 lib/logstash/inputs/cloudwatch_logs.rb | 4 ++--
 logstash-input-cloudwatch_logs.gemspec | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b37ef0..f2e6e5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Release Notes for `logstash-input-cloudwatch_logs`
 
-## v1.0.0 Pre-Release (2017-06-24)
+## v1.0.0.pre2 Pre-Release 2 (2017-06-28)
+* Remove the breaking change in v1.0.0.pre. `log_group` is now a `string` supporting `lists`, allowing either notation
+* Change startup log from TRACE to DEBUG, supporting Logstash 2.4
+* Relax the contstraint on `logstash-mixin-aws` supporting Logstash 2.4
+
+## v1.0.0.pre Pre-Release 1 (2017-06-24)
 * BREAKING CHANGE: `log_group` must now be an array, adds support for specifying multiple groups or prefixes (Fixes [#13](https://github.com/lukewaite/logstash-input-cloudwatch-logs/issues/13))
 * Refactored ingestion, fixes multiple memory leaks (Fixes [#24](https://github.com/lukewaite/logstash-input-cloudwatch-logs/issues/4))
 * Pull only log_events since last ingestion (Fixes [#10](https://github.com/lukewaite/logstash-input-cloudwatch-logs/issues/10))
diff --git a/lib/logstash/inputs/cloudwatch_logs.rb b/lib/logstash/inputs/cloudwatch_logs.rb
index c89bb48..98f2123 100644
--- a/lib/logstash/inputs/cloudwatch_logs.rb
+++ b/lib/logstash/inputs/cloudwatch_logs.rb
@@ -29,7 +29,7 @@ class LogStash::Inputs::CloudWatch_Logs < LogStash::Inputs::Base
 
   # Log group(s) to use as an input. If `log_group_prefix` is set
   # to `true`, then each member of the array is treated as a prefix
-  config :log_group, :validate => :array, :required => true
+  config :log_group, :validate => :string, :list => true, :required => true
 
   # Where to write the since database (keeps track of the date
   # the last handled log stream was updated). The default will write
@@ -49,7 +49,7 @@ class LogStash::Inputs::CloudWatch_Logs < LogStash::Inputs::Base
   public
   def register
     require "digest/md5"
-    @logger.trace("Registering cloudwatch_logs input", :log_group => @log_group)
+    @logger.debug("Registering cloudwatch_logs input", :log_group => @log_group)
     settings = defined?(LogStash::SETTINGS) ? LogStash::SETTINGS : nil
     @sincedb = {}
 
diff --git a/logstash-input-cloudwatch_logs.gemspec b/logstash-input-cloudwatch_logs.gemspec
index 337f108..c90d394 100644
--- a/logstash-input-cloudwatch_logs.gemspec
+++ b/logstash-input-cloudwatch_logs.gemspec
@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-cloudwatch_logs'
-  s.version         = '1.0.0.pre'
+  s.version         = '1.0.0.pre.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = 'Stream events from CloudWatch Logs.'
   s.description     = 'This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program'
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency 'logstash-core-plugin-api', '>= 1.60', '<= 2.99'
-  s.add_runtime_dependency 'logstash-mixin-aws', '>= 4.2.0'
+  s.add_runtime_dependency 'logstash-mixin-aws', '>= 4.0.0'
   s.add_runtime_dependency 'stud', '~> 0.0.22'
 
   s.add_development_dependency 'logstash-devutils'