sensu-plugins-fluentd 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3140dff177f87ce022e271823141fe6eba5f9f87
-  data.tar.gz: edb2ed2b1c4573e30de4148992532bf34e0da1d2
+  metadata.gz: 193c69129bcef0591e30c3b9b47788e1657b4fa8
+  data.tar.gz: ea67e7db27b112efffc7ede720abc7d799c72803
 SHA512:
-  metadata.gz: 8e43fba95c11a2bf20d7747c4cfa5446fd7f54614be65505b986d55a7866eed1b8d53ab81b1e937590790e6b43f0e755fb5c11aaa633954bdb5b1a92debdda61
-  data.tar.gz: b6fbd1cd4b185c04cd0ee8a570e89a3dc12dbcc422a0a9f3bc7b77cb03a5617f505b331c4efb533e25f485096f866708d09d8d9e1f0d6673c4583d2d7dc84b54
+  metadata.gz: de00fbcedc4a58561a89e052f4c82b89df4788c4373238f24ed9218509bc0f86338b9fe4758effebda58c4d185db18ac090b1f175020403354e4bd9f27755376
+  data.tar.gz: 3ffd0701c14a07475b95207b509bf86facac857e852c1b31a1c84fc781c1049a0103353b00d0e15d2583cf56d4e46d7782c653d7dd17ebc896bd7291e7f05c6a

data/CHANGELOG.md

@@ -1,11 +1,24 @@
-#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/)
 
-## Unreleased
+## [Unreleased]
+
+## [1.0.0] - 2017-05-15
+### Fixed
+- handler-fluentd.rb: Fix undefined local variable `incident_key` (@jkernech)
+
+### Changed
+- Update `timeout` method to remove deprecation warnings (@eheydrick)
 
-[0.1.0] - 2015-12-03
+### Added
+- Ruby 2.3 and 2.4 support (@eheydrick)
+
+### Removed
+- Ruby 1.9.3 support (@eheydrick)
+
+## [0.1.0] - 2015-12-03
 ### Added
 - Added timeout option to check-fluentd-monitor-agent.rb
 
@@ -19,15 +32,19 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Changed
 - updated sensu-plugin gem to 1.2.0
 
-## 0.0.1 - 2015-04-29
-
-### Added
-- initial release
-
 ## [0.0.2] - 2015-06-02
-
 ### Fixed
 - added binstubs
 
 ### Changed
 - removed cruft from /lib
+
+## 0.0.1 - 2015-04-29
+### Added
+- initial release
+
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-fluentd/compare/1.0.0...HEAD
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-fluentd/compare/0.1.0...1.0.0
+[0.1.0]: https://github.com/sensu-plugins/sensu-plugins-fluentd/compare/0.0.3...0.1.0
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-fluentd/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-fluentd/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-fluentd/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-fluentd)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-fluentd/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-fluentd)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-fluentd.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-fluentd)
-[ ![Codeship Status for sensu-plugins/sensu-plugins-fluentd](https://codeship.com/projects/fe235610-d22f-0132-a14d-4afb0344239b/status?branch=master)](https://codeship.com/projects/77468)
 
 ## Functionality
 
@@ -19,6 +18,7 @@ Fluentd Sensu handler
 
 ## Files
  * bin/check-fluentd-monitor-agent.rb
+ * bin/metric-fluentd-monitor-agent.rb
  * bin/handler-fluentd.rb
 
 ## Usage

data/bin/check-fluentd-monitor-agent.rb

@@ -81,7 +81,7 @@ class CheckFluentdMonitorAgent < Sensu::Plugin::Check::CLI
     end
 
     begin
-      timeout(config[:timeout]) do
+      Timeout.timeout(config[:timeout]) do
         acquire_resource
       end
     rescue Timeout::Error

data/bin/handler-fluentd.rb

@@ -86,14 +86,14 @@ class Fluentd < Sensu::Handler
 
         response = http.request(request)
         if response.code == '200'
-          puts "fluentd -- #{@event['action']} incident -- #{incident_key}"
+          puts "fluentd -- #{@event['action']} incident -- #{event_name}"
         else
-          puts "fluentd -- failed to send #{@event['action']} incident -- #{incident_key}"
+          puts "fluentd -- failed to send #{@event['action']} incident -- #{event_name}"
           puts "fluentd -- response: #{response.inspect}"
         end
       end
     rescue Timeout::Error
-      puts "fluentd -- Timed out while attempting to send #{@event['action']} incident -- #{incident_key}"
+      puts "fluentd -- Timed out while attempting to send #{@event['action']} incident -- #{event_name}"
     end
   end
 end

data/bin/metric-fluentd-monitor-agent.rb

@@ -0,0 +1,84 @@
+#!/usr/bin/env ruby
+#
+#   metric-fluentd-monitor
+#
+# DESCRIPTION:
+#   This plugin uses fluentd monitor_agent to monitor buffer, produces
+#   Graphite formatted output.
+#
+# OUTPUT:
+#   metric data
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#
+# USAGE:
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright 2015 Junpei Tsuji.
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/metric/cli'
+require 'socket'
+require 'net/http'
+require 'timeout'
+require 'json'
+
+class MetricFluentdMonitorAgent < Sensu::Plugin::Metric::CLI::Graphite
+  option :scheme,
+         long: '--scheme SCHEME',
+         description: 'Metric naming scheme',
+         default: "#{Socket.gethostname}.fluentd"
+  option :url,
+         short: '-u URL',
+         long: '--url URL',
+         description: 'Fluentd plugins json path',
+         default: 'http://localhost:24220/api/plugins.json'
+  option :timeout,
+         short: '-t SECONDS',
+         long: '--timeout SECONDS',
+         description: 'Timeout value in seconds',
+         default: 5,
+         proc: proc(&:to_i)
+
+  def run
+    if config[:url]
+      uri = URI.parse(config[:url])
+      config[:host] = uri.host
+      config[:port] = uri.port
+      config[:request_uri] = uri.request_uri
+    end
+
+    begin
+      Timeout.timeout(config[:timeout]) do
+        acquire_resource
+      end
+    rescue Timeout::Error
+      critical 'Connection timed out'
+    rescue => e
+      critical "Connection error: #{e.message}"
+    end
+  end
+
+  def acquire_resource
+    http = Net::HTTP.new(config[:host], config[:port])
+    response = http.get(config[:request_uri])
+    result = JSON.parse(response.body)
+    timestamp = Time.now.to_i
+
+    result['plugins'].each do |r|
+      next if r['retry_count'].nil? || r['buffer_total_queued_size'].nil? || r['buffer_queue_length'].nil?
+      output [config[:scheme], r['plugin_id'], 'retry_count'].join('.'), r['retry_count'], timestamp
+      output [config[:scheme], r['plugin_id'], 'buffer_total_queued_size'].join('.'), r['buffer_total_queued_size'], timestamp
+      output [config[:scheme], r['plugin_id'], 'buffer_queue_length'].join('.'), r['buffer_queue_length'], timestamp
+    end
+    ok
+  end
+end

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

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

metadata

@@ -1,182 +1,161 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-fluentd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2015-12-03 00:00:00.000000000 Z
+cert_chain: []
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.8'
 description: Sensu plugins for working with fluentd
 email: "<sensu-users@googlegroups.com>"
 executables:
-- handler-fluentd.rb
 - check-fluentd-monitor-agent.rb
+- handler-fluentd.rb
+- metric-fluentd-monitor-agent.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -185,6 +164,7 @@ files:
 - README.md
 - bin/check-fluentd-monitor-agent.rb
 - bin/handler-fluentd.rb
+- bin/metric-fluentd-monitor-agent.rb
 - lib/sensu-plugins-fluentd.rb
 - lib/sensu-plugins-fluentd/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-fluentd
@@ -205,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -213,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for working with fluentd

checksums.yaml.gz.sig

@@ -1 +0,0 @@
-���}�

data.tar.gz.sig

@@ -1 +0,0 @@
-1	VF