logstash-codec-collectd 3.0.5 → 3.1.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 63ac08a68257e70f7d485f077a0225c08e7a946ba6e09bdd96c1c88b8745f0dc
4
- data.tar.gz: dcf2c7230754ece32ffeb490a322732bf4e0ef4dea81bc64eb28675763fd3328
3
+ metadata.gz: 3a993d9da038b8ec3c114be1c907171dc1e1b162f08886a34bc14570ff2da73c
4
+ data.tar.gz: 38643203dc30bc2bb8ca601b3a1b6f560038d7e3f38f8315b1b218832c6529d5
5
5
  SHA512:
6
- metadata.gz: 0f0a6f7174e35fb26786aac8d312c082e632b047a9d6106164e8c2c7bec116031569fb6bbc842deef7e98fafdbec38674f8c43b7248ba28fef40369bce49fe5a
7
- data.tar.gz: fe964abe4ffff29f61cfd35d793cb5210b55c641ead7962c5794ccdf75ce36369be125bdcddd9176ec7e16e0afc78d0b4285340a87b11e0ecf7bc303bba756a6
6
+ metadata.gz: 7f2fea6cd526a0fc5f1306985b57ba48284514106537471e9d176c842e2cc3f2378fc9bbf9228b2177053288eeb3082835f358e944d57052e363657d5a617ddd
7
+ data.tar.gz: 1cbd8415d04e6570b0880c9765148636cf3d97bc282a005b9effb3bc678f96615aeef680f8bfa83140801c8382ee3d908c74987fcd1fd5fabbc7bdc8373979c6
data/CHANGELOG.md CHANGED
@@ -1,3 +1,18 @@
1
+ ## 3.1.0
2
+ - Feat: added target configuration + event-factory support [#31](https://github.com/logstash-plugins/logstash-codec-collectd/pull/31)
3
+
4
+ ## 3.0.8
5
+ - Update gemspec summary
6
+
7
+ ## 3.0.7
8
+ - Fix some documentation issues
9
+
10
+ ## 3.0.6
11
+ - Return types.db to the list of items to be included in the gem
12
+
13
+ ## 3.0.5
14
+ - Minor documentation changes for better flow and understanding
15
+
1
16
  ## 3.0.4
2
17
  - Make this plugins compatible with JRuby 9 by using the OpenSSL::HMAC class and keep it backward compatible with JRuby 1.7.25 (Issue #24)
3
18
 
data/LICENSE CHANGED
@@ -1,13 +1,202 @@
1
- Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
2
1
 
3
- Licensed under the Apache License, Version 2.0 (the "License");
4
- you may not use this file except in compliance with the License.
5
- You may obtain a copy of the License at
2
+ Apache License
3
+ Version 2.0, January 2004
4
+ http://www.apache.org/licenses/
6
5
 
7
- http://www.apache.org/licenses/LICENSE-2.0
6
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
8
7
 
9
- Unless required by applicable law or agreed to in writing, software
10
- distributed under the License is distributed on an "AS IS" BASIS,
11
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- See the License for the specific language governing permissions and
13
- limitations under the License.
8
+ 1. Definitions.
9
+
10
+ "License" shall mean the terms and conditions for use, reproduction,
11
+ and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+ "Licensor" shall mean the copyright owner or entity authorized by
14
+ the copyright owner that is granting the License.
15
+
16
+ "Legal Entity" shall mean the union of the acting entity and all
17
+ other entities that control, are controlled by, or are under common
18
+ control with that entity. For the purposes of this definition,
19
+ "control" means (i) the power, direct or indirect, to cause the
20
+ direction or management of such entity, whether by contract or
21
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+ outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+ "You" (or "Your") shall mean an individual or Legal Entity
25
+ exercising permissions granted by this License.
26
+
27
+ "Source" form shall mean the preferred form for making modifications,
28
+ including but not limited to software source code, documentation
29
+ source, and configuration files.
30
+
31
+ "Object" form shall mean any form resulting from mechanical
32
+ transformation or translation of a Source form, including but
33
+ not limited to compiled object code, generated documentation,
34
+ and conversions to other media types.
35
+
36
+ "Work" shall mean the work of authorship, whether in Source or
37
+ Object form, made available under the License, as indicated by a
38
+ copyright notice that is included in or attached to the work
39
+ (an example is provided in the Appendix below).
40
+
41
+ "Derivative Works" shall mean any work, whether in Source or Object
42
+ form, that is based on (or derived from) the Work and for which the
43
+ editorial revisions, annotations, elaborations, or other modifications
44
+ represent, as a whole, an original work of authorship. For the purposes
45
+ of this License, Derivative Works shall not include works that remain
46
+ separable from, or merely link (or bind by name) to the interfaces of,
47
+ the Work and Derivative Works thereof.
48
+
49
+ "Contribution" shall mean any work of authorship, including
50
+ the original version of the Work and any modifications or additions
51
+ to that Work or Derivative Works thereof, that is intentionally
52
+ submitted to Licensor for inclusion in the Work by the copyright owner
53
+ or by an individual or Legal Entity authorized to submit on behalf of
54
+ the copyright owner. For the purposes of this definition, "submitted"
55
+ means any form of electronic, verbal, or written communication sent
56
+ to the Licensor or its representatives, including but not limited to
57
+ communication on electronic mailing lists, source code control systems,
58
+ and issue tracking systems that are managed by, or on behalf of, the
59
+ Licensor for the purpose of discussing and improving the Work, but
60
+ excluding communication that is conspicuously marked or otherwise
61
+ designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+ "Contributor" shall mean Licensor and any individual or Legal Entity
64
+ on behalf of whom a Contribution has been received by Licensor and
65
+ subsequently incorporated within the Work.
66
+
67
+ 2. Grant of Copyright License. Subject to the terms and conditions of
68
+ this License, each Contributor hereby grants to You a perpetual,
69
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+ copyright license to reproduce, prepare Derivative Works of,
71
+ publicly display, publicly perform, sublicense, and distribute the
72
+ Work and such Derivative Works in Source or Object form.
73
+
74
+ 3. Grant of Patent License. Subject to the terms and conditions of
75
+ this License, each Contributor hereby grants to You a perpetual,
76
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+ (except as stated in this section) patent license to make, have made,
78
+ use, offer to sell, sell, import, and otherwise transfer the Work,
79
+ where such license applies only to those patent claims licensable
80
+ by such Contributor that are necessarily infringed by their
81
+ Contribution(s) alone or by combination of their Contribution(s)
82
+ with the Work to which such Contribution(s) was submitted. If You
83
+ institute patent litigation against any entity (including a
84
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+ or a Contribution incorporated within the Work constitutes direct
86
+ or contributory patent infringement, then any patent licenses
87
+ granted to You under this License for that Work shall terminate
88
+ as of the date such litigation is filed.
89
+
90
+ 4. Redistribution. You may reproduce and distribute copies of the
91
+ Work or Derivative Works thereof in any medium, with or without
92
+ modifications, and in Source or Object form, provided that You
93
+ meet the following conditions:
94
+
95
+ (a) You must give any other recipients of the Work or
96
+ Derivative Works a copy of this License; and
97
+
98
+ (b) You must cause any modified files to carry prominent notices
99
+ stating that You changed the files; and
100
+
101
+ (c) You must retain, in the Source form of any Derivative Works
102
+ that You distribute, all copyright, patent, trademark, and
103
+ attribution notices from the Source form of the Work,
104
+ excluding those notices that do not pertain to any part of
105
+ the Derivative Works; and
106
+
107
+ (d) If the Work includes a "NOTICE" text file as part of its
108
+ distribution, then any Derivative Works that You distribute must
109
+ include a readable copy of the attribution notices contained
110
+ within such NOTICE file, excluding those notices that do not
111
+ pertain to any part of the Derivative Works, in at least one
112
+ of the following places: within a NOTICE text file distributed
113
+ as part of the Derivative Works; within the Source form or
114
+ documentation, if provided along with the Derivative Works; or,
115
+ within a display generated by the Derivative Works, if and
116
+ wherever such third-party notices normally appear. The contents
117
+ of the NOTICE file are for informational purposes only and
118
+ do not modify the License. You may add Your own attribution
119
+ notices within Derivative Works that You distribute, alongside
120
+ or as an addendum to the NOTICE text from the Work, provided
121
+ that such additional attribution notices cannot be construed
122
+ as modifying the License.
123
+
124
+ You may add Your own copyright statement to Your modifications and
125
+ may provide additional or different license terms and conditions
126
+ for use, reproduction, or distribution of Your modifications, or
127
+ for any such Derivative Works as a whole, provided Your use,
128
+ reproduction, and distribution of the Work otherwise complies with
129
+ the conditions stated in this License.
130
+
131
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
132
+ any Contribution intentionally submitted for inclusion in the Work
133
+ by You to the Licensor shall be under the terms and conditions of
134
+ this License, without any additional terms or conditions.
135
+ Notwithstanding the above, nothing herein shall supersede or modify
136
+ the terms of any separate license agreement you may have executed
137
+ with Licensor regarding such Contributions.
138
+
139
+ 6. Trademarks. This License does not grant permission to use the trade
140
+ names, trademarks, service marks, or product names of the Licensor,
141
+ except as required for reasonable and customary use in describing the
142
+ origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+ 7. Disclaimer of Warranty. Unless required by applicable law or
145
+ agreed to in writing, Licensor provides the Work (and each
146
+ Contributor provides its Contributions) on an "AS IS" BASIS,
147
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+ implied, including, without limitation, any warranties or conditions
149
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+ PARTICULAR PURPOSE. You are solely responsible for determining the
151
+ appropriateness of using or redistributing the Work and assume any
152
+ risks associated with Your exercise of permissions under this License.
153
+
154
+ 8. Limitation of Liability. In no event and under no legal theory,
155
+ whether in tort (including negligence), contract, or otherwise,
156
+ unless required by applicable law (such as deliberate and grossly
157
+ negligent acts) or agreed to in writing, shall any Contributor be
158
+ liable to You for damages, including any direct, indirect, special,
159
+ incidental, or consequential damages of any character arising as a
160
+ result of this License or out of the use or inability to use the
161
+ Work (including but not limited to damages for loss of goodwill,
162
+ work stoppage, computer failure or malfunction, or any and all
163
+ other commercial damages or losses), even if such Contributor
164
+ has been advised of the possibility of such damages.
165
+
166
+ 9. Accepting Warranty or Additional Liability. While redistributing
167
+ the Work or Derivative Works thereof, You may choose to offer,
168
+ and charge a fee for, acceptance of support, warranty, indemnity,
169
+ or other liability obligations and/or rights consistent with this
170
+ License. However, in accepting such obligations, You may act only
171
+ on Your own behalf and on Your sole responsibility, not on behalf
172
+ of any other Contributor, and only if You agree to indemnify,
173
+ defend, and hold each Contributor harmless for any liability
174
+ incurred by, or claims asserted against, such Contributor by reason
175
+ of your accepting any such warranty or additional liability.
176
+
177
+ END OF TERMS AND CONDITIONS
178
+
179
+ APPENDIX: How to apply the Apache License to your work.
180
+
181
+ To apply the Apache License to your work, attach the following
182
+ boilerplate notice, with the fields enclosed by brackets "[]"
183
+ replaced with your own identifying information. (Don't include
184
+ the brackets!) The text should be enclosed in the appropriate
185
+ comment syntax for the file format. We also recommend that a
186
+ file or class name and description of purpose be included on the
187
+ same "printed page" as the copyright notice for easier
188
+ identification within third-party archives.
189
+
190
+ Copyright 2020 Elastic and contributors
191
+
192
+ Licensed under the Apache License, Version 2.0 (the "License");
193
+ you may not use this file except in compliance with the License.
194
+ You may obtain a copy of the License at
195
+
196
+ http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+ Unless required by applicable law or agreed to in writing, software
199
+ distributed under the License is distributed on an "AS IS" BASIS,
200
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+ See the License for the specific language governing permissions and
202
+ limitations under the License.
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # Logstash Plugin
2
2
 
3
- [![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-codec-collectd.svg)](https://travis-ci.org/logstash-plugins/logstash-codec-collectd)
3
+ [![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-codec-collectd.svg)](https://travis-ci.com/logstash-plugins/logstash-codec-collectd)
4
4
 
5
5
  This is a plugin for [Logstash](https://github.com/elastic/logstash).
6
6
 
data/docs/index.asciidoc CHANGED
@@ -12,7 +12,7 @@ START - GENERATED VARIABLES, DO NOT EDIT!
12
12
  END - GENERATED VARIABLES, DO NOT EDIT!
13
13
  ///////////////////////////////////////////
14
14
 
15
- [id="plugins-{type}-{plugin}"]
15
+ [id="plugins-{type}s-{plugin}"]
16
16
 
17
17
  === Collectd codec plugin
18
18
 
@@ -45,15 +45,14 @@ A sample `collectd.conf` to send to Logstash might be:
45
45
  IgnoreSelected false
46
46
  </Plugin>
47
47
  <Plugin network>
48
- <Server "10.0.0.1" "25826">
49
- </Server>
48
+ Server "10.0.0.1" "25826"
50
49
  </Plugin>
51
50
 
52
51
  Be sure to replace `10.0.0.1` with the IP of your Logstash instance.
53
52
 
54
53
 
55
54
  [id="plugins-{type}s-{plugin}-options"]
56
- ==== Collectd Codec Configuration Options
55
+ ==== Collectd Codec configuration options
57
56
 
58
57
  [cols="<,<,<",options="header",]
59
58
  |=======================================================================
@@ -64,6 +63,7 @@ Be sure to replace `10.0.0.1` with the IP of your Logstash instance.
64
63
  | <<plugins-{type}s-{plugin}-nan_value>> |<<number,number>>|No
65
64
  | <<plugins-{type}s-{plugin}-prune_intervals>> |<<boolean,boolean>>|No
66
65
  | <<plugins-{type}s-{plugin}-security_level>> |<<string,string>>, one of `["None", "Sign", "Encrypt"]`|No
66
+ | <<plugins-{type}s-{plugin}-target>> |<<string,string>>|No
67
67
  | <<plugins-{type}s-{plugin}-typesdb>> |<<array,array>>|No
68
68
  |=======================================================================
69
69
 
@@ -127,6 +127,26 @@ Prune interval records. Defaults to `true`.
127
127
  Security Level. Default is `None`. This setting mirrors the setting from the
128
128
  collectd https://collectd.org/wiki/index.php/Plugin:Network[Network plugin]
129
129
 
130
+ [id="plugins-{type}s-{plugin}-target"]
131
+ ===== `target`
132
+
133
+ * Value type is <<string,string>>
134
+ * There is no default value for this setting.
135
+
136
+ Define the target field for placing the decoded values. If this setting is not
137
+ set, data will be stored at the root (top level) of the event.
138
+
139
+ For example, if you want data to be put under the `document` field:
140
+ [source,ruby]
141
+ input {
142
+ udp {
143
+ port => 12345
144
+ codec => collectd {
145
+ target => "[document]"
146
+ }
147
+ }
148
+ }
149
+
130
150
  [id="plugins-{type}s-{plugin}-typesdb"]
131
151
  ===== `typesdb`
132
152
 
@@ -6,12 +6,8 @@ require "logstash/errors"
6
6
  require "tempfile"
7
7
  require "time"
8
8
 
9
- import "javax.crypto.Mac"
10
-
11
- class ProtocolError < LogStash::Error; end
12
- class HeaderError < LogStash::Error; end
13
- class EncryptionError < LogStash::Error; end
14
- class NaNError < LogStash::Error; end
9
+ require 'logstash/plugin_mixins/event_support/event_factory_adapter'
10
+ require 'logstash/plugin_mixins/validator_support/field_reference_validation_adapter'
15
11
 
16
12
  # Read events from the collectd binary protocol over the network via udp.
17
13
  # See https://collectd.org/wiki/index.php/Binary_protocol
@@ -38,15 +34,24 @@ class NaNError < LogStash::Error; end
38
34
  # IgnoreSelected false
39
35
  # </Plugin>
40
36
  # <Plugin network>
41
- # <Server "10.0.0.1" "25826">
42
- # </Server>
37
+ # Server "10.0.0.1" "25826"
43
38
  # </Plugin>
44
39
  #
45
40
  # Be sure to replace `10.0.0.1` with the IP of your Logstash instance.
46
41
  #
47
42
  class LogStash::Codecs::Collectd < LogStash::Codecs::Base
43
+
44
+ extend LogStash::PluginMixins::ValidatorSupport::FieldReferenceValidationAdapter
45
+
46
+ include LogStash::PluginMixins::EventSupport::EventFactoryAdapter
47
+
48
48
  config_name "collectd"
49
49
 
50
+ class ProtocolError < LogStash::Error; end
51
+ class HeaderError < LogStash::Error; end
52
+ class EncryptionError < LogStash::Error; end
53
+ class NaNError < LogStash::Error; end
54
+
50
55
  @@openssl_mutex = Mutex.new
51
56
 
52
57
  AUTHFILEREGEX = /([^:]+): (.+)/
@@ -108,8 +113,7 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
108
113
 
109
114
  # Security Level. Default is `None`. This setting mirrors the setting from the
110
115
  # collectd https://collectd.org/wiki/index.php/Plugin:Network[Network plugin]
111
- config :security_level, :validate => [SECURITY_NONE, SECURITY_SIGN, SECURITY_ENCR],
112
- :default => "None"
116
+ config :security_level, :validate => [SECURITY_NONE, SECURITY_SIGN, SECURITY_ENCR], :default => "None"
113
117
 
114
118
  # What to do when a value in the event is `NaN` (Not a Number)
115
119
  #
@@ -132,6 +136,12 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
132
136
  # `Sign` or `Encrypt`
133
137
  config :authfile, :validate => :string
134
138
 
139
+ # Defines a target field for placing decoded fields.
140
+ # If this setting is omitted, data gets stored at the root (top level) of the event.
141
+ #
142
+ # NOTE: the target is only relevant while decoding data into a new event.
143
+ config :target, :validate => :field_reference
144
+
135
145
  public
136
146
  def register
137
147
  @logger.trace("Starting Collectd codec...")
@@ -467,14 +477,10 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
467
477
  # This is better than looping over all keys every time.
468
478
  collectd.delete('type_instance') if collectd['type_instance'] == ""
469
479
  collectd.delete('plugin_instance') if collectd['plugin_instance'] == ""
470
- if add_nan_tag
471
- collectd['tags'] ||= []
472
- collectd['tags'] << @nan_tag
473
- end
474
480
  # This ugly little shallow-copy hack keeps the new event from getting munged by the cleanup
475
481
  # With pass-by-reference we get hosed (if we pass collectd, then clean it up rapidly, values can disappear)
476
482
  if !drop # Drop the event if it's flagged true
477
- yield LogStash::Event.new(collectd.dup)
483
+ yield generate_event(collectd.dup, add_nan_tag)
478
484
  else
479
485
  raise(NaNError)
480
486
  end
@@ -485,8 +491,15 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
485
491
  end
486
492
  end
487
493
  end # while payload.length > 0 do
488
- rescue EncryptionError, ProtocolError, HeaderError, NaNError
494
+ rescue EncryptionError, ProtocolError, HeaderError, NaNError => e
489
495
  # basically do nothing, we just want out
496
+ @logger.debug("Decode failure", payload: payload, message: e.message)
490
497
  end # def decode
491
498
 
499
+ def generate_event(payload, add_nan_tag)
500
+ event = targeted_event_factory.new_event(payload)
501
+ event.tag @nan_tag if add_nan_tag
502
+ event
503
+ end
504
+
492
505
  end # class LogStash::Codecs::Collectd
@@ -1,8 +1,8 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-codec-collectd'
3
- s.version = '3.0.5'
3
+ s.version = '3.1.0'
4
4
  s.licenses = ['Apache License (2.0)']
5
- s.summary = "Read events from the collectd binary protocol"
5
+ s.summary = "Reads events from the `collectd` binary protocol using UDP."
6
6
  s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
7
7
  s.authors = ["Elastic"]
8
8
  s.email = 'info@elastic.co'
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
10
10
  s.require_paths = ["lib"]
11
11
 
12
12
  # Files
13
- s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
13
+ s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/types.db", "VERSION", "docs/**/*"]
14
14
 
15
15
  # Tests
16
16
  s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,6 +20,9 @@ Gem::Specification.new do |s|
20
20
 
21
21
  # Gem dependencies
22
22
  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
23
+ s.add_runtime_dependency 'logstash-mixin-event_support', '~> 1.0'
24
+ s.add_runtime_dependency 'logstash-mixin-validator_support', '~> 1.0'
23
25
 
24
26
  s.add_development_dependency 'logstash-devutils'
27
+ s.add_development_dependency 'insist'
25
28
  end
@@ -94,6 +94,36 @@ describe LogStash::Codecs::Collectd do
94
94
  end
95
95
  expect(counter).to eq(1)
96
96
  end # it "should replace a NaN with a zero and add tag '_collectdNaN' by default"
97
+
98
+ context 'with target' do
99
+
100
+ subject do
101
+ LogStash::Codecs::Collectd.new("target" => "[foo]")
102
+ end
103
+
104
+ it "decodes with data into target field" do
105
+ payload = ["00000015746573742e6578616d706c652e636f6d000008000c14dc4c81831ef78b0009000c00000000400000000002000970696e67000004000970696e67000005001c70696e672d7461726765742e6578616d706c652e636f6d000006000f000101000000000000f87f"].pack('H*')
106
+ counter = 0
107
+ subject.decode(payload) do |event|
108
+ case counter
109
+ when 0
110
+ expect(event.include?("host")).to be false
111
+ expect(event.include?("plugin")).to be false
112
+
113
+ expect(event.get("[foo][host]")).to eq("test.example.com")
114
+ expect(event.get("[foo][plugin]")).to eq("ping")
115
+ expect(event.get("[foo][type_instance]")).to eq("ping-target.example.com")
116
+ expect(event.get("[foo][collectd_type]")).to eq("ping")
117
+ expect(event.get("[foo][value]")).to eq(0)
118
+ expect(event.get("tags")).to eq(["_collectdNaN"])
119
+ end
120
+ counter += 1
121
+ end
122
+ expect(counter).to eq(1)
123
+ end
124
+
125
+ end
126
+
97
127
  end # context "None"
98
128
 
99
129
  context "Replace nan_value and nan_tag with non-default values" do
data/vendor/types.db ADDED
@@ -0,0 +1,208 @@
1
+ absolute value:ABSOLUTE:0:U
2
+ apache_bytes value:DERIVE:0:U
3
+ apache_connections value:GAUGE:0:65535
4
+ apache_idle_workers value:GAUGE:0:65535
5
+ apache_requests value:DERIVE:0:U
6
+ apache_scoreboard value:GAUGE:0:65535
7
+ ath_nodes value:GAUGE:0:65535
8
+ ath_stat value:DERIVE:0:U
9
+ backends value:GAUGE:0:65535
10
+ bitrate value:GAUGE:0:4294967295
11
+ bytes value:GAUGE:0:U
12
+ cache_eviction value:DERIVE:0:U
13
+ cache_operation value:DERIVE:0:U
14
+ cache_ratio value:GAUGE:0:100
15
+ cache_result value:DERIVE:0:U
16
+ cache_size value:GAUGE:0:4294967295
17
+ charge value:GAUGE:0:U
18
+ compression_ratio value:GAUGE:0:2
19
+ compression uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
20
+ connections value:DERIVE:0:U
21
+ conntrack value:GAUGE:0:4294967295
22
+ contextswitch value:DERIVE:0:U
23
+ counter value:COUNTER:U:U
24
+ cpufreq value:GAUGE:0:U
25
+ cpu value:DERIVE:0:U
26
+ current_connections value:GAUGE:0:U
27
+ current_sessions value:GAUGE:0:U
28
+ current value:GAUGE:U:U
29
+ delay value:GAUGE:-1000000:1000000
30
+ derive value:DERIVE:0:U
31
+ df_complex value:GAUGE:0:U
32
+ df_inodes value:GAUGE:0:U
33
+ df used:GAUGE:0:1125899906842623, free:GAUGE:0:1125899906842623
34
+ disk_latency read:GAUGE:0:U, write:GAUGE:0:U
35
+ disk_merged read:DERIVE:0:U, write:DERIVE:0:U
36
+ disk_octets read:DERIVE:0:U, write:DERIVE:0:U
37
+ disk_ops_complex value:DERIVE:0:U
38
+ disk_ops read:DERIVE:0:U, write:DERIVE:0:U
39
+ disk_time read:DERIVE:0:U, write:DERIVE:0:U
40
+ dns_answer value:DERIVE:0:U
41
+ dns_notify value:DERIVE:0:U
42
+ dns_octets queries:DERIVE:0:U, responses:DERIVE:0:U
43
+ dns_opcode value:DERIVE:0:U
44
+ dns_qtype_cached value:GAUGE:0:4294967295
45
+ dns_qtype value:DERIVE:0:U
46
+ dns_query value:DERIVE:0:U
47
+ dns_question value:DERIVE:0:U
48
+ dns_rcode value:DERIVE:0:U
49
+ dns_reject value:DERIVE:0:U
50
+ dns_request value:DERIVE:0:U
51
+ dns_resolver value:DERIVE:0:U
52
+ dns_response value:DERIVE:0:U
53
+ dns_transfer value:DERIVE:0:U
54
+ dns_update value:DERIVE:0:U
55
+ dns_zops value:DERIVE:0:U
56
+ duration seconds:GAUGE:0:U
57
+ email_check value:GAUGE:0:U
58
+ email_count value:GAUGE:0:U
59
+ email_size value:GAUGE:0:U
60
+ entropy value:GAUGE:0:4294967295
61
+ fanspeed value:GAUGE:0:U
62
+ file_size value:GAUGE:0:U
63
+ files value:GAUGE:0:U
64
+ fork_rate value:DERIVE:0:U
65
+ frequency_offset value:GAUGE:-1000000:1000000
66
+ frequency value:GAUGE:0:U
67
+ fscache_stat value:DERIVE:0:U
68
+ gauge value:GAUGE:U:U
69
+ hash_collisions value:DERIVE:0:U
70
+ http_request_methods value:DERIVE:0:U
71
+ http_requests value:DERIVE:0:U
72
+ http_response_codes value:DERIVE:0:U
73
+ humidity value:GAUGE:0:100
74
+ if_collisions value:DERIVE:0:U
75
+ if_dropped rx:DERIVE:0:U, tx:DERIVE:0:U
76
+ if_errors rx:DERIVE:0:U, tx:DERIVE:0:U
77
+ if_multicast value:DERIVE:0:U
78
+ if_octets rx:DERIVE:0:U, tx:DERIVE:0:U
79
+ if_packets rx:DERIVE:0:U, tx:DERIVE:0:U
80
+ if_rx_errors value:DERIVE:0:U
81
+ if_rx_octets value:DERIVE:0:U
82
+ if_tx_errors value:DERIVE:0:U
83
+ if_tx_octets value:DERIVE:0:U
84
+ invocations value:DERIVE:0:U
85
+ io_octets rx:DERIVE:0:U, tx:DERIVE:0:U
86
+ io_packets rx:DERIVE:0:U, tx:DERIVE:0:U
87
+ ipt_bytes value:DERIVE:0:U
88
+ ipt_packets value:DERIVE:0:U
89
+ irq value:DERIVE:0:U
90
+ latency value:GAUGE:0:U
91
+ links value:GAUGE:0:U
92
+ load shortterm:GAUGE:0:5000, midterm:GAUGE:0:5000, longterm:GAUGE:0:5000
93
+ md_disks value:GAUGE:0:U
94
+ memcached_command value:DERIVE:0:U
95
+ memcached_connections value:GAUGE:0:U
96
+ memcached_items value:GAUGE:0:U
97
+ memcached_octets rx:DERIVE:0:U, tx:DERIVE:0:U
98
+ memcached_ops value:DERIVE:0:U
99
+ memory value:GAUGE:0:281474976710656
100
+ multimeter value:GAUGE:U:U
101
+ mutex_operations value:DERIVE:0:U
102
+ mysql_commands value:DERIVE:0:U
103
+ mysql_handler value:DERIVE:0:U
104
+ mysql_locks value:DERIVE:0:U
105
+ mysql_log_position value:DERIVE:0:U
106
+ mysql_octets rx:DERIVE:0:U, tx:DERIVE:0:U
107
+ nfs_procedure value:DERIVE:0:U
108
+ nginx_connections value:GAUGE:0:U
109
+ nginx_requests value:DERIVE:0:U
110
+ node_octets rx:DERIVE:0:U, tx:DERIVE:0:U
111
+ node_rssi value:GAUGE:0:255
112
+ node_stat value:DERIVE:0:U
113
+ node_tx_rate value:GAUGE:0:127
114
+ objects value:GAUGE:0:U
115
+ operations value:DERIVE:0:U
116
+ percent value:GAUGE:0:100.1
117
+ percent_bytes value:GAUGE:0:100.1
118
+ percent_inodes value:GAUGE:0:100.1
119
+ pf_counters value:DERIVE:0:U
120
+ pf_limits value:DERIVE:0:U
121
+ pf_source value:DERIVE:0:U
122
+ pf_states value:GAUGE:0:U
123
+ pf_state value:DERIVE:0:U
124
+ pg_blks value:DERIVE:0:U
125
+ pg_db_size value:GAUGE:0:U
126
+ pg_n_tup_c value:DERIVE:0:U
127
+ pg_n_tup_g value:GAUGE:0:U
128
+ pg_numbackends value:GAUGE:0:U
129
+ pg_scan value:DERIVE:0:U
130
+ pg_xact value:DERIVE:0:U
131
+ ping_droprate value:GAUGE:0:100
132
+ ping_stddev value:GAUGE:0:65535
133
+ ping value:GAUGE:0:65535
134
+ players value:GAUGE:0:1000000
135
+ power value:GAUGE:0:U
136
+ protocol_counter value:DERIVE:0:U
137
+ ps_code value:GAUGE:0:9223372036854775807
138
+ ps_count processes:GAUGE:0:1000000, threads:GAUGE:0:1000000
139
+ ps_cputime user:DERIVE:0:U, syst:DERIVE:0:U
140
+ ps_data value:GAUGE:0:9223372036854775807
141
+ ps_disk_octets read:DERIVE:0:U, write:DERIVE:0:U
142
+ ps_disk_ops read:DERIVE:0:U, write:DERIVE:0:U
143
+ ps_pagefaults minflt:DERIVE:0:U, majflt:DERIVE:0:U
144
+ ps_rss value:GAUGE:0:9223372036854775807
145
+ ps_stacksize value:GAUGE:0:9223372036854775807
146
+ ps_state value:GAUGE:0:65535
147
+ ps_vm value:GAUGE:0:9223372036854775807
148
+ queue_length value:GAUGE:0:U
149
+ records value:GAUGE:0:U
150
+ requests value:GAUGE:0:U
151
+ response_time value:GAUGE:0:U
152
+ response_code value:GAUGE:0:U
153
+ route_etx value:GAUGE:0:U
154
+ route_metric value:GAUGE:0:U
155
+ routes value:GAUGE:0:U
156
+ serial_octets rx:DERIVE:0:U, tx:DERIVE:0:U
157
+ signal_noise value:GAUGE:U:0
158
+ signal_power value:GAUGE:U:0
159
+ signal_quality value:GAUGE:0:U
160
+ snr value:GAUGE:0:U
161
+ spam_check value:GAUGE:0:U
162
+ spam_score value:GAUGE:U:U
163
+ spl value:GAUGE:U:U
164
+ swap_io value:DERIVE:0:U
165
+ swap value:GAUGE:0:1099511627776
166
+ tcp_connections value:GAUGE:0:4294967295
167
+ temperature value:GAUGE:U:U
168
+ threads value:GAUGE:0:U
169
+ time_dispersion value:GAUGE:-1000000:1000000
170
+ timeleft value:GAUGE:0:U
171
+ time_offset value:GAUGE:-1000000:1000000
172
+ total_bytes value:DERIVE:0:U
173
+ total_connections value:DERIVE:0:U
174
+ total_objects value:DERIVE:0:U
175
+ total_operations value:DERIVE:0:U
176
+ total_requests value:DERIVE:0:U
177
+ total_sessions value:DERIVE:0:U
178
+ total_threads value:DERIVE:0:U
179
+ total_time_in_ms value:DERIVE:0:U
180
+ total_values value:DERIVE:0:U
181
+ uptime value:GAUGE:0:4294967295
182
+ users value:GAUGE:0:65535
183
+ vcl value:GAUGE:0:65535
184
+ vcpu value:GAUGE:0:U
185
+ virt_cpu_total value:DERIVE:0:U
186
+ virt_vcpu value:DERIVE:0:U
187
+ vmpage_action value:DERIVE:0:U
188
+ vmpage_faults minflt:DERIVE:0:U, majflt:DERIVE:0:U
189
+ vmpage_io in:DERIVE:0:U, out:DERIVE:0:U
190
+ vmpage_number value:GAUGE:0:4294967295
191
+ volatile_changes value:GAUGE:0:U
192
+ voltage_threshold value:GAUGE:U:U, threshold:GAUGE:U:U
193
+ voltage value:GAUGE:U:U
194
+ vs_memory value:GAUGE:0:9223372036854775807
195
+ vs_processes value:GAUGE:0:65535
196
+ vs_threads value:GAUGE:0:65535
197
+
198
+ #
199
+ # Legacy types
200
+ # (required for the v5 upgrade target)
201
+ #
202
+ arc_counts demand_data:COUNTER:0:U, demand_metadata:COUNTER:0:U, prefetch_data:COUNTER:0:U, prefetch_metadata:COUNTER:0:U
203
+ arc_l2_bytes read:COUNTER:0:U, write:COUNTER:0:U
204
+ arc_l2_size value:GAUGE:0:U
205
+ arc_ratio value:GAUGE:0:U
206
+ arc_size current:GAUGE:0:U, target:GAUGE:0:U, minlimit:GAUGE:0:U, maxlimit:GAUGE:0:U
207
+ mysql_qcache hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U
208
+ mysql_threads running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-codec-collectd
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.5
4
+ version: 3.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-06-23 00:00:00.000000000 Z
11
+ date: 2021-08-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -20,8 +20,8 @@ dependencies:
20
20
  - !ruby/object:Gem::Version
21
21
  version: '2.99'
22
22
  name: logstash-core-plugin-api
23
- prerelease: false
24
23
  type: :runtime
24
+ prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - ">="
@@ -30,6 +30,34 @@ dependencies:
30
30
  - - "<="
31
31
  - !ruby/object:Gem::Version
32
32
  version: '2.99'
33
+ - !ruby/object:Gem::Dependency
34
+ requirement: !ruby/object:Gem::Requirement
35
+ requirements:
36
+ - - "~>"
37
+ - !ruby/object:Gem::Version
38
+ version: '1.0'
39
+ name: logstash-mixin-event_support
40
+ type: :runtime
41
+ prerelease: false
42
+ version_requirements: !ruby/object:Gem::Requirement
43
+ requirements:
44
+ - - "~>"
45
+ - !ruby/object:Gem::Version
46
+ version: '1.0'
47
+ - !ruby/object:Gem::Dependency
48
+ requirement: !ruby/object:Gem::Requirement
49
+ requirements:
50
+ - - "~>"
51
+ - !ruby/object:Gem::Version
52
+ version: '1.0'
53
+ name: logstash-mixin-validator_support
54
+ type: :runtime
55
+ prerelease: false
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ requirements:
58
+ - - "~>"
59
+ - !ruby/object:Gem::Version
60
+ version: '1.0'
33
61
  - !ruby/object:Gem::Dependency
34
62
  requirement: !ruby/object:Gem::Requirement
35
63
  requirements:
@@ -37,8 +65,22 @@ dependencies:
37
65
  - !ruby/object:Gem::Version
38
66
  version: '0'
39
67
  name: logstash-devutils
68
+ type: :development
40
69
  prerelease: false
70
+ version_requirements: !ruby/object:Gem::Requirement
71
+ requirements:
72
+ - - ">="
73
+ - !ruby/object:Gem::Version
74
+ version: '0'
75
+ - !ruby/object:Gem::Dependency
76
+ requirement: !ruby/object:Gem::Requirement
77
+ requirements:
78
+ - - ">="
79
+ - !ruby/object:Gem::Version
80
+ version: '0'
81
+ name: insist
41
82
  type: :development
83
+ prerelease: false
42
84
  version_requirements: !ruby/object:Gem::Requirement
43
85
  requirements:
44
86
  - - ">="
@@ -62,6 +104,7 @@ files:
62
104
  - lib/logstash/codecs/collectd.rb
63
105
  - logstash-codec-collectd.gemspec
64
106
  - spec/codecs/collectd_spec.rb
107
+ - vendor/types.db
65
108
  homepage: http://www.elastic.co/guide/en/logstash/current/index.html
66
109
  licenses:
67
110
  - Apache License (2.0)
@@ -83,10 +126,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
83
126
  - !ruby/object:Gem::Version
84
127
  version: '0'
85
128
  requirements: []
86
- rubyforge_project:
87
- rubygems_version: 2.6.11
129
+ rubygems_version: 3.0.6
88
130
  signing_key:
89
131
  specification_version: 4
90
- summary: Read events from the collectd binary protocol
132
+ summary: Reads events from the `collectd` binary protocol using UDP.
91
133
  test_files:
92
134
  - spec/codecs/collectd_spec.rb