logstash-promtail-http-input 4.1-java → 4.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ead6373843dd13049d29b2c85866eebfb367f8c929139b0368703cb0a404a3
-  data.tar.gz: f756dff325c01e3ed6abce87f913f8a308602e5c330a146de76e8f610b7cc2b5
+  metadata.gz: 1b099e0e1658d317ddab2fe890d7f3e8e051671b2039f5d1c878eaf6b17cfeee
+  data.tar.gz: eb8fe2ec97ead1460067c8ea5b47ead34b3805d83f1d2be547522c9d1b45ca02
 SHA512:
-  metadata.gz: 57b808b790b9fe28414815c40aedc010d6091f38aa096198eacb965e6148366323a462beebae2873f1c070768b05b596270a1b6ad11de59f6d31796a74ad5658
-  data.tar.gz: 7cd0ea260f19672d512af5596bec3b03ffa5dc793cdbeb2747355877b5be6f60f1be4319e565c75062e1b51a1e9504d3e6d6510a0259927bbeb23e22735e12b8
+  metadata.gz: 72799b83a11e68090b11d01fcd0f1e3395c826e449cd57623549ad153abae814f35149ce6f9a6285b48f521cd6782614ae94fa1a079a873b1480be3188bd884a
+  data.tar.gz: a0d25ed050dd5bef9aa87b038f9c3b1630483f822c5c97cd3aff2b1250c4bce9cb64d91a8deb2bdceb21f29cc1ea160b1c48dd28fbce6addae308f101a1e133f

data/VERSION

@@ -1 +1 @@
-4.0.1
+1.0.0

data/lib/logstash-input-http_jars.rb

@@ -7,4 +7,4 @@ require_jar('com.google.protobuf', 'protobuf-java', '3.14.0')
 require_jar('org.xerial.snappy', 'snappy-java', '1.1.8.4')
 require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.12.3')
 require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.12.3')
-require_jar('org.logstash.plugins.input.http', 'logstash-input-http', '4.0.1')
+require_jar('org.logstash.plugins.input.http', 'logstash-promtail-http-input', '1.0.0')

data/lib/logstash/inputs/http.rb

@@ -167,12 +167,12 @@ class LogStash::Inputs::Http < LogStash::Inputs::Base
     content_type = headers.fetch("content_type", "")
 
     if (content_type.start_with?("application/x-protobuf"))
-      # events = @promtail_input.decode_str(@promtail_input.toUTF8String(body))
       events = @promtail_input.decode(body)
-      events.each do |event|
-        ts = event.get("@timestamp")
+      events.each do |e|
+        event = {}.merge(e) # needs copy othervise Time is converted automatically to java.util.Date
+        ts = event["@timestamp"]
         if ts
-          event.put("@timestamp", Time.parse(ts))
+          event["@timestamp"] = Time.parse(ts)
         end
         push_decoded_event(headers, remote_address, LogStash::Event.new(event), false)
       end

data/logstash-promtail-http-input.gemspec

@@ -1,8 +1,8 @@
-HTTP_INPUT_VERSION = File.read(File.expand_path(File.join(File.dirname(__FILE__), "VERSION"))).strip unless defined?(HTTP_INPUT_VERSION)
+
 
 Gem::Specification.new do |s|
   s.name = 'logstash-promtail-http-input'
-  s.version         = 4.1
+  s.version         = '4.2'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Receives events over HTTP or HTTPS"
   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"

data/spec/inputs/http_spec.rb

@@ -172,6 +172,15 @@ describe LogStash::Inputs::Http do
           expect(event.get("message")).to eq(message)
           expect(event.get("tenant")).to eq(tenant)
         end
+        it "should set fake tenant" do
+          promtail_input = org.logstash.plugins.inputs.http.promtail.PromtailHandler.new
+          message = "My compressed and protobuf-ed message"
+          tenant = "fake"
+          promtail_input.sendLogHttp("http://127.0.0.1:#{port}/template/loki", message, tenant)
+          event = logstash_queue.pop
+          expect(event.get("message")).to eq(message)
+          expect(event.get("tenant")).to eq(tenant)
+        end
       end
       context "when receiving a deflate compressed text/plain request" do
         it "should process the request normally" do

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: logstash-promtail-http-input
 version: !ruby/object:Gem::Version
-  version: '4.1'
+  version: '4.2'
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -20,6 +19,7 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
+  name: logstash-core-plugin-api
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,12 +31,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
-  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-plain
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jar-dependencies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -54,6 +53,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.4
+  name: jar-dependencies
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -65,12 +65,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.4
 - !ruby/object:Gem::Dependency
-  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -79,12 +79,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-json
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -93,12 +93,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: logstash-codec-json_lines
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-json_lines
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,12 +107,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: manticore
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: manticore
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -150,6 +150,7 @@ files:
 - vendor/jar-dependencies/io/netty/netty-all/4.1.49.Final/netty-all-4.1.49.Final.jar
 - vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.11.1/log4j-api-2.11.1.jar
 - vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-input-http/4.0.1/logstash-input-http-4.0.1.jar
+- vendor/jar-dependencies/org/logstash/plugins/input/http/logstash-promtail-http-input/1.0.0/logstash-promtail-http-input-1.0.0.jar
 - vendor/jar-dependencies/org/xerial/snappy/snappy-java/1.1.8.4/snappy-java-1.1.8.4.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
@@ -173,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: Receives events over HTTP or HTTPS