logstash-input-vespa 0.2.0 → 0.4.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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -1
- data/Gemfile +8 -0
- data/README.md +71 -1
- data/lib/logstash/inputs/vespa.rb +67 -14
- data/logstash-input-vespa.gemspec +7 -2
- data/spec/inputs/vespa_spec.rb +288 -0
- metadata +50 -13
- data/LICENSE +0 -202
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cc362062aaf492eb77f990be4f6844b34051ef51c7a47cae6b268e48f0c3012f
|
4
|
+
data.tar.gz: f16fd1a3621feb7efdd4b65f039b94cb40a57434bc2e286e2310d794b00d2eb0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 23436b3c39d0259b144a1d82fd7fc970b824b74fd9e1bd90d320fbde5501dae3b42660708acef1e2d16fbec6f955dc945d5dab941dbd15b92eb2cf779ffe5851
|
7
|
+
data.tar.gz: c8d280292ad101c31f8795e7aab8ee3f74c5044e76d688bb354637ad1f6c9aeac5e3cc9e3f3c6472a78da7b02dcabf4c0b104b695961448519b382c38044937a
|
data/CHANGELOG.md
CHANGED
@@ -1,4 +1,9 @@
|
|
1
|
+
## 0.3.0
|
2
|
+
added retry+backoff logic
|
3
|
+
|
4
|
+
## 0.2.0
|
5
|
+
Added support for mTLS certificates, selector, page_size, backend_concurrency, timeout, from_timestamp, and to_timestamp
|
6
|
+
|
1
7
|
## 0.1.0
|
2
8
|
|
3
9
|
Initial version. Can connect to an HTTP endpoint of Vespa and pull documents via Visit and use the continuation token
|
4
|
-
|
data/Gemfile
CHANGED
@@ -9,3 +9,11 @@ if Dir.exist?(logstash_path) && use_logstash_source
|
|
9
9
|
gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
|
10
10
|
gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
|
11
11
|
end
|
12
|
+
|
13
|
+
group :development, :test do
|
14
|
+
gem 'logstash-devutils'
|
15
|
+
gem 'webmock'
|
16
|
+
gem 'rspec'
|
17
|
+
end
|
18
|
+
|
19
|
+
gem 'minitar', '~> 1.0'
|
data/README.md
CHANGED
@@ -9,6 +9,26 @@ Download and unpack/install Logstash, then:
|
|
9
9
|
bin/logstash-plugin install logstash-input-vespa
|
10
10
|
```
|
11
11
|
|
12
|
+
## Development
|
13
|
+
|
14
|
+
To run tests, you'll need to clone the Logstash branch you're developing the plugin for. See https://github.com/elastic/logstash
|
15
|
+
|
16
|
+
Then:
|
17
|
+
```
|
18
|
+
export LOGSTASH_PATH=/path/to/logstash/repository/clone
|
19
|
+
export LOGSTASH_SOURCE=1
|
20
|
+
bundle exec rspec
|
21
|
+
```
|
22
|
+
|
23
|
+
To run integration tests, you'll need to have a Vespa instance running with an app deployed that supports an "id" field. And Logstash installed.
|
24
|
+
|
25
|
+
Check out the `integration-test` directory for more information.
|
26
|
+
|
27
|
+
```
|
28
|
+
cd integration-test
|
29
|
+
./run_tests.sh
|
30
|
+
```
|
31
|
+
|
12
32
|
## Usage
|
13
33
|
|
14
34
|
Minimal Logstash config example:
|
@@ -23,4 +43,54 @@ input {
|
|
23
43
|
output {
|
24
44
|
stdout {}
|
25
45
|
}
|
26
|
-
```
|
46
|
+
```
|
47
|
+
|
48
|
+
With all the options:
|
49
|
+
```
|
50
|
+
input {
|
51
|
+
vespa {
|
52
|
+
# Vespa endpoint
|
53
|
+
vespa_url => "http://localhost:8080"
|
54
|
+
|
55
|
+
# cluster name from services.xml
|
56
|
+
cluster => "test_cluster"
|
57
|
+
|
58
|
+
# mTLS certificate and key
|
59
|
+
client_cert => "/Users/myuser/.vespa/mytenant.myapp.default/data-plane-public-cert.pem"
|
60
|
+
client_key => "/Users/myuser/.vespa/mytenant.myapp.default/data-plane-private-key.pem"
|
61
|
+
|
62
|
+
# as an alternative to mTLS, you can use an authentication token for Vespa Cloud
|
63
|
+
auth_token => "vespa_cloud_TOKEN_GOES_HERE"
|
64
|
+
|
65
|
+
# page size
|
66
|
+
page_size => 100
|
67
|
+
|
68
|
+
# Backend concurrency
|
69
|
+
backend_concurrency => 1
|
70
|
+
|
71
|
+
# Selection statement
|
72
|
+
selection => "doc AND id.namespace == 'open'"
|
73
|
+
|
74
|
+
# HTTP request timeout
|
75
|
+
timeout => 180
|
76
|
+
|
77
|
+
# maximum retries for failed HTTP requests
|
78
|
+
max_retries => 3
|
79
|
+
|
80
|
+
# delay in seconds for the first retry attempt. We double this delay for each subsequent retry.
|
81
|
+
retry_delay => 1
|
82
|
+
|
83
|
+
# lower timestamp bound (microseconds since epoch)
|
84
|
+
from_timestamp => 1600000000000000
|
85
|
+
|
86
|
+
# upper timestamp bound (microseconds since epoch)
|
87
|
+
to_timestamp => 1800000000000000
|
88
|
+
}
|
89
|
+
}
|
90
|
+
|
91
|
+
output {
|
92
|
+
stdout {}
|
93
|
+
}
|
94
|
+
```
|
95
|
+
|
96
|
+
To migrate from one Vespa cluster to another, see [this blog post](https://blog.vespa.ai/logstash-vespa-tutorials/).
|
@@ -1,4 +1,7 @@
|
|
1
1
|
# encoding: utf-8
|
2
|
+
|
3
|
+
# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
|
4
|
+
|
2
5
|
require "logstash/inputs/base"
|
3
6
|
require "logstash/namespace"
|
4
7
|
require "net/http"
|
@@ -22,12 +25,22 @@ class LogStash::Inputs::Vespa < LogStash::Inputs::Base
|
|
22
25
|
# The cluster parameter to use in the request.
|
23
26
|
config :cluster, :validate => :string, :required => true
|
24
27
|
|
28
|
+
# Maximum number of retries for failed HTTP requests
|
29
|
+
config :max_retries, :validate => :number, :default => 3
|
30
|
+
|
31
|
+
# Delay in seconds for the first retry attempt. We double this delay for each subsequent retry.
|
32
|
+
config :retry_delay, :validate => :number, :default => 1
|
33
|
+
|
25
34
|
# Path to the client certificate file for mTLS.
|
26
35
|
config :client_cert, :validate => :path
|
27
36
|
|
28
37
|
# Path to the client key file for mTLS.
|
29
38
|
config :client_key, :validate => :path
|
30
39
|
|
40
|
+
# Authentication token for Vespa Cloud
|
41
|
+
# it will be sent as a Bearer token in the Authorization header
|
42
|
+
config :auth_token, :validate => :string
|
43
|
+
|
31
44
|
# desired page size for the visit request, i.e. the wantedDocumentCount parameter
|
32
45
|
config :page_size, :validate => :number, :default => 100
|
33
46
|
|
@@ -85,6 +98,9 @@ class LogStash::Inputs::Vespa < LogStash::Inputs::Base
|
|
85
98
|
uri.query = URI.encode_www_form(@uri_params)
|
86
99
|
continuation = nil
|
87
100
|
|
101
|
+
retries = 0
|
102
|
+
current_delay = @retry_delay
|
103
|
+
|
88
104
|
loop do
|
89
105
|
response = fetch_documents_from_vespa(uri)
|
90
106
|
# response should look like:
|
@@ -120,28 +136,65 @@ class LogStash::Inputs::Vespa < LogStash::Inputs::Base
|
|
120
136
|
end
|
121
137
|
|
122
138
|
else
|
123
|
-
|
139
|
+
# Handle retriable status codes (5xx)
|
140
|
+
if (500..599).include?(response.code.to_i) && retries < (@max_retries - 1)
|
141
|
+
retries += 1
|
142
|
+
@logger.warn("Retriable error from Vespa, retrying",
|
143
|
+
:response_code => response.code,
|
144
|
+
:retry_count => retries,
|
145
|
+
:max_retries => @max_retries,
|
146
|
+
:next_retry_delay => current_delay)
|
147
|
+
sleep(current_delay)
|
148
|
+
current_delay *= 2
|
149
|
+
else
|
150
|
+
@logger.error("Failed to fetch documents from Vespa", :request => uri.to_s,
|
124
151
|
:response_code => response.code, :response_message => response.message)
|
125
|
-
|
152
|
+
break
|
153
|
+
end
|
126
154
|
end # if response.is_a?(Net::HTTPSuccess)
|
127
155
|
|
128
156
|
end # loop do
|
129
157
|
end # def run
|
130
158
|
|
131
159
|
def fetch_documents_from_vespa(uri)
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
http
|
137
|
-
|
160
|
+
retries = 0
|
161
|
+
current_delay = @retry_delay # Start with the initial delay
|
162
|
+
|
163
|
+
begin
|
164
|
+
http = Net::HTTP.new(uri.host, uri.port)
|
165
|
+
if uri.scheme == "https"
|
166
|
+
http.use_ssl = true
|
167
|
+
if @client_cert && @client_key
|
168
|
+
http.cert = @cert
|
169
|
+
http.key = @key
|
170
|
+
http.verify_mode = OpenSSL::SSL::VERIFY_PEER
|
171
|
+
end
|
172
|
+
end
|
173
|
+
|
174
|
+
request = Net::HTTP::Get.new(uri.request_uri)
|
175
|
+
# Add auth token if provided
|
176
|
+
if @auth_token
|
177
|
+
request['Authorization'] = "Bearer #{@auth_token}"
|
178
|
+
end
|
179
|
+
|
180
|
+
http.request(request)
|
181
|
+
rescue => e
|
182
|
+
retries += 1
|
183
|
+
if retries < @max_retries
|
184
|
+
@logger.warn("Failed to make HTTP request to Vespa, retrying",
|
185
|
+
:error => e.message,
|
186
|
+
:retry_count => retries,
|
187
|
+
:max_retries => @max_retries,
|
188
|
+
:next_retry_delay => current_delay)
|
189
|
+
sleep(current_delay)
|
190
|
+
current_delay *= 2 # Double the delay for next retry
|
191
|
+
retry
|
192
|
+
else
|
193
|
+
@logger.error("Failed to make HTTP request to Vespa after #{@max_retries} attempts",
|
194
|
+
:error => e.message)
|
195
|
+
nil
|
196
|
+
end
|
138
197
|
end
|
139
|
-
|
140
|
-
request = Net::HTTP::Get.new(uri.request_uri)
|
141
|
-
http.request(request)
|
142
|
-
rescue => e
|
143
|
-
@logger.error("Failed to make HTTP request to Vespa", :error => e.message)
|
144
|
-
nil
|
145
198
|
end # def fetch_documents_from_vespa
|
146
199
|
|
147
200
|
def parse_response(response)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
s.name = 'logstash-input-vespa'
|
3
|
-
s.version = '0.
|
3
|
+
s.version = '0.4.0'
|
4
4
|
s.licenses = ['Apache-2.0']
|
5
5
|
s.summary = "Logstash input plugin reading from Vespa"
|
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"
|
@@ -18,8 +18,13 @@ Gem::Specification.new do |s|
|
|
18
18
|
s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
|
19
19
|
|
20
20
|
# Gem dependencies
|
21
|
-
s.add_runtime_dependency "logstash-core
|
21
|
+
s.add_runtime_dependency "logstash-core", ">= 8.0.0"
|
22
22
|
s.add_runtime_dependency 'logstash-codec-plain'
|
23
23
|
s.add_runtime_dependency 'stud', '>= 0.0.22'
|
24
|
+
s.add_runtime_dependency 'logstash-codec-json'
|
25
|
+
|
26
|
+
# Development dependencies
|
24
27
|
s.add_development_dependency 'logstash-devutils'
|
28
|
+
s.add_development_dependency 'rspec', '~> 3.0'
|
29
|
+
s.add_development_dependency 'webmock', '~> 3.0'
|
25
30
|
end
|
@@ -0,0 +1,288 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
require "logstash/devutils/rspec/spec_helper"
|
3
|
+
require "logstash/inputs/vespa"
|
4
|
+
require "webmock/rspec"
|
5
|
+
require 'tempfile'
|
6
|
+
require 'openssl'
|
7
|
+
|
8
|
+
describe LogStash::Inputs::Vespa do
|
9
|
+
let(:config) do
|
10
|
+
{
|
11
|
+
"cluster" => "test-cluster",
|
12
|
+
"vespa_url" => "http://localhost:8080",
|
13
|
+
"retry_delay" => 0.1, # Small delay for faster tests
|
14
|
+
"max_retries" => 3
|
15
|
+
}
|
16
|
+
end
|
17
|
+
|
18
|
+
let(:plugin) { described_class.new(config) }
|
19
|
+
let(:queue) { Queue.new }
|
20
|
+
let(:base_uri) { "#{config['vespa_url']}/document/v1/" }
|
21
|
+
let(:uri_params) { "cluster=test-cluster&wantedDocumentCount=100&concurrency=1&timeout=180" }
|
22
|
+
|
23
|
+
before do
|
24
|
+
plugin.register
|
25
|
+
allow(plugin).to receive(:sleep) # Mock sleep to speed up tests
|
26
|
+
end
|
27
|
+
|
28
|
+
describe "#run" do
|
29
|
+
context "when server returns retriable errors" do
|
30
|
+
it "retries on 503 Service Unavailable" do
|
31
|
+
stub_request(:get, "#{base_uri}?#{uri_params}")
|
32
|
+
.to_return(
|
33
|
+
{ status: 503, body: "Service Unavailable" },
|
34
|
+
{ status: 503, body: "Service Unavailable" },
|
35
|
+
{ status: 200, body: '{"documents": [], "documentCount": 0}' }
|
36
|
+
)
|
37
|
+
|
38
|
+
plugin.run(queue)
|
39
|
+
expect(a_request(:get, "#{base_uri}?#{uri_params}")).to have_been_made.times(3)
|
40
|
+
end
|
41
|
+
|
42
|
+
it "retries on 502 Bad Gateway" do
|
43
|
+
stub_request(:get, "#{base_uri}?#{uri_params}")
|
44
|
+
.to_return(
|
45
|
+
{ status: 502, body: "Bad Gateway" },
|
46
|
+
{ status: 200, body: '{"documents": [], "documentCount": 0}' }
|
47
|
+
)
|
48
|
+
|
49
|
+
plugin.run(queue)
|
50
|
+
expect(a_request(:get, "#{base_uri}?#{uri_params}")).to have_been_made.times(2)
|
51
|
+
end
|
52
|
+
|
53
|
+
it "stops after max_retries attempts" do
|
54
|
+
stub_request(:get, "#{base_uri}?#{uri_params}")
|
55
|
+
.to_return(status: 503, body: "Service Unavailable").times(4)
|
56
|
+
|
57
|
+
plugin.run(queue)
|
58
|
+
expect(a_request(:get, "#{base_uri}?#{uri_params}")).to have_been_made.times(config["max_retries"])
|
59
|
+
end
|
60
|
+
end
|
61
|
+
|
62
|
+
context "when server returns non-retriable errors" do
|
63
|
+
it "does not retry on 404 Not Found" do
|
64
|
+
stub_request(:get, "#{base_uri}?#{uri_params}")
|
65
|
+
.to_return(status: 404, body: "Not Found")
|
66
|
+
|
67
|
+
plugin.run(queue)
|
68
|
+
expect(a_request(:get, "#{base_uri}?#{uri_params}")).to have_been_made.times(1)
|
69
|
+
end
|
70
|
+
|
71
|
+
it "does not retry on 401 Unauthorized" do
|
72
|
+
stub_request(:get, "#{base_uri}?#{uri_params}")
|
73
|
+
.to_return(status: 401, body: "Unauthorized")
|
74
|
+
|
75
|
+
plugin.run(queue)
|
76
|
+
expect(a_request(:get, "#{base_uri}?#{uri_params}")).to have_been_made.times(1)
|
77
|
+
end
|
78
|
+
end
|
79
|
+
|
80
|
+
context "when server returns successful responses" do
|
81
|
+
it "processes documents and follows continuation tokens" do
|
82
|
+
|
83
|
+
# First response with continuation token
|
84
|
+
first_response = {
|
85
|
+
"pathId" => "/document/v1/",
|
86
|
+
"documents" => [
|
87
|
+
{"id" => "id:namespace:doctype::doc1", "fields" => {"field1" => "value1", "field2" => 7.0}},
|
88
|
+
{"id" => "id:namespace:doctype::doc2", "fields" => {"field1" => "value2", "field2" => 8.0}}
|
89
|
+
],
|
90
|
+
"documentCount" => 2,
|
91
|
+
"continuation" => "AAAAAA"
|
92
|
+
}
|
93
|
+
|
94
|
+
# Second response without continuation (last page)
|
95
|
+
last_response = {
|
96
|
+
"pathId" => "/document/v1/",
|
97
|
+
"documents" => [
|
98
|
+
{"id" => "id:namespace:doctype::doc3", "fields" => {"field1" => "value3", "field2" => 9.0}}
|
99
|
+
],
|
100
|
+
"documentCount" => 1
|
101
|
+
}
|
102
|
+
|
103
|
+
# Stub the requests
|
104
|
+
stub_request(:get, "#{base_uri}?#{uri_params}")
|
105
|
+
.to_return(status: 200, body: first_response.to_json)
|
106
|
+
|
107
|
+
stub_request(:get, "#{base_uri}?#{uri_params}&continuation=AAAAAA")
|
108
|
+
.to_return(status: 200, body: last_response.to_json)
|
109
|
+
|
110
|
+
plugin.run(queue)
|
111
|
+
|
112
|
+
expect(queue.size).to eq(3) # Total of 3 documents
|
113
|
+
expect(a_request(:get, "#{base_uri}?#{uri_params}")).to have_been_made.once
|
114
|
+
expect(a_request(:get, "#{base_uri}?#{uri_params}&continuation=AAAAAA")).to have_been_made.once
|
115
|
+
end
|
116
|
+
end
|
117
|
+
|
118
|
+
context "when using authentication" do
|
119
|
+
it "adds Bearer token to request headers when auth_token is provided" do
|
120
|
+
config_with_token = config.merge({"auth_token" => "test-token"})
|
121
|
+
plugin = described_class.new(config_with_token)
|
122
|
+
plugin.register
|
123
|
+
|
124
|
+
stub_request(:get, "#{base_uri}?#{uri_params}")
|
125
|
+
.with(headers: { 'Authorization' => 'Bearer test-token' })
|
126
|
+
.to_return(status: 200, body: '{"documents": [], "documentCount": 0}')
|
127
|
+
|
128
|
+
plugin.run(queue)
|
129
|
+
expect(a_request(:get, "#{base_uri}?#{uri_params}")
|
130
|
+
.with(headers: { 'Authorization' => 'Bearer test-token' }))
|
131
|
+
.to have_been_made.once
|
132
|
+
end
|
133
|
+
end
|
134
|
+
end
|
135
|
+
|
136
|
+
describe "#register" do
|
137
|
+
let(:temp_cert) do
|
138
|
+
file = Tempfile.new(['cert', '.pem'])
|
139
|
+
# Create a self-signed certificate for testing
|
140
|
+
key = OpenSSL::PKey::RSA.new(2048)
|
141
|
+
cert = OpenSSL::X509::Certificate.new
|
142
|
+
cert.version = 2
|
143
|
+
cert.serial = 1
|
144
|
+
cert.subject = OpenSSL::X509::Name.parse("/CN=Test")
|
145
|
+
cert.issuer = cert.subject
|
146
|
+
cert.public_key = key.public_key
|
147
|
+
cert.not_before = Time.now
|
148
|
+
cert.not_after = Time.now + 3600
|
149
|
+
|
150
|
+
# Sign the certificate
|
151
|
+
cert.sign(key, OpenSSL::Digest::SHA256.new)
|
152
|
+
|
153
|
+
file.write(cert.to_pem)
|
154
|
+
file.close
|
155
|
+
file
|
156
|
+
end
|
157
|
+
|
158
|
+
let(:temp_key) do
|
159
|
+
file = Tempfile.new(['key', '.pem'])
|
160
|
+
# Create a valid RSA key for testing
|
161
|
+
key = OpenSSL::PKey::RSA.new(2048)
|
162
|
+
file.write(key.to_pem)
|
163
|
+
file.close
|
164
|
+
file
|
165
|
+
end
|
166
|
+
|
167
|
+
after do
|
168
|
+
temp_cert.unlink
|
169
|
+
temp_key.unlink
|
170
|
+
end
|
171
|
+
|
172
|
+
it "raises error when only client_cert is provided" do
|
173
|
+
invalid_config = config.merge({"client_cert" => temp_cert.path})
|
174
|
+
plugin = described_class.new(invalid_config)
|
175
|
+
|
176
|
+
expect { plugin.register }.to raise_error(LogStash::ConfigurationError,
|
177
|
+
"Both client_cert and client_key must be set, you can't have just one")
|
178
|
+
end
|
179
|
+
|
180
|
+
it "raises error when only client_key is provided" do
|
181
|
+
invalid_config = config.merge({"client_key" => temp_key.path})
|
182
|
+
plugin = described_class.new(invalid_config)
|
183
|
+
|
184
|
+
expect { plugin.register }.to raise_error(LogStash::ConfigurationError,
|
185
|
+
"Both client_cert and client_key must be set, you can't have just one")
|
186
|
+
end
|
187
|
+
|
188
|
+
it "correctly sets up URI parameters" do
|
189
|
+
full_config = config.merge({
|
190
|
+
"selection" => "true",
|
191
|
+
"from_timestamp" => 1234567890,
|
192
|
+
"to_timestamp" => 2234567890,
|
193
|
+
"page_size" => 50,
|
194
|
+
|
195
|
+
"backend_concurrency" => 2,
|
196
|
+
"timeout" => 120
|
197
|
+
})
|
198
|
+
|
199
|
+
plugin = described_class.new(full_config)
|
200
|
+
plugin.register
|
201
|
+
|
202
|
+
# Access the private @uri_params using send
|
203
|
+
uri_params = plugin.send(:instance_variable_get, :@uri_params)
|
204
|
+
expect(uri_params[:selection]).to eq("true")
|
205
|
+
expect(uri_params[:fromTimestamp]).to eq(1234567890)
|
206
|
+
expect(uri_params[:toTimestamp]).to eq(2234567890)
|
207
|
+
expect(uri_params[:wantedDocumentCount]).to eq(50)
|
208
|
+
expect(uri_params[:concurrency]).to eq(2)
|
209
|
+
expect(uri_params[:timeout]).to eq(120)
|
210
|
+
end
|
211
|
+
end
|
212
|
+
|
213
|
+
describe "#parse_response" do
|
214
|
+
it "handles malformed JSON responses" do
|
215
|
+
response = double("response", :body => "invalid json{")
|
216
|
+
result = plugin.parse_response(response)
|
217
|
+
expect(result).to be_nil
|
218
|
+
end
|
219
|
+
|
220
|
+
it "successfully parses valid JSON responses" do
|
221
|
+
valid_json = {
|
222
|
+
"documents" => [{"id" => "doc1"}],
|
223
|
+
"documentCount" => 1
|
224
|
+
}.to_json
|
225
|
+
response = double("response", :body => valid_json)
|
226
|
+
|
227
|
+
result = plugin.parse_response(response)
|
228
|
+
expect(result["documentCount"]).to eq(1)
|
229
|
+
expect(result["documents"]).to be_an(Array)
|
230
|
+
end
|
231
|
+
end
|
232
|
+
|
233
|
+
describe "#process_documents" do
|
234
|
+
it "creates events with correct decoration" do
|
235
|
+
documents = [
|
236
|
+
{"id" => "doc1", "fields" => {"field1" => "value1"}},
|
237
|
+
{"id" => "doc2", "fields" => {"field1" => "value2"}}
|
238
|
+
]
|
239
|
+
|
240
|
+
# Test that decoration is applied
|
241
|
+
expect(plugin).to receive(:decorate).twice
|
242
|
+
|
243
|
+
plugin.process_documents(documents, queue)
|
244
|
+
expect(queue.size).to eq(2)
|
245
|
+
|
246
|
+
event1 = queue.pop
|
247
|
+
expect(event1.get("id")).to eq("doc1")
|
248
|
+
expect(event1.get("fields")["field1"]).to eq("value1")
|
249
|
+
|
250
|
+
event2 = queue.pop
|
251
|
+
expect(event2.get("id")).to eq("doc2")
|
252
|
+
expect(event2.get("fields")["field1"]).to eq("value2")
|
253
|
+
end
|
254
|
+
end
|
255
|
+
|
256
|
+
describe "#stop" do
|
257
|
+
it "sets stopping flag" do
|
258
|
+
plugin.stop
|
259
|
+
expect(plugin.instance_variable_get(:@stopping)).to be true
|
260
|
+
end
|
261
|
+
|
262
|
+
it "interrupts running visit operation" do
|
263
|
+
request_made = Queue.new # Use a Queue for thread synchronization
|
264
|
+
|
265
|
+
# Setup a response that would normally continue
|
266
|
+
stub_request(:get, "#{base_uri}?#{uri_params}")
|
267
|
+
.to_return(status: 200, body: {
|
268
|
+
documents: [{"id" => "doc1"}],
|
269
|
+
documentCount: 1,
|
270
|
+
continuation: "token"
|
271
|
+
}.to_json)
|
272
|
+
.with { |req| request_made.push(true); true } # Signal when request is made
|
273
|
+
|
274
|
+
# Run in a separate thread
|
275
|
+
thread = Thread.new { plugin.run(queue) }
|
276
|
+
|
277
|
+
# Wait for the first request to be made
|
278
|
+
request_made.pop
|
279
|
+
|
280
|
+
# Now we know the first request has been made, stop the plugin
|
281
|
+
plugin.stop
|
282
|
+
thread.join
|
283
|
+
|
284
|
+
# Should only make one request despite having a continuation token
|
285
|
+
expect(a_request(:get, "#{base_uri}?#{uri_params}")).to have_been_made.once
|
286
|
+
end
|
287
|
+
end
|
288
|
+
end
|
metadata
CHANGED
@@ -1,35 +1,29 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: logstash-input-vespa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Radu Gheorghe
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2025-02-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
15
15
|
requirements:
|
16
16
|
- - ">="
|
17
17
|
- !ruby/object:Gem::Version
|
18
|
-
version:
|
19
|
-
|
20
|
-
- !ruby/object:Gem::Version
|
21
|
-
version: '2.99'
|
22
|
-
name: logstash-core-plugin-api
|
18
|
+
version: 8.0.0
|
19
|
+
name: logstash-core
|
23
20
|
type: :runtime
|
24
21
|
prerelease: false
|
25
22
|
version_requirements: !ruby/object:Gem::Requirement
|
26
23
|
requirements:
|
27
24
|
- - ">="
|
28
25
|
- !ruby/object:Gem::Version
|
29
|
-
version:
|
30
|
-
- - "<="
|
31
|
-
- !ruby/object:Gem::Version
|
32
|
-
version: '2.99'
|
26
|
+
version: 8.0.0
|
33
27
|
- !ruby/object:Gem::Dependency
|
34
28
|
requirement: !ruby/object:Gem::Requirement
|
35
29
|
requirements:
|
@@ -58,6 +52,20 @@ dependencies:
|
|
58
52
|
- - ">="
|
59
53
|
- !ruby/object:Gem::Version
|
60
54
|
version: 0.0.22
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
requirement: !ruby/object:Gem::Requirement
|
57
|
+
requirements:
|
58
|
+
- - ">="
|
59
|
+
- !ruby/object:Gem::Version
|
60
|
+
version: '0'
|
61
|
+
name: logstash-codec-json
|
62
|
+
type: :runtime
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - ">="
|
67
|
+
- !ruby/object:Gem::Version
|
68
|
+
version: '0'
|
61
69
|
- !ruby/object:Gem::Dependency
|
62
70
|
requirement: !ruby/object:Gem::Requirement
|
63
71
|
requirements:
|
@@ -72,6 +80,34 @@ dependencies:
|
|
72
80
|
- - ">="
|
73
81
|
- !ruby/object:Gem::Version
|
74
82
|
version: '0'
|
83
|
+
- !ruby/object:Gem::Dependency
|
84
|
+
requirement: !ruby/object:Gem::Requirement
|
85
|
+
requirements:
|
86
|
+
- - "~>"
|
87
|
+
- !ruby/object:Gem::Version
|
88
|
+
version: '3.0'
|
89
|
+
name: rspec
|
90
|
+
type: :development
|
91
|
+
prerelease: false
|
92
|
+
version_requirements: !ruby/object:Gem::Requirement
|
93
|
+
requirements:
|
94
|
+
- - "~>"
|
95
|
+
- !ruby/object:Gem::Version
|
96
|
+
version: '3.0'
|
97
|
+
- !ruby/object:Gem::Dependency
|
98
|
+
requirement: !ruby/object:Gem::Requirement
|
99
|
+
requirements:
|
100
|
+
- - "~>"
|
101
|
+
- !ruby/object:Gem::Version
|
102
|
+
version: '3.0'
|
103
|
+
name: webmock
|
104
|
+
type: :development
|
105
|
+
prerelease: false
|
106
|
+
version_requirements: !ruby/object:Gem::Requirement
|
107
|
+
requirements:
|
108
|
+
- - "~>"
|
109
|
+
- !ruby/object:Gem::Version
|
110
|
+
version: '3.0'
|
75
111
|
description: This gem is a Logstash plugin required to be installed on top of the
|
76
112
|
Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
|
77
113
|
gem is not a stand-alone program
|
@@ -82,10 +118,10 @@ extra_rdoc_files: []
|
|
82
118
|
files:
|
83
119
|
- CHANGELOG.md
|
84
120
|
- Gemfile
|
85
|
-
- LICENSE
|
86
121
|
- README.md
|
87
122
|
- lib/logstash/inputs/vespa.rb
|
88
123
|
- logstash-input-vespa.gemspec
|
124
|
+
- spec/inputs/vespa_spec.rb
|
89
125
|
homepage: https://vespa.ai
|
90
126
|
licenses:
|
91
127
|
- Apache-2.0
|
@@ -111,4 +147,5 @@ rubygems_version: 3.3.26
|
|
111
147
|
signing_key:
|
112
148
|
specification_version: 4
|
113
149
|
summary: Logstash input plugin reading from Vespa
|
114
|
-
test_files:
|
150
|
+
test_files:
|
151
|
+
- spec/inputs/vespa_spec.rb
|
data/LICENSE
DELETED
@@ -1,202 +0,0 @@
|
|
1
|
-
|
2
|
-
Apache License
|
3
|
-
Version 2.0, January 2004
|
4
|
-
http://www.apache.org/licenses/
|
5
|
-
|
6
|
-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
7
|
-
|
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.
|