sensu-plugins-logs 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc78ada8b9f897dae9b51a55d3c873e71a515d02
-  data.tar.gz: 2e5dbf9fbf489a095909d34aa2ab60bef47d864e
+  metadata.gz: 1255760d5b9cd18ee05eccc9c251683acf42f785
+  data.tar.gz: 90b5fd4f74d16d4ebae49e3db735c622baf5d96e
 SHA512:
-  metadata.gz: 6a5f8e25baca314d153abbb8244f7f4bef3cd177b45c91c611e9ddd9768a171910e03ab6633e7e41d877979edca1cb7f450740467fe46a8eaf4cef60dff07036
-  data.tar.gz: d29c4f93e6208ffad9e00b140f00fbfb4827b842da272cb1c06f03fc83beac76ef4253355a3b31e98f101c9c0d4a6935981b5744ce76b586445fc1f4926f45dd
+  metadata.gz: 38478d5a2d08343171e5593631781340293d14f40f892ba1b6b5847e4968a3b27df184e827c5ef390e3f0d6a721294fea213c81e4e44d2504992000a2933b276
+  data.tar.gz: 593940bb2a20c07b827044a5f2ea60f79ddbb7ab83c3dc0e53c5a717d0fc6dfed03215d701d61d1f33f65ef81fc784a4f1e382cf08d8b16523bac13a82d8221d

data/CHANGELOG.md

@@ -1,10 +1,21 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
+This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
 
 ## [Unreleased]
 
+## [1.2.1] - 2017-09-23
+### Added
+- ruby 2.4 testing (@majormoses)
+
+### Fixed
+- Fixed unhandled encoding exception when using the `log-pattern` option (@jhshadi)
+- PR template spelling "compatibility"
+
+### Changed
+- updated CHANGELOG guidelines location (@majormoses)
+
 ## [1.2.0] - 2017-07-04
 ### Added
 - Support of UTF16 encoded characters (@avoosh)
@@ -53,7 +64,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.2.1...HEAD
+[1.2.1]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.2.2...1.2.0
 [1.1.2]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.1.1...1.1.2
 [1.1.1]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.1.0...1.1.1

data/bin/check-log.rb

@@ -213,15 +213,11 @@ class CheckLog < Sensu::Plugin::Check::CLI
     @log.seek(@bytes_to_skip, File::SEEK_SET) if @bytes_to_skip > 0
     # #YELLOW
     @log.each_line do |line|
+      line = encode_line(line)
       if config[:log_pattern]
         line = get_log_entry(line)
       end
 
-      if config[:encode_utf16]
-        line = line.encode('UTF-16', invalid: :replace, replace: '')
-      end
-
-      line = line.encode('UTF-8', invalid: :replace, replace: '')
       bytes_read += line.bytesize
       if config[:case_insensitive]
         m = line.downcase.match(config[:pattern].downcase) unless line.match(config[:exclude])
@@ -250,6 +246,8 @@ class CheckLog < Sensu::Plugin::Check::CLI
     log_entry = [first_line]
 
     @log.each_line do |line|
+      line = encode_line(line)
+
       if !line.match(config[:log_pattern])
         log_entry.push(line)
       else
@@ -258,7 +256,14 @@ class CheckLog < Sensu::Plugin::Check::CLI
       end
     end
 
-    log_entry = log_entry.join('')
-    log_entry
+    log_entry.join('')
+  end
+
+  def encode_line(line)
+    if config[:encode_utf16]
+      line = line.encode('UTF-16', invalid: :replace, replace: '')
+    end
+
+    line.encode('UTF-8', invalid: :replace, replace: '')
   end
 end

data/lib/sensu-plugins-logs/version.rb

@@ -2,7 +2,7 @@ module SensuPluginsLogs
   module Version
     MAJOR = 1
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-logs
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for logs