sensu-plugins-logstash 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a2d687c679ae0fe582beb5778e4db2f4e12bf62
-  data.tar.gz: 272f841956109a14fd161b0023836422eb10f78a
+  metadata.gz: 1dd508763a1de6a8422e45a002377ab160cd3729
+  data.tar.gz: 3d3b335b66d9a689de0a01a8f0868052530cdc94
 SHA512:
-  metadata.gz: d238bf0b47db82d88f16b00b0c158f317b8f6e232e11226989f0ffedc83a1122d334e33a59bfb141b26c807b22aa12f146a12641b71a90f64d1a767b3cb5b782
-  data.tar.gz: a5cfddbd9c76a97c2d10aefcb8692534ae42df199fab04e0e6b9d7e1d6bb5148186fe108c1499ac90b9b68e765d5b1480940925cec0d865ad0d9213b10034da8
+  metadata.gz: fed9e9d92aeeedbf0e894355363daa55efac73a954187bd3f3af5adf22b0ce0170abdea386cb6417ad08d562579d7446b3ba12aaeb145c6f5f908b257009329d
+  data.tar.gz: 5996ca6076b6f2332537720d52047a6bc2f9d8e09120a382c5e4e010ee4ec71e67235fb7d0c456dea758231ab20c599dfb41c63b107765ec67c4cc3c2a23e084

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.1.1] - 2017-08-26
+### Fixed
+- locking runtime dependency and misc changes to `metrics-logstash-node.rb` (@multani)
+
+
 ## [1.1.0] - 2017-07-27
 ## Added
 - test with ruby 2.4 as sensu now ships with it. (@majormoses)
@@ -46,7 +51,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.1.1...HEAD
+[1.1.1]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/0.1.1...1.0.0
 [0.1.1]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/0.1.0...0.1.1

data/bin/metrics-logstash-node.rb

@@ -1,10 +1,10 @@
 #! /usr/bin/env ruby
 #
-#   logstash-node-metrics
+#   metrics-logstash-node
 #
 # DESCRIPTION:
-#   This plugin uses the Logstash API to collect metrics, producing a JSON
-#   document which is outputted to STDOUT. An exit status of 0 indicates
+#   This plugin uses the Logstash node info API to collect metrics, producing a
+#   JSON document which is outputted to STDOUT. An exit status of 0 indicates
 #   the plugin has successfully collected and produced.
 #
 # OUTPUT:
@@ -35,35 +35,35 @@ require 'json'
 require 'base64'
 
 #
-# ES Node Metrics
+# Logstash Node Metrics
 #
-class ESMetrics < Sensu::Plugin::Metric::CLI::Graphite
+class LogstashNodeMetrics < Sensu::Plugin::Metric::CLI::Graphite
   option :scheme,
-         description: 'Metric naming scheme, text to prepend to queue_name.metric',
+         description: 'Metric naming scheme, text to prepend to metrics',
          short: '-s SCHEME',
          long: '--scheme SCHEME',
          default: "#{Socket.gethostname}.logstash"
 
   option :host,
-         description: 'Elasticsearch server host.',
+         description: 'Logstash server host',
          short: '-h HOST',
          long: '--host HOST',
          default: 'localhost'
 
   option :port,
-         description: 'Elasticsearch port',
+         description: 'Logstash monitoring port',
          short: '-p PORT',
          long: '--port PORT',
          proc: proc(&:to_i),
          default: 9600
 
   option :user,
-         description: 'Elasticsearch User',
+         description: 'Logstash user',
          short: '-u USER',
          long: '--user USER'
 
   option :password,
-         description: 'Elasticsearch Password',
+         description: 'Logstash password',
          short: '-P PASS',
          long: '--password PASS'
 
@@ -72,7 +72,7 @@ class ESMetrics < Sensu::Plugin::Metric::CLI::Graphite
          short: '-e',
          long: '--https'
 
-  def get_es_resource(resource)
+  def get_logstash_resource(resource)
     headers = {}
     if config[:user] && config[:password]
       auth = 'Basic ' + Base64.encode64("#{config[:user]}:#{config[:password]}").chomp
@@ -94,7 +94,7 @@ class ESMetrics < Sensu::Plugin::Metric::CLI::Graphite
   end
 
   def run # rubocop:disable Metrics/AbcSize
-    stats = get_es_resource('/_node/stats')
+    stats = get_logstash_resource('/_node/stats')
 
     timestamp = Time.now.to_i
     node = stats

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

@@ -2,7 +2,7 @@ module SensuPluginsLogstash
   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-logstash
 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-07-27 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement