sensu-plugins-logs 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1255760d5b9cd18ee05eccc9c251683acf42f785
-  data.tar.gz: 90b5fd4f74d16d4ebae49e3db735c622baf5d96e
+  metadata.gz: 3a4097a3245236c405f8d92998311318a1f53d01
+  data.tar.gz: 9ccccf0bc32d1075f035f452d0902caaf58c1b58
 SHA512:
-  metadata.gz: 38478d5a2d08343171e5593631781340293d14f40f892ba1b6b5847e4968a3b27df184e827c5ef390e3f0d6a721294fea213c81e4e44d2504992000a2933b276
-  data.tar.gz: 593940bb2a20c07b827044a5f2ea60f79ddbb7ab83c3dc0e53c5a717d0fc6dfed03215d701d61d1f33f65ef81fc784a4f1e382cf08d8b16523bac13a82d8221d
+  metadata.gz: f755f924a2671f195a5d1f5a1f2122493aee45d2ef83a4ab15dbf1b8e6c571dc8bce31127347fda0830c17cb7a10a9fe1938440c1c6b1a5ab0f7d32b06bc811c
+  data.tar.gz: 72df7a59a23125014c7fa988818e62c7024b0345aa6178fb6226512bd500b6b5f05ce0e2397e995a5eb04a19f21604eb1983f2401bcf74ffb765f056f6a68d1a

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [1.3.0] - 2017-09-23
+### Added
+- check-log.rb: `return-error-limit` option to limit the number of returned matched lines (log entries) (@jhshadi)
+
 ## [1.2.1] - 2017-09-23
 ### Added
 - ruby 2.4 testing (@majormoses)
@@ -30,8 +34,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [1.1.0] - 2017-05-20
 ### Added
-- Add `return-length` option to support custom length for returned matched lines
-- Add `log-pattern` option to support read and match against whole log entry instead of single line
+- Add `return-length` option to support custom length for returned matched lines (@jhshadi)
+- Add `log-pattern` option to support read and match against whole log entry instead of single line (@jhshadi)
 
 ## [1.0.0] - 2017-03-07
 ### Fixed
@@ -64,7 +68,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.2.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.3.0...HEAD
+[1.3.0]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.2.1...1.3.0
 [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

data/bin/check-log.rb

@@ -128,6 +128,12 @@ class CheckLog < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          default: 250
 
+  option :return_error_limit,
+         description: 'Max number of returned matched lines(log entries)',
+         short: '-M N',
+         long: '--return-error-limit N',
+         proc: proc(&:to_i)
+
   # Use this option when you expecting your log lines to contain invalid byte sequence in utf-8.
   # https://github.com/sensu-plugins/sensu-plugins-logs/pull/26
   option :encode_utf16,
@@ -225,7 +231,9 @@ class CheckLog < Sensu::Plugin::Check::CLI
         m = line.match(config[:pattern]) unless line.match(config[:exclude])
       end
       if m
-        accumulative_error += "\n" + line.slice(0..config[:return_content_length])
+        if !config[:return_error_limit] || (config[:return_error_limit] && n_matched < config[:return_error_limit])
+          accumulative_error += "\n" + line.slice(0..config[:return_content_length])
+        end
         n_matched += 1
       end
     end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-logs
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors