logstash-output-amazon_es 2.0.1 → 6.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +5 -5
  2. data/README.md +11 -9
  3. data/lib/logstash/outputs/amazon_es/elasticsearch-template.json +36 -32
  4. data/lib/logstash/outputs/amazon_es/http_client.rb +1 -1
  5. data/logstash-output-amazon_es.gemspec +2 -2
  6. metadata +47 -47
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 5fa3f08b846567fe43b88852eb3e6be158109d67
4
- data.tar.gz: d4f5798c0e09e492a383411deefca1a3d3d5ee3e
2
+ SHA256:
3
+ metadata.gz: 95e04ff0ed789ed169a1ad9a8101e4cc919515487188a87d7e741f9fdebf099a
4
+ data.tar.gz: fc41c2a05ed79d65362f5a8238b8eb5eb538b0f5ee7c0dcd0411fe3c01ee2ca5
5
5
  SHA512:
6
- metadata.gz: b5d280c313161cbcc0c3f7255bcecbf6d80e41837b53dcd1e34ffe4d1950d5d4ac04da4298c2a8315e6d2dcaa7342cf0e455dcf307a018eb66de33b8fdab4079
7
- data.tar.gz: 6e022d16bb615c50f9ac2e74769c708fefe38df8d5110031bf1fddd0db6412371c0caaba145f173619f1300dfbc1f22079b91ce52d063fc082836ccea08eae98
6
+ metadata.gz: 5f6432f20a504edc385a207c7a0f5315eae5c1e64016170e6a49fe1301e515a3fb910b531050f30f7cf3fe2069b85ef3ad0877978c784a1d41168aa48f1d347d
7
+ data.tar.gz: ff06e03479401beccead78bf6cc212514a49412b4bca5e89b331e1212988d38139f69f5abd38b6438d9142875c400afcccc57c7d9ae6a0100cf7f03392af422a
data/README.md CHANGED
@@ -2,13 +2,15 @@
2
2
 
3
3
  This is a plugin for [Logstash](https://github.com/elastic/logstash).
4
4
 
5
- It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
5
+ ## License
6
+
7
+ This library is licensed under the Apache 2.0 License.
6
8
 
7
9
  # Setting Up
8
10
 
9
11
  ## Installation
10
12
  One command installation
11
- `bin/plugin install logstash-output-amazon_es`
13
+ `bin/logstash-plugin install logstash-output-amazon_es`
12
14
 
13
15
  While we are in the process of getting this plugin fully integrated within logstash to make installation simpler,
14
16
  if above does not work, or you would like to patch code here is a workaround to install this plugin within your logstash:
@@ -17,7 +19,7 @@ if above does not work, or you would like to patch code here is a workaround to
17
19
  2. Build plugin using - `gem build logstash-output-amazon_es.gemspec` ( this works with jruby and rubygem versions > 1.9)
18
20
  3. Install plugin using `<logstash-home>/bin/plugin install logstash-output-amazon_es-0.2.0-java.gem` (or the non java variant)
19
21
  4. For 2.3 support, please use '<logstash-home>/bin/logstash-plugin install logstash-output-amazon_es-1.0-java.gem'
20
- 5. For 5.2 support, please use '<logstash-home>/bin/logstash-plugin install logstash-output-amazon_es-2.0.0-java.gem'
22
+ 5. For 5.2 support, please use '<logstash-home>/bin/logstash-plugin install logstash-output-amazon_es-2.0.1-java.gem'
21
23
 
22
24
  ## Configuration for Amazon Elasticsearch Output plugin
23
25
 
@@ -29,12 +31,12 @@ An example configuration:
29
31
  amazon_es {
30
32
  hosts => ["foo.us-east-1.es.amazonaws.com"]
31
33
  region => "us-east-1"
32
- # aws_access_key_id, aws_secret_access_key optional if instance profile is configured
33
- aws_access_key_id => 'ACCESS_KEY'
34
- aws_secret_access_key => 'SECRET_KEY'
35
- index => "production-logs-%{+YYYY.MM.dd}"
36
- }
37
- }
34
+ # aws_access_key_id, aws_secret_access_key optional if instance profile is configured
35
+ aws_access_key_id => 'ACCESS_KEY'
36
+ aws_secret_access_key => 'SECRET_KEY'
37
+ index => "production-logs-%{+YYYY.MM.dd}"
38
+ }
39
+ }
38
40
 
39
41
  * Required Parameters
40
42
  * hosts (array of string) - Amazon Elasticsearch domain endpoint. eg ["foo.us-east-1.es.amazonaws.com"]
