sensu-plugins-logs 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 929c81f862960a2e581bf3e46e6bb2128612ff7d
-  data.tar.gz: defbc634359dbba7c00af2b90d2b61c44c67ef1d
+  metadata.gz: ae62082cfd31a7aca730053b77c07251aad70314
+  data.tar.gz: c8f0ce0759a892b40570101af5e0702cace04d75
 SHA512:
-  metadata.gz: d805b4d8b93e77d0f3f065eb6d781e0d749c3691b3ddc416a42388c28d8ad143fd267d7dd02a44e99071f2090cd8f3258785111d28965220b746a8f1f14ed8a2
-  data.tar.gz: 1c884973770d313379614cbc0a4374e65d2ba899b9117953f0300d4f271a1782b539e6f75b6f1658a987420b4276525e97303528c6d02844f52e95e56baac7e0
+  metadata.gz: 339e1ab3150169f934ff312a98e6328e9b47f5babe5f40c5abe8ccf0d4479f67c5f837f87a3ca1c572eb7dbda5ff9213e432ba74a2e31c63b7237f672b0a8fe7
+  data.tar.gz: e8219a22ab005f16198e9864e8de50a81e50297461fd326258177551a857de944ea15c9ad8ba2c10c94d6a6d38d5f52a340f6fd6ded38f68dc4bda6ec136901c

data/CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [1.1.1] - 2017-05-21
+### Changed
+- `check-log.rb`: Fix 'crit' and 'warn' flags being ignored in search_log (@avifried1)
+
 ## [1.1.0] - 2017-05-20
 ### Added
 - Add `return-length` option to support custom length for returned matched lines
@@ -40,7 +44,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.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.1.1...HEAD
+[1.1.1]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.0.0...1.1.0
 [0.0.4]:
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/0.0.4...1.0.0

data/bin/check-log.rb

@@ -197,6 +197,7 @@ class CheckLog < Sensu::Plugin::Check::CLI
     bytes_read = 0
     n_warns = 0
     n_crits = 0
+    n_matched = 0
     accumulative_error = ''
 
     @log.seek(@bytes_to_skip, File::SEEK_SET) if @bytes_to_skip > 0
@@ -215,21 +216,14 @@ class CheckLog < Sensu::Plugin::Check::CLI
       end
       if m
         accumulative_error += "\n" + line.slice(0..config[:return_content_length])
-        if m[1]
-          if config[:crit] && m[1].to_i > config[:crit]
-            n_crits += 1
-          elsif config[:warn] && m[1].to_i > config[:warn]
-            n_warns += 1
-          end
-        else
-          if config[:only_warn] # rubocop:disable Style/IfInsideElse
-            n_warns += 1
-          else
-            n_crits += 1
-          end
-        end
+        n_matched += 1
       end
     end
+    if !config[:only_warn] && config[:crit] && n_matched >= config[:crit]
+      n_crits = n_matched
+    elsif config[:warn] && n_matched >= config[:warn]
+      n_warns = n_matched
+    end
     FileUtils.mkdir_p(File.dirname(@state_file))
     File.open(@state_file, 'w') do |file|
       file.write(@bytes_to_skip + bytes_read)

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

@@ -2,7 +2,7 @@ module SensuPluginsLogs
   module Version
     MAJOR = 1
     MINOR = 1
-    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.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin