sensu-plugins-logstash 1.3.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +10 -2
  3. data/bin/metrics-logstash-node.rb +11 -10
  4. data/lib/sensu-plugins-logstash/version.rb +2 -2
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8f71163f1ba9ad6177b7db025f1f699d9bd2e551c1a688cf27aa2f7f7808733d
4
- data.tar.gz: 1e1173ee5db093c21f48331430ace90a4bec2247cbfe969842ab07d657da0240
3
+ metadata.gz: 1d6a8ea3de650713c6d9f7af426ffb8cd69f06f3f65d8c3c679be6a5dc42bd0d
4
+ data.tar.gz: 65d7ada5c842680e922fd07a2dddb405f1349c66de8dc0ca250118b308e6625b
5
5
  SHA512:
6
- metadata.gz: 5bad41d92ccfb355a8f4e620ae03b370aaf072009d63cea7c091106f17bcc70c63e5a8527000f0207ddd680a45d36da80c2066ebc9f5574bdfccd12886efd52c
7
- data.tar.gz: bee45e1a079f48587d3d9bcfa67c392120680d8790e92ffecbb874330d3dbf7eefa6d5e96cd32b17c845316837dfd231b853c394532ffcdc613f2d89a021bf33
6
+ metadata.gz: 3bdca72e48de5482f11e9e89ecb20a9ce642f4167b64c60e7be2e7b19938a454754b4ee5fa371ae715c068841975d929d859308785d8748b3659428c878e7f59
7
+ data.tar.gz: 5ec20b148ca23740e4b154da41bb863cf957ef1b58a51778f66559cd28c6df2f4889fb3d1b732c0e9c00b611beb48d3565dc32112843573f37384e31d1fa6a15
data/CHANGELOG.md CHANGED
@@ -1,10 +1,17 @@
1
1
  # Change Log
2
2
  This project adheres to [Semantic Versioning](http://semver.org/).
3
3
 
4
- This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
4
+ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
5
5
 
6
6
  ## [Unreleased]
7
7
 
8
+ ## [2.0.0] - 2017-11-07
9
+ ### Breaking Changes
10
+ - metrics-logstash-node.rb: Added plugin name into pipeline metrics (@Evesy)
11
+
12
+ ### Changed
13
+ - updated changelog guidelines location (@majormoses)
14
+
8
15
  ## [1.3.0] - 2017-11-04
9
16
  ### Added
10
17
  - 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
59
66
  ### Added
60
67
  - initial release
61
68
 
62
- [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.2.0...HEAD
69
+ [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/2.0.0...HEAD
70
+ [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.3.0...2.0.0
63
71
  [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.2.0...1.3.0
64
72
  [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.1.1...1.2.0
65
73
  [1.1.1]: https://github.com/sensu-plugins/sensu-plugins-logstash/compare/1.1.0...1.1.1
data/bin/metrics-logstash-node.rb CHANGED
@@ -119,24 +119,25 @@ class LogstashNodeMetrics < Sensu::Plugin::Metric::CLI::Graphite
119
119
 
120
120
  node['pipeline']['plugins']['inputs'].each do |item|
121
121
  item['events'] = {} unless item.key?('events')
122
- metrics["pipeline.plugins.inputs.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
123
- metrics["pipeline.plugins.inputs.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
124
- metrics["pipeline.plugins.inputs.#{item['id']}.events.queue_push_duration_in_millis"] = item['events']['queue_push_duration_in_millis'].to_i || 0
122
+ metrics["pipeline.plugins.inputs.#{item['name']}.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
123
+ metrics["pipeline.plugins.inputs.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
124
+ metrics["pipeline.plugins.inputs.#{item['name']}.#{item['id']}.events.queue_push_duration_in_millis"] = \
125
+ item['events']['queue_push_duration_in_millis'].to_i || 0
125
126
  end
126
127
 
127
128
  node['pipeline']['plugins']['filters'].each do |item|
128
129
  item['events'] = {} unless item.key?('events')
129
- metrics["pipeline.plugins.filters.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
130
- metrics["pipeline.plugins.filters.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
131
- metrics["pipeline.plugins.filters.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0
132
- metrics["pipeline.plugins.filters.#{item['id']}.matches"] = item['matches'].to_i if item.key?('matches')
130
+ metrics["pipeline.plugins.filters.#{item['name']}.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
131
+ metrics["pipeline.plugins.filters.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
132
+ metrics["pipeline.plugins.filters.#{item['name']}.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0
133
+ metrics["pipeline.plugins.filters.#{item['name']}.#{item['id']}.matches"] = item['matches'].to_i if item.key?('matches')
133
134
  end
134
135
 
135
136
  node['pipeline']['plugins']['outputs'].each do |item|
136
137
  item['events'] = {} unless item.key?('events')
137
- metrics["pipeline.plugins.outputs.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
138
- metrics["pipeline.plugins.outputs.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
139
- metrics["pipeline.plugins.outputs.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0
138
+ metrics["pipeline.plugins.outputs.#{item['name']}.#{item['id']}.events.in"] = item['events']['in'].to_i || 0
139
+ metrics["pipeline.plugins.outputs.#{item['name']}.#{item['id']}.events.out"] = item['events']['out'].to_i || 0
140
+ metrics["pipeline.plugins.outputs.#{item['name']}.#{item['id']}.events.duration_in_millis"] = item['events']['duration_in_millis'].to_i || 0
140
141
  end
141
142
 
142
143
  metrics.each do |k, v|
data/lib/sensu-plugins-logstash/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module SensuPluginsLogstash
2
2
  module Version
3
- MAJOR = 1
4
- MINOR = 3
3
+ MAJOR = 2
4
+ MINOR = 0
5
5
  PATCH = 0
6
6
 
7
7
  VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sensu-plugins-logstash
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sensu Plugins and contributors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-11-04 00:00:00.000000000 Z
11
+ date: 2017-11-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: json