Support Logstash 6.x metrics

Co-authored-by: Philipp Hellmich <phil@hellmi.de>
Co-authored-by: Ben Abrams <me@benabrams.it>

Author: 3 people

CHANGELOG.md

@@ -4,6 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
 
 ## [Unreleased]
+### Added
+- Support for Logstash 6.x node stats metrics (@runningman84, @Evesy)
 
 ## [2.0.0] - 2017-11-07
 ### Breaking Changes

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 @@ def run # rubocop:disable Metrics/AbcSize
     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|