sensu-plugins-logs 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d288a092b148c6797a5687b0ea786cd60a990aa16b164acb79f6a5f19e23bd7e
-  data.tar.gz: 91b02e5ac5c243c5ba8ee30bee469123838320458272ce47a0c4b7b02e80f9e1
+  metadata.gz: c44dd4ef2de918ac705ee251a37f5e52172cc845b25f3a8ff3ae0b394a395b25
+  data.tar.gz: 1deab3e0ea3f7e80fa090d914248f97cf1db32beaeb12d3a90531fb3b80f99d4
 SHA512:
-  metadata.gz: b519ade55705145b887612edb137bb4bbf9463c09a573b611d3ad872f0911cd10cc1216fb6e26ef31789e6bb4b933f3c28e73435b17322b87706b0d4f16287f8
-  data.tar.gz: 254f5990069c2ee01c57892a9f9c65e66d81799e9dd08bb020282045ab544019c3276d03966386ac8fe60e46ae883d4899d970034aec74387e8aae844a316169
+  metadata.gz: 46468b7f7f0de3669d07b47cfb6ac57d02cb9de76a95f17252dc06fd05bbd22255f31f86b4d53ec80bb63c84bc9ebc919f4aedc162cf3fb01566159fd1487fb8
+  data.tar.gz: ec7e7f19260f4a434e4d6880a5a60b4bcec1a52d16c31d3570c762c55533e5ba694808401512810b672e4775a1575effde3cad54279dd0a8abe968392702efff

data/CHANGELOG.md

@@ -5,6 +5,25 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [3.0.0] - 2018-12-15
+### Breaking Changes
+- updated to use sensu-plugin 3.0 with Sensu Go to Sensu Core 1.x migration option
+
+### Changes
+- Update handler-logevent.rb to gracefully handle missing check and client definitions in events.  Missing attributes will use 'unknown' fallback strings so that malformed events will still be captured in the event logging directory structure instead of erroring out.  Useful for diagnosing problems with malformed events when migrating to Sensu Go. (@jspaleta)
+
+### Added
+- add ruby 2.5.1 into travis automation (@jspaleta)
+
+### Fixed
+- add rdoc to development dependancy to fix rake task errors ruby 2.5.1 (@jspaleta) (@dependabot)
+- update dev dep for github-markup (@jspaleta) (@dependabot)
+- update dev dep for codeclimate-test-reporter (@jspaleta) (@dependabot)
+- update dev dep for serverspec (@jspaleta) (@dependabot)
+- update dev dep for mixlib-shellout (@jspaleta) (@dependabot)
+- update dev dep for rubocop (@jspaleta) (@dependabot)
+
+## [2.0.0] - 2018-09-30
 ### Breaking Changes
 - remove support for ruby versions `< 2.3.0` (@jspaleta)
 
@@ -13,8 +32,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 
 ### Fixed
-- check-log.rb: pattern is now required via option config
-- check-log.rb: update descriptions of crit and warn options
+- check-log.rb: pattern is now required via option config (@cgeers)
+- check-log.rb: update descriptions of crit and warn options (@cgeers)
 
 ## [1.3.1] - 2017-10-09
 ### Fixed
@@ -83,7 +102,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/2.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/2.0.0...3.0.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.3.1...2.0.0
 [1.3.1]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.3.0...1.3.1
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-logs/compare/1.2.1...1.3.0

data/README.md

@@ -31,3 +31,7 @@
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes
+### Using this plugin with Sensu Go
+* To use included handlers with Sensu Go, use `--map-go-event-into-ruby` argument or set environment variable `SENSU_MAP_GO_EVENT_INTO_RUBY=1`
+
+* Make sure necessary handler configuration json exists under `/etc/sensu/conf.d/` or at a path in the colon separated list of files in the environment variable `SENSU_CONFIG_FILES` 

data/bin/check-log.rb

@@ -167,7 +167,7 @@ class CheckLog < Sensu::Plugin::Check::CLI
     file_list.each do |log_file|
       begin
         open_log log_file
-      rescue => e
+      rescue StandardError => e
         unknown "Could not open log file: #{e}"
       end
       n_warns, n_crits, accumulative_error = search_log
@@ -199,14 +199,15 @@ class CheckLog < Sensu::Plugin::Check::CLI
            end
 
     @state_file = File.join(state_dir, File.expand_path(log_file).sub(/^([A-Z]):\//, '\1/'))
-    @bytes_to_skip = begin
-      File.open(@state_file) do |file|
-        file.flock(File::LOCK_SH) unless Gem.win_platform?
-        file.readline.to_i
+    @bytes_to_skip =
+      begin
+        File.open(@state_file) do |file|
+          file.flock(File::LOCK_SH) unless Gem.win_platform?
+          file.readline.to_i
+        end
+      rescue StandardError
+        0
       end
-    rescue
-      0
-    end
   end
 
   def search_log

data/bin/handler-logevent.rb

@@ -13,14 +13,26 @@ require 'json'
 
 class LogEvent < Sensu::Handler
   def handle
-    eventdir = "#{settings['logevent']['eventdir']}/#{@event['client']['name']}/#{@event['check']['name']}"
+    event_action = @event['action']
+    event_action ||= 'unknown'
+    check_name = @event['check']['name'] if (@event.include? 'check') && (@event['check'].include? 'name')
+    check_name ||= 'unknown'
+    client_name = @event['client']['name'] if (@event.include? 'client') && (@event['client'].include? 'name')
+    client_name ||= 'unknown'
+    check_executed = @event['check']['executed'] if (@event.include? 'check') && (@event['check'].include? 'executed')
+    check_executed ||= 'unknown'
+    dir_stub = settings['logevent']['eventdir'] if (settings.include? 'logevent') && (settings['logevent'].include? 'eventdir')
+    puts settings
+    raise 'logevent eventdir setting is missing' unless dir_stub
+
+    eventdir = "#{settings['logevent']['eventdir']}/#{client_name}/#{check_name}"
     FileUtils.mkdir_p(eventdir)
 
-    File.open("#{eventdir}/#{@event['check']['executed']}.#{@event['action']}", 'w') do |f|
+    File.open("#{eventdir}/#{check_executed}.#{event_action}", 'w') do |f|
       f.write(JSON.pretty_generate(@event))
     end
 
-    events = Dir.glob("#{eventdir}/*.#{@event['action']}")
+    events = Dir.glob("#{eventdir}/*.#{event_action}")
     # #YELLOW
     if settings['logevent']['keep'] < events.length # rubocop:disable GuardClause
       FileUtils.rm_f(events.sort.reverse.shift(settings['logevent']['keep']))

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

@@ -1,6 +1,6 @@
 module SensuPluginsLogs
   module Version
-    MAJOR = 2
+    MAJOR = 3
     MINOR = 0
     PATCH = 0
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-logs
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: kitchen-docker
   requirement: !ruby/object:Gem::Requirement
@@ -98,22 +98,22 @@ dependencies:
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -176,28 +190,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.36.1
+        version: 2.41.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.36.1
+        version: 2.41.3
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for logs