sensu-plugins-logstash 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f71163f1ba9ad6177b7db025f1f699d9bd2e551c1a688cf27aa2f7f7808733d
-  data.tar.gz: 1e1173ee5db093c21f48331430ace90a4bec2247cbfe969842ab07d657da0240
+  metadata.gz: 1d6a8ea3de650713c6d9f7af426ffb8cd69f06f3f65d8c3c679be6a5dc42bd0d
+  data.tar.gz: 65d7ada5c842680e922fd07a2dddb405f1349c66de8dc0ca250118b308e6625b
 SHA512:
-  metadata.gz: 5bad41d92ccfb355a8f4e620ae03b370aaf072009d63cea7c091106f17bcc70c63e5a8527000f0207ddd680a45d36da80c2066ebc9f5574bdfccd12886efd52c
-  data.tar.gz: bee45e1a079f48587d3d9bcfa67c392120680d8790e92ffecbb874330d3dbf7eefa6d5e96cd32b17c845316837dfd231b853c394532ffcdc613f2d89a021bf33
+  metadata.gz: 3bdca72e48de5482f11e9e89ecb20a9ce642f4167b64c60e7be2e7b19938a454754b4ee5fa371ae715c068841975d929d859308785d8748b3659428c878e7f59
+  data.tar.gz: 5ec20b148ca23740e4b154da41bb863cf957ef1b58a51778f66559cd28c6df2f4889fb3d1b732c0e9c00b611beb48d3565dc32112843573f37384e31d1fa6a15

data/CHANGELOG.md

@@ -1,10 +1,17 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
+This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
 
 ## [Unreleased]
 
+## [2.0.0] - 2017-11-07
+### Breaking Changes
+- metrics-logstash-node.rb: Added plugin name into pipeline metrics (@Evesy)
+
+### Changed
+- updated changelog guidelines location (@majormoses)
+
 ## [1.3.0] - 2017-11-04
 ### Added
 - metrics-logstash-node.rb: Added missing pipeline output duration metric. (@Evesy)
@@ -59,7 +66,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.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/2.0.0...HEAD
+[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
 [1.1.1]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.1.0...1.1.1

data/bin/metrics-logstash-node.rb

@@ -119,24 +119,25 @@ class LogstashNodeMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
     node['pipeline']['plugins']['inputs'].each do |item|
       item['events'] = {} unless item.key?('events')
-      metrics["pipeline.plugins.inputs.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
-      metrics["pipeline.plugins.inputs.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
-      metrics["pipeline.plugins.inputs.#{item['id']}.events.queue_push_duration_in_millis"] = item['events']['queue_push_duration_in_millis'].to_i || 0
+      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['id']}.events.in"] = item['events']['in'].to_i || 0
-      metrics["pipeline.plugins.filters.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
-      metrics["pipeline.plugins.filters.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0
-      metrics["pipeline.plugins.filters.#{item['id']}.matches"] = item['matches'].to_i if item.key?('matches')
+      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['id']}.events.in"] = item['events']['in'].to_i || 0
-      metrics["pipeline.plugins.outputs.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
-      metrics["pipeline.plugins.outputs.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0
+      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
 
     metrics.each do |k, v|

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

@@ -1,7 +1,7 @@
 module SensuPluginsLogstash
   module Version
-    MAJOR = 1
-    MINOR = 3
+    MAJOR = 2
+    MINOR = 0
     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: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json