data/lib/logstash/outputs/amazon_es/elasticsearch-template.json CHANGED
@@ -1,41 +1,45 @@
1
1
  {
2
2
  "template" : "logstash-*",
3
+ "version" : 60001,
3
4
  "settings" : {
4
5
  "index.refresh_interval" : "5s"
5
6
  },
6
7
  "mappings" : {
7
8
  "_default_" : {
8
- "_all" : {"enabled" : true, "omit_norms" : true},
9
- "dynamic_templates" : [ {
10
- "message_field" : {
11
- "match" : "message",
12
- "match_mapping_type" : "string",
13
- "mapping" : {
14
- "type" : "string", "index" : "analyzed", "omit_norms" : true
15
- }
16
- }
17
- }, {
18
- "string_fields" : {
19
- "match" : "*",
20
- "match_mapping_type" : "string",
21
- "mapping" : {
22
- "type" : "string", "index" : "analyzed", "omit_norms" : true,
23
- "fields" : {
24
- "raw" : {"type": "string", "index" : "not_analyzed", "ignore_above" : 256}
25
- }
26
- }
27
- }
28
- } ],
29
- "properties" : {
30
- "@version": { "type": "string", "index": "not_analyzed" },
31
- "geoip" : {
32
- "type" : "object",
33
- "dynamic": true,
34
- "properties" : {
35
- "location" : { "type" : "geo_point" }
36
- }
37
- }
38
- }
9
+ "dynamic_templates" : [ {
10
+ "message_field" : {
11
+ "path_match" : "message",
12
+ "match_mapping_type" : "string",
13
+ "mapping" : {
14
+ "type" : "text",
15
+ "norms" : false
16
+ }
17
+ }
18
+ }, {
19
+ "string_fields" : {
20
+ "match" : "*",
21
+ "match_mapping_type" : "string",
22
+ "mapping" : {
23
+ "type" : "text", "norms" : false,
24
+ "fields" : {
25
+ "keyword" : { "type": "keyword", "ignore_above": 256 }
26
+ }
27
+ }
28
+ }
29
+ } ],
30
+ "properties" : {
31
+ "@timestamp": { "type": "date"},
32
+ "@version": { "type": "keyword"},
33
+ "geoip" : {
34
+ "dynamic": true,
35
+ "properties" : {
36
+ "ip": { "type": "ip" },
37
+ "location" : { "type" : "geo_point" },
38
+ "latitude" : { "type" : "half_float" },
39
+ "longitude" : { "type" : "half_float" }
40
+ }
41
+ }
42
+ }
39
43
  }
40
44
  }
41
- }
45
+ }
data/lib/logstash/outputs/amazon_es/http_client.rb CHANGED
@@ -43,7 +43,7 @@ module LogStash::Outputs::AES
43
43
 
44
44
  args.delete(:_upsert)
45
45
 
46
- if source
46
+ if source && action != 'delete'
47
47
  next [ { action => args }, source ]
48
48
  else
49
49
  next { action => args }
data/logstash-output-amazon_es.gemspec CHANGED
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-output-amazon_es'
4
- s.version = '2.0.1'
4
+ s.version = '6.0.0'
5
5
  s.licenses = ['apache-2.0']
6
6
  s.summary = "Logstash Output to Amazon Elasticsearch Service"
7
7
  s.description = "Output events to Amazon Elasticsearch Service with V4 signing"
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
21
21
 
22
22
  # Gem dependencies
23
23
  s.add_runtime_dependency 'concurrent-ruby'
24
- s.add_runtime_dependency 'elasticsearch', '>= 1.0.10', '< 6.0.0'
24
+ s.add_runtime_dependency 'elasticsearch', '>= 1.0.10', '< 6.2.0'
25
25
  s.add_runtime_dependency 'stud', ['>= 0.0.17', '~> 0.0']
26
26
  s.add_runtime_dependency 'cabin', ['~> 0.6']
27
27
  s.add_runtime_dependency 'logstash-core-plugin-api', '>= 1.60', '<= 2.99'
metadata CHANGED
@@ -1,219 +1,219 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-amazon_es
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 6.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Amazon
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-03-30 00:00:00.000000000 Z
11
+ date: 2018-07-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: concurrent-ruby
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: elasticsearch
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: 1.0.10
34
- - - <
34
+ - - "<"
35
35
  - !ruby/object:Gem::Version
36
- version: 6.0.0
36
+ version: 6.2.0
37
37
  type: :runtime
38
38
  prerelease: false
39
39
  version_requirements: !ruby/object:Gem::Requirement
40
40
  requirements:
41
- - - '>='
41
+ - - ">="
42
42
  - !ruby/object:Gem::Version
43
43
  version: 1.0.10
44
- - - <
44
+ - - "<"
45
45
  - !ruby/object:Gem::Version
46
- version: 6.0.0
46
+ version: 6.2.0
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: stud
49
49
  requirement: !ruby/object:Gem::Requirement
50
50
  requirements:
51
- - - '>='
51
+ - - ">="
52
52
  - !ruby/object:Gem::Version
53
53
  version: 0.0.17
54
- - - ~>
54
+ - - "~>"
55
55
  - !ruby/object:Gem::Version
56
56
  version: '0.0'
57
57
  type: :runtime
58
58
  prerelease: false
59
59
  version_requirements: !ruby/object:Gem::Requirement
60
60
  requirements:
61
- - - '>='
61
+ - - ">="
62
62
  - !ruby/object:Gem::Version
63
63
  version: 0.0.17
64
- - - ~>
64
+ - - "~>"
65
65
  - !ruby/object:Gem::Version
66
66
  version: '0.0'
67
67
  - !ruby/object:Gem::Dependency
68
68
  name: cabin
69
69
  requirement: !ruby/object:Gem::Requirement
70
70
  requirements:
71
- - - ~>
71
+ - - "~>"
72
72
  - !ruby/object:Gem::Version
73
73
  version: '0.6'
74
74
  type: :runtime
75
75
  prerelease: false
76
76
  version_requirements: !ruby/object:Gem::Requirement
77
77
  requirements:
78
- - - ~>
78
+ - - "~>"
79
79
  - !ruby/object:Gem::Version
80
80
  version: '0.6'
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: logstash-core-plugin-api
83
83
  requirement: !ruby/object:Gem::Requirement
84
84
  requirements:
85
- - - '>='
85
+ - - ">="
86
86
  - !ruby/object:Gem::Version
87
87
  version: '1.60'
88
- - - <=
88
+ - - "<="
89
89
  - !ruby/object:Gem::Version
90
90
  version: '2.99'
91
91
  type: :runtime
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
- - - '>='
95
+ - - ">="
96
96
  - !ruby/object:Gem::Version
97
97
  version: '1.60'
98
- - - <=
98
+ - - "<="
99
99
  - !ruby/object:Gem::Version
100
100
  version: '2.99'
101
101
  - !ruby/object:Gem::Dependency
102
102
  name: aws-sdk
103
103
  requirement: !ruby/object:Gem::Requirement
104
104
  requirements:
105
- - - '>='
105
+ - - ">="
106
106
  - !ruby/object:Gem::Version
107
107
  version: 2.3.22
108
- - - ~>
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
110
  version: '2'
111
111
  type: :runtime
112
112
  prerelease: false
113
113
  version_requirements: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - '>='
115
+ - - ">="
116
116
  - !ruby/object:Gem::Version
117
117
  version: 2.3.22
118
- - - ~>
118
+ - - "~>"
119
119
  - !ruby/object:Gem::Version
120
120
  version: '2'
121
121
  - !ruby/object:Gem::Dependency
122
122
  name: faraday
123
123
  requirement: !ruby/object:Gem::Requirement
124
124
  requirements:
125
- - - ~>
125
+ - - "~>"
126
126
  - !ruby/object:Gem::Version
127
127
  version: 0.9.1
128
128
  type: :runtime
129
129
  prerelease: false
130
130
  version_requirements: !ruby/object:Gem::Requirement
131
131
  requirements:
132
- - - ~>
132
+ - - "~>"
133
133
  - !ruby/object:Gem::Version
134
134
  version: 0.9.1
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: faraday_middleware
137
137
  requirement: !ruby/object:Gem::Requirement
138
138
  requirements:
139
- - - ~>
139
+ - - "~>"
140
140
  - !ruby/object:Gem::Version
141
141
  version: 0.10.0
142
142
  type: :runtime
143
143
  prerelease: false
144
144
  version_requirements: !ruby/object:Gem::Requirement
145
145
  requirements:
146
- - - ~>
146
+ - - "~>"
147
147
  - !ruby/object:Gem::Version
148
148
  version: 0.10.0
149
149
  - !ruby/object:Gem::Dependency
150
150
  name: addressable
151
151
  requirement: !ruby/object:Gem::Requirement
152
152
  requirements:
153
- - - <
153
+ - - "<"
154
154
  - !ruby/object:Gem::Version
155
155
  version: 2.5.0
156
156
  type: :development
157
157
  prerelease: false
158
158
  version_requirements: !ruby/object:Gem::Requirement
159
159
  requirements:
160
- - - <
160
+ - - "<"
161
161
  - !ruby/object:Gem::Version
162
162
  version: 2.5.0
163
163
  - !ruby/object:Gem::Dependency
164
164
  name: ftw
165
165
  requirement: !ruby/object:Gem::Requirement
166
166
  requirements:
167
- - - ~>
167
+ - - "~>"
168
168
  - !ruby/object:Gem::Version
169
169
  version: 0.0.42
170
170
  type: :development
171
171
  prerelease: false
172
172
  version_requirements: !ruby/object:Gem::Requirement
173
173
  requirements:
174
- - - ~>
174
+ - - "~>"
175
175
  - !ruby/object:Gem::Version
176
176
  version: 0.0.42
177
177
  - !ruby/object:Gem::Dependency
178
178
  name: logstash-input-generator
179
179
  requirement: !ruby/object:Gem::Requirement
180
180
  requirements:
181
- - - '>='
181
+ - - ">="
182
182
  - !ruby/object:Gem::Version
183
183
  version: '0'
184
184
  type: :development
185
185
  prerelease: false
186
186
  version_requirements: !ruby/object:Gem::Requirement
187
187
  requirements:
188
- - - '>='
188
+ - - ">="
189
189
  - !ruby/object:Gem::Version
190
190
  version: '0'
191
191
  - !ruby/object:Gem::Dependency
192
192
  name: logstash-devutils
193
193
  requirement: !ruby/object:Gem::Requirement
194
194
  requirements:
195
- - - '>='
195
+ - - ">="
196
196
  - !ruby/object:Gem::Version
197
197
  version: '0'
198
198
  type: :development
199
199
  prerelease: false
200
200
  version_requirements: !ruby/object:Gem::Requirement
201
201
  requirements:
202
- - - '>='
202
+ - - ">="
203
203
  - !ruby/object:Gem::Version
204
204
  version: '0'
205
205
  - !ruby/object:Gem::Dependency
206
206
  name: longshoreman
207
207
  requirement: !ruby/object:Gem::Requirement
208
208
  requirements:
209
- - - '>='
209
+ - - ">="
210
210
  - !ruby/object:Gem::Version
211
211
  version: '0'
212
212
  type: :development
213
213
  prerelease: false
214
214
  version_requirements: !ruby/object:Gem::Requirement
215
215
  requirements:
216
- - - '>='
216
+ - - ">="
217
217
  - !ruby/object:Gem::Version
218
218
  version: '0'
219
219
  description: Output events to Amazon Elasticsearch Service with V4 signing
@@ -222,21 +222,21 @@ executables: []
222
222
  extensions: []
223
223
  extra_rdoc_files: []
224
224
  files:
225
+ - Gemfile
226
+ - LICENSE
227
+ - NOTICE.TXT
228
+ - README.md
229
+ - lib/logstash/outputs/amazon_es.rb
225
230
  - lib/logstash/outputs/amazon_es/aws_transport.rb
226
231
  - lib/logstash/outputs/amazon_es/aws_v4_signer.rb
227
232
  - lib/logstash/outputs/amazon_es/aws_v4_signer_impl.rb
228
233
  - lib/logstash/outputs/amazon_es/elasticsearch-template.json
229
234
  - lib/logstash/outputs/amazon_es/http_client.rb
230
- - lib/logstash/outputs/amazon_es.rb
235
+ - logstash-output-amazon_es.gemspec
231
236
  - spec/amazon_es_spec_helper.rb
232
237
  - spec/unit/outputs/amazon_es_spec.rb
233
238
  - spec/unit/outputs/elasticsearch/protocol_spec.rb
234
239
  - spec/unit/outputs/elasticsearch_proxy_spec.rb
235
- - logstash-output-amazon_es.gemspec
236
- - README.md
237
- - Gemfile
238
- - LICENSE
239
- - NOTICE.TXT
240
240
  homepage: http://logstash.net/
241
241
  licenses:
242
242
  - apache-2.0
@@ -249,17 +249,17 @@ require_paths:
249
249
  - lib
250
250
  required_ruby_version: !ruby/object:Gem::Requirement
251
251
  requirements:
252
- - - '>='
252
+ - - ">="
253
253
  - !ruby/object:Gem::Version
254
254
  version: '0'
255
255
  required_rubygems_version: !ruby/object:Gem::Requirement
256
256
  requirements:
257
- - - '>='
257
+ - - ">="
258
258
  - !ruby/object:Gem::Version
259
259
  version: '0'
260
260
  requirements: []
261
261
  rubyforge_project:
262
- rubygems_version: 2.0.14.1
262
+ rubygems_version: 2.7.7
263
263
  signing_key:
264
264
  specification_version: 4
265
265
  summary: Logstash Output to Amazon Elasticsearch Service