logstash-output-honeycomb_json_batch 0.2.1 → 0.3.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
  SHA1:
3
- metadata.gz: e766e09300c1d2d2edd9b61f711365717c1325bc
4
- data.tar.gz: e2ce01c2e02807d5d45576c92a063993a0dbc04b
3
+ metadata.gz: cd4babd428730a8950b2d8b8131b37b45ee328d6
4
+ data.tar.gz: 9bee1624e1a2c1214a8c4bb254bdea46b6dbaf76
5
5
  SHA512:
6
- metadata.gz: 7bed196cb2b70be12e3d7a72a00b70008682dd385e786853023e5f7465e722285bf9380f938093e54bcf609cd9bd5869b132b5daa88a850d755755957d5f5b02
7
- data.tar.gz: 56bec4d327e7bd3745967839e54e91ca7151a4322b51595b166b40ab41186e186ebe46f7f5860e1aedba9ccf8dfd59f6b14effae944c005ba94cdec0f40b820b
6
+ metadata.gz: b9f1d82542dbbaa01a1dadcc192a56fcd6c9f12fbbb9fda3f50dc5bbb5b11c33a643c48d81298d9c77aa5eb3fdc54e0daf3dbf84ce798fc99032cfba9a68288a
7
+ data.tar.gz: d25d0687c8ef9a0f3b6440a1b5c30a0eec8039c8e68a37ce09224f96cfa8ff07361e7efa9a7c5243bf1923ee8f6b9fa1a02d00e5f6e0d8535549500476062cfe
data/LICENSE CHANGED
@@ -1,14 +1,201 @@
1
- Copyright (c) 2017 Hound Technology, Inc <https://honeycomb.io>
1
+ Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
2
4
 
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
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
6
 
7
- http://www.apache.org/licenses/LICENSE-2.0
7
+ 1. Definitions.
8
8
 
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.
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
14
11
 
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "{}"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright {yyyy} {name of copyright owner}
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
data/README.md CHANGED
@@ -92,3 +92,13 @@ And install it into your local logstash instance:
92
92
  ```
93
93
  logstash-plugin install ./path/to/logstash-output-honeycomb_json_batch-VERSION.gem
94
94
  ```
95
+
96
+ ## Releasing a new version
97
+
98
+ Travis will upload tagged releases to Rubygems. To release a new version
99
+
100
+ 1. Bump the value of `VERSION` in `lib/logstash/outputs/honeycomb_json_batch.rb`
101
+ 2. Bump the version in `logstash-output-honeycomb_json_batch.gemspec`
102
+ 3. Commit changes and run `git tag v0.3.2` (for example)
103
+ 4. `git push --follow-tags`
104
+ 5. Make sure the build succeeds.
@@ -28,7 +28,7 @@ class LogStash::Outputs::HoneycombJSONBatch < LogStash::Outputs::Base
28
28
 
29
29
  config :pool_max, :validate => :number, :default => 10
30
30
 
31
- VERSION = "0.2.1"
31
+ VERSION = "0.3.0"
32
32
 
33
33
  def register
34
34
  @total = 0
@@ -69,9 +69,9 @@ class LogStash::Outputs::HoneycombJSONBatch < LogStash::Outputs::Base
69
69
  private
70
70
 
71
71
  def make_request(documents)
72
- body = LogStash::Json.dump({ @dataset => documents })
72
+ body = LogStash::Json.dump(documents)
73
73
 
74
- url = "#{@api_host}/1/batch"
74
+ url = "#{@api_host}/1/batch/#{@dataset}"
75
75
  request = client.post(url, {
76
76
  :body => body,
77
77
  :headers => request_headers
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-output-honeycomb_json_batch'
3
- s.version = '0.2.1'
3
+ s.version = '0.3.0'
4
4
  s.licenses = ['Apache-2.0']
5
5
  s.summary = "This output lets you `POST` batches of events to the Honeycomb.io API endpoint"
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"
@@ -33,7 +33,7 @@ describe LogStash::Outputs::HoneycombJSONBatch do
33
33
 
34
34
  it "should receive a single post request" do
35
35
  expect(client).to receive(:post).
36
- with("#{ api_host }/1/batch", hash_including(:body, :headers)).
36
+ with("#{ api_host }/1/batch/#{DATASET}", hash_including(:body, :headers)).
37
37
  once.
38
38
  and_call_original
39
39
 
@@ -42,7 +42,7 @@ describe LogStash::Outputs::HoneycombJSONBatch do
42
42
 
43
43
  it "should attach the right headers for Honeycomb ingestion" do
44
44
  expect(client).to receive(:post).
45
- with("#{ api_host }/1/batch", hash_including(:headers => {
45
+ with("#{ api_host }/1/batch/#{DATASET}", hash_including(:headers => {
46
46
  "Content-Type" => "application/json",
47
47
  "X-Honeycomb-Team" => WRITE_KEY,
48
48
  "X-Plugin-Version" => LogStash::Outputs::HoneycombJSONBatch::VERSION
@@ -56,9 +56,9 @@ describe LogStash::Outputs::HoneycombJSONBatch do
56
56
  data = event.to_hash()
57
57
  data.delete("@timestamp")
58
58
  expect(client).to receive(:post).
59
- with("#{ api_host }/1/batch", hash_including(:body => LogStash::Json.dump({
60
- DATASET => [ { "time" => event.timestamp.to_s, "data" => data } ]
61
- }))).once.
59
+ with("#{ api_host }/1/batch/#{DATASET}", hash_including(:body => LogStash::Json.dump(
60
+ [ { "time" => event.timestamp.to_s, "data" => data } ]
61
+ ))).once.
62
62
  and_call_original
63
63
  @honeycomb.multi_receive([event])
64
64
  end
@@ -71,9 +71,9 @@ describe LogStash::Outputs::HoneycombJSONBatch do
71
71
  data.delete("@samplerate")
72
72
 
73
73
  expect(client).to receive(:post).
74
- with("#{ api_host }/1/batch", hash_including(:body => LogStash::Json.dump({
75
- DATASET => [ { "time" => with_samplerate.timestamp.to_s, "data" => data, "samplerate" => 17 } ]
76
- }))).once.
74
+ with("#{ api_host }/1/batch/#{DATASET}", hash_including(:body => LogStash::Json.dump(
75
+ [ { "time" => with_samplerate.timestamp.to_s, "data" => data, "samplerate" => 17 } ]
76
+ ))).once.
77
77
  and_call_original
78
78
 
79
79
  @honeycomb.multi_receive([with_samplerate])
@@ -85,13 +85,13 @@ describe LogStash::Outputs::HoneycombJSONBatch do
85
85
  event3 = LogStash::Event.new("gamma" => 3.0)
86
86
 
87
87
  expect(client).to receive(:post).
88
- with("#{ api_host }/1/batch", hash_including(:body => LogStash::Json.dump({
89
- DATASET => [
88
+ with("#{ api_host }/1/batch/#{DATASET}", hash_including(:body => LogStash::Json.dump(
89
+ [
90
90
  { "time" => event1.timestamp.to_s, "data" => { "alpha" => 1.0, "@version" => "1" } },
91
91
  { "time" => event2.timestamp.to_s, "data" => { "@version" => "1", "beta" => 2.0 } },
92
92
  { "time" => event3.timestamp.to_s, "data" => { "@version" => "1", "gamma" => 3.0 } }
93
93
  ]
94
- }))).once.
94
+ ))).once.
95
95
  and_call_original
96
96
 
97
97
  @honeycomb.multi_receive([event1, event2, event3])
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-honeycomb_json_batch
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Honeycomb
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-03-07 00:00:00.000000000 Z
11
+ date: 2017-04-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: logstash-core-plugin-api