sensu-plugins-logstash 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d6a8ea3de650713c6d9f7af426ffb8cd69f06f3f65d8c3c679be6a5dc42bd0d
-  data.tar.gz: 65d7ada5c842680e922fd07a2dddb405f1349c66de8dc0ca250118b308e6625b
+  metadata.gz: 966b4e25ca6abb9e58691dae1244bb3dd5c0408a131177f6f100de35655ae727
+  data.tar.gz: f6d8b6a6384a49f3706c3211216a74ed7ab1995ba354043eb6b094d77a0dff97
 SHA512:
-  metadata.gz: 3bdca72e48de5482f11e9e89ecb20a9ce642f4167b64c60e7be2e7b19938a454754b4ee5fa371ae715c068841975d929d859308785d8748b3659428c878e7f59
-  data.tar.gz: 5ec20b148ca23740e4b154da41bb863cf957ef1b58a51778f66559cd28c6df2f4889fb3d1b732c0e9c00b611beb48d3565dc32112843573f37384e31d1fa6a15
+  metadata.gz: 9e337022bc4b973063dcafc5c03d4d89a8b67c7c6818c343cd4a61bde6187b03d36ce8f2060901b20dea4d7df3a0c846fa3ff95fb0ccc31a41f2f61453cc8666
+  data.tar.gz: 2a9d811058cf74e9d6e9e361ca46c3f61eb13be316f04ff7e26085f76c88644c5f05ab65a90d3bd55932e49ebe76e1841f089ec76ad29de6656e14bc8291f99e

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [2.1.0] - 2018-03-14
+### Added
+- Support for Logstash 6.x node stats metrics (@runningman84, @Evesy)
+
 ## [2.0.0] - 2017-11-07
 ### Breaking Changes
 - metrics-logstash-node.rb: Added plugin name into pipeline metrics (@Evesy)
@@ -67,6 +71,7 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/2.0.0...HEAD
+[2.1.0]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.3.0...2.0.0
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.2.0...1.3.0
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.1.1...1.2.0

data/bin/metrics-logstash-node.rb

@@ -24,7 +24,7 @@
 #
 # LICENSE:
 #   Copyright 2011 Sonian, Inc <chefs@sonian.net>
-#   Copyright 2016 Philipp Hellmich <phil@hellmi.de>
+#   Copyright 2018 Philipp Hellmich <phil@hellmi.de>
 #   Released under the same terms as Sensu (the MIT license); see LICENSE
 #   for details.
 #
@@ -113,31 +113,65 @@ class LogstashNodeMetrics < Sensu::Plugin::Metric::CLI::Graphite
     metrics['process.peak_open_file_descriptors'] = node['process']['peak_open_file_descriptors']
     metrics['process.max_file_descriptors'] = node['process']['max_file_descriptors']
 
-    node['pipeline']['events'].each do |key, value|
-      metrics["pipeline.events.#{key}"] = value
-    end
-
-    node['pipeline']['plugins']['inputs'].each do |item|
-      item['events'] = {} unless item.key?('events')
-      metrics["pipeline.plugins.inputs.#{item['name']}.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
-      metrics["pipeline.plugins.inputs.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
-      metrics["pipeline.plugins.inputs.#{item['name']}.#{item['id']}.events.queue_push_duration_in_millis"] = \
-        item['events']['queue_push_duration_in_millis'].to_i || 0
-    end
-
-    node['pipeline']['plugins']['filters'].each do |item|
-      item['events'] = {} unless item.key?('events')
-      metrics["pipeline.plugins.filters.#{item['name']}.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
-      metrics["pipeline.plugins.filters.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
-      metrics["pipeline.plugins.filters.#{item['name']}.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0
-      metrics["pipeline.plugins.filters.#{item['name']}.#{item['id']}.matches"] = item['matches'].to_i if item.key?('matches')
-    end
-
-    node['pipeline']['plugins']['outputs'].each do |item|
-      item['events'] = {} unless item.key?('events')
-      metrics["pipeline.plugins.outputs.#{item['name']}.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
-      metrics["pipeline.plugins.outputs.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
-      metrics["pipeline.plugins.outputs.#{item['name']}.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0
+    # logstash < 6.0
+    if node.key?('pipeline')
+      node['pipeline']['events'].each do |key, value|
+        metrics["pipeline.events.#{key}"] = value
+      end
+
+      node['pipeline']['plugins']['inputs'].each do |item|
+        item['events'] = {} unless item.key?('events')
+        metrics["pipeline.plugins.inputs.#{item['name']}.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
+        metrics["pipeline.plugins.inputs.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
+        metrics["pipeline.plugins.inputs.#{item['name']}.#{item['id']}.events.queue_push_duration_in_millis"] = \
+          item['events']['queue_push_duration_in_millis'].to_i || 0
+      end
+
+      node['pipeline']['plugins']['filters'].each do |item|
+        metrics["pipeline.plugins.filters.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
+        metrics["pipeline.plugins.filters.#{item['name']}.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0
+        metrics["pipeline.plugins.filters.#{item['name']}.#{item['id']}.matches"] = item['matches'].to_i if item.key?('matches')
+      end
+
+      node['pipeline']['plugins']['outputs'].each do |item|
+        item['events'] = {} unless item.key?('events')
+        metrics["pipeline.plugins.outputs.#{item['name']}.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
+        metrics["pipeline.plugins.outputs.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
+        metrics["pipeline.plugins.outputs.#{item['name']}.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0
+      end
+    # logstash >= 6.0
+    elsif node.key?('pipelines')
+      node['pipelines'].each_key do |pipeline|
+        if node['pipelines'][pipeline]['events'].nil? || node['pipelines'][pipeline]['events'] == 'null'
+          # Skip
+        else
+          node['pipelines'][pipeline]['events'].each do |key, value|
+            metrics["pipelines.#{pipeline}.events.#{key}"] = value
+          end
+        end
+
+        node['pipelines'][pipeline]['plugins']['inputs'].each do |item|
+          item['events'] = {} unless item.key?('events')
+          metrics["pipelines.#{pipeline}.plugins.inputs.#{item['name']}.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
+          metrics["pipelines.#{pipeline}.plugins.inputs.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
+          metrics["pipelines.#{pipeline}.plugins.inputs.#{item['name']}.#{item['id']}.events.queue_push_duration_in_millis"] = item['events']['queue_push_duration_in_millis'].to_i || 0 # rubocop:disable Metrics/LineLength
+        end
+
+        node['pipelines'][pipeline]['plugins']['filters'].each do |item|
+          item['events'] = {} unless item.key?('events')
+          metrics["pipelines.#{pipeline}.plugins.filters.#{item['name']}.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
+          metrics["pipelines.#{pipeline}.plugins.filters.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
+          metrics["pipelines.#{pipeline}.plugins.filters.#{item['name']}.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0 # rubocop:disable Metrics/LineLength
+          metrics["pipelines.#{pipeline}.plugins.filters.#{item['name']}.#{item['id']}.matches"] = item['matches'].to_i if item.key?('matches')
+        end
+
+        node['pipelines'][pipeline]['plugins']['outputs'].each do |item|
+          item['events'] = {} unless item.key?('events')
+          metrics["pipelines.#{pipeline}.plugins.outputs.#{item['name']}.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
+          metrics["pipelines.#{pipeline}.plugins.outputs.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
+          metrics["pipelines.#{pipeline}.plugins.outputs.#{item['name']}.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0 # rubocop:disable Metrics/LineLength
+        end
+      end
     end
 
     metrics.each do |k, v|

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-logstash
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for working with logstash