logstash-output-sumologic 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cb3e69cc8d33b60f981ee807b8deeab442bca032d5715df432d467d5a917b51
-  data.tar.gz: 4e1c485db70cace53f2c46b7fd089be90775e74d569ace0fd1462a98ffe7fed7
+  metadata.gz: ab9e1ae438a4d6030629b00a67c0536aba6995f6a2bae1f952b9737cf2c28189
+  data.tar.gz: fdfec75b2d7c4bcd5c242c1d142d041648d450e3dfcb7a576de9531986f5438d
 SHA512:
-  metadata.gz: '0478381fc42c308038c921dcede8662f5c83147f618c34bf5acf1f9c07b693d3a3e95a0978f74dc8114217b7e1c8b0aff78e29feb2435b27d6b1618a116fddb1'
-  data.tar.gz: f8ba1e23876443e518d468f1f2c162f4053093fa251f870b0abd61528caea9c6fdef88dd86ba91278519ee7fd5baf352479e9d97386c8e9cbcf817b19c41e2c9
+  metadata.gz: 66620931f50b2c241835824e26e16e0c05ef8c4ec9ac5ad3770d579ae345ef4486c68de23de8c7c284e3005598231738f75bef59704977a65e3911b992907951
+  data.tar.gz: 294a5910f5ec91ace98405439411d26ddf1e3c858e6d17cefb67d8b2b3c0b534c101cdd93faeab08c34dd42f77f5fb078e03b853e6937d63b1ed9f56ba69b840

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.4.0 (2021-09-27)
+
+- [#68](https://github.com/SumoLogic/logstash-output-sumologic/pull/68) feat: retry on 502 error code
+
 ## 1.3.2 (2021-02-03)
 
 - [#60](https://github.com/SumoLogic/logstash-output-sumologic/pull/60) Fix plugin metrics not being sent

data/{DEVELOPER.md → CONTRIBUTING.md}

@@ -1,6 +1,46 @@
-# Development Guide
+# Contributing
 
-Logstash output plugin for delivering log to Sumo Logic cloud service through HTTP source.
+## Set up development environment
+
+You can use the preconfigured Vagrant virtual machine for development
+It includes everything that is needed to start coding.
+See [./vagrant/README.md](./vagrant/README.md).
+
+If you don't want to or cannot use Vagrant, you need to install the following dependencies:
+
+- [Java SE](http://www.oracle.com/technetwork/java/javase/downloads/index.html) as a prerequisite to JRuby,
+- [JRuby](https://www.jruby.org/),
+- [Bundler](https://bundler.io/),
+- optionally [Docker](https://docs.docker.com/get-docker/), if you want to build and run container images.
+
+When your machine is ready (either in Vagrant or not), run this in the root directory of this repository:
+
+```sh
+bundle install
+```
+
+## Running tests
+
+Some of the tests try to send actual data to an actual Sumo Logic account.
+To run those tests, you need to make `sumo_url` environment variable available.
+If the `sumo_url` environment variable is not present, the tests reaching Sumo Logic will be skipped.
+
+```sh
+export sumo_url=https://events.sumologic.net/receiver/v1/http/XXXXXXXXXX
+```
+
+To run the tests, execute:
+
+```sh
+bundle exec rspec
+```
+
+To run tests in Docker, execute:
+
+```sh
+docker build -t logstash-output-plugin .
+docker run --rm -it -e 'sumo_url=https://events.sumologic.net/receiver/v1/http/XXXXXXXXXX' logstash-output-plugin
+```
 
 ## How to build .gem file from repository
 
@@ -24,26 +64,6 @@ And then install the plugin locally:
 bin/logstash-plugin install <full path of .gem>
 ```
 
-## How to run test with rspec
-
-### Running in Docker
-
-```bash
-docker build -t logstash-output-plugin .
-docker run --rm -it -e 'sumo_url=https://events.sumologic.net/receiver/v1/http/XXXXXXXXXX' logstash-output-plugin
-```
-
-### Running on bare metal
-
-The test requires JRuby to run.
-
-```bash
-rvm use jruby
-bundle install
-export sumo_url=https://events.sumologic.net/receiver/v1/http/XXXXXXXXXX
-rspec spec/
-```
-
 ## Continuous Integration
 
 The project uses GitHub Actions for:

data/lib/logstash/outputs/sumologic/monitor.rb

@@ -29,7 +29,7 @@ module LogStash; module Outputs; class SumoLogic;
           while @stopping.false?
             Stud.stoppable_sleep(@interval) { @stopping.true? }
             if @stats.total_log_lines.value > 0 || @stats.total_metrics_datapoints.value > 0
-              @queue.enq(Batch.new(@header_builder.build_stats(), build_stats_payload()))
+              @queue.enq(Batch.new(headers(), build_stats_payload()))
             end
           end # while
         }
@@ -73,5 +73,9 @@ module LogStash; module Outputs; class SumoLogic;
       "metric=#{key} interval=#{@interval}  category=monitor #{value} #{timestamp}"
     end # def build_metric_line
 
+    def headers()
+      @headers ||= @header_builder.build_stats()
+    end
+
   end
 end; end; end

data/lib/logstash/outputs/sumologic/sender.rb

@@ -125,7 +125,7 @@ module LogStash; module Outputs; class SumoLogic;
             :code => response.code,
             :headers => headers,
             :contet => content[0..20])
-          if response.code == 429 || response.code == 503 || response.code == 504
+          if response.code == 429 || response.code == 502 || response.code == 503 || response.code == 504
             requeue_message(batch)
           end
         else

data/lib/logstash/outputs/sumologic.rb

@@ -102,7 +102,7 @@ class LogStash::Outputs::SumoLogic < LogStash::Outputs::Base
   # For carbon2 metrics format only, define the meta tags (which will NOT be used to identify the metrics)
   config :meta_tags, :validate => :hash, :default => {}
   
-  # For messages fail to send or get 429/503/504 response, try to resend after (x) seconds; don't resend if (x) < 0
+  # For messages fail to send or get 429/502/503/504 response, try to resend after (x) seconds; don't resend if (x) < 0
   config :sleep_before_requeue, :validate => :number, :default => 30
 
   config :stats_category, :validate => :string, :default => CATEGORY_HEADER_DEFAULT_STATS

data/logstash-output-sumologic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-sumologic'
-  s.version       = '1.3.2'
+  s.version       = '1.4.0'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Deliever the log to Sumo Logic cloud service.'
   s.description   = 'This gem is a Logstash output plugin to deliver the log or metrics to Sumo Logic cloud service. Go to https://github.com/SumoLogic/logstash-output-sumologic for getting help, reporting issues, etc.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-sumologic
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Sumo Logic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: manticore
@@ -107,7 +107,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- DEVELOPER.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md