fluent-plugin-logtail 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd27c41c2106c4ad4a4ca994b6629de4c8cc11993a09d86a0448f9e593d8bae
-  data.tar.gz: 7246466098b9ef5e9596294448288d3e7f7ba4603b7c3b4710925e07421a9375
+  metadata.gz: 812d8fea53a6dc3b81c07be27f454c178d9ff2ce9bc4d6bde6531dc12e92c0c4
+  data.tar.gz: 61a02d757f5e7623e5d556c3f0ab383942a640065857f745b4814771839de1fc
 SHA512:
-  metadata.gz: 39db77c91bd5f4a9df55c9200c616c5eacf8eb65a62a11fdeea46ac821dd6175002cffe728c040b00cfc771f7f078d8e0ccdd581283dab3a5534b1be881faf1f
-  data.tar.gz: e10e9a21edbac7ffc34f1d0f6c750993adabbc357dc3d8288cd12752fb300ecd30eff3710588e64ffab9e335a5600a5fc7dce42ed0a02a204dfeb1824cd2100f
+  metadata.gz: 615922ba184a54c595633a6c8ef0c99db5f4e2ebf4814e41c4b80315221063cf6a997ca31bc94df34cd2d0bdbcf400dc07b2d9d054df098b1867515569026eeb
+  data.tar.gz: 42a5b851381bd677dd2ce65a823b85e6ca9624c7631ee65a4ce05f52fd8a32939fa20c0589f33c1f84d8227c17b959d0e0c48994b03cc1d662ad1e6de227f6d1

data/README.md

@@ -1,31 +1,22 @@
-# 🪵 Fluent::Plugin::Logtail, a plugin for [Fluentd](http://fluentd.org)
+# [Better Stack](https://betterstack.com/logs) Fluentd plugin
 
-[![build](https://github.com/logtail/fluentd-plugin-logtail/actions/workflows/main.yml/badge.svg)](https://github.com/logtail/fluentd-plugin-logtail/actions/workflows/main.yml)
+📣 Logtail is now part of Better Stack. [Learn more ⇗](https://betterstack.com/press/introducing-better-stack/)
 
-A Fluentd plugin that delivers events to the [Logtail.com logging service](https://logtail.com). It uses batching, msgpack, and retry logic for highly efficient and reliable delivery of log data.
+[![Better Stack dashboard](https://github.com/logtail/logtail-python/assets/10132717/e2a1196b-7924-4abc-9b85-055e17b5d499)](https://betterstack.com/logs)
 
-## Installation
+[![ISC License](https://img.shields.io/badge/license-ISC-ff69b4.svg)](LICENSE.md)
+[![Gem Version](https://badge.fury.io/rb/fluent-plugin-logtail.svg)](https://badge.fury.io/rb/fluent-plugin-logtail)
+[![build](https://github.com/logtail/fluentd-plugin-logtail/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/logtail/fluentd-plugin-logtail/actions/workflows/main.yml)
 
-```
-gem install fluent-plugin-logtail
-```
+Experience SQL-compatible structured log management based on ClickHouse. [Learn more ⇗](https://betterstack.com/logs)
 
-## Usage
+## Documentation
 
-In your Fluentd configuration, use `@type logtail`:
+[Getting started ⇗](https://betterstack.com/docs/logs/fluentd/)
 
-```
-<match your_match>
-  @type logtail
-  source_token YOUR_SOURCE_TOKEN
-  # ip 127.0.0.1
-  buffer_chunk_limit 1m                      # Must be < 5m
-  flush_at_shutdown true                     # Only needed with file buffer
-</match>
-```
+## Need help?
+Please let us know at [hello@betterstack.com](mailto:hello@betterstack.com). We're happy to help!
 
-## Configuration
+---
 
-* `source_token` - This is your [Logtail source token](https://logtail.com).
-
-For advanced configuration options, please see to the [buffered output parameters documentation.](http://docs.fluentd.org/articles/output-plugin-overview#buffered-output-parameters).
+[ISC license](https://github.com/logtail/fluentd-plugin-logtail/blob/main/LICENSE.md)

data/fluent-plugin-logtail.gemspec

@@ -3,7 +3,7 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'fluent-plugin-logtail'
-  s.version     = '0.2.0'
+  s.version     = '0.2.1'
   s.date        = Date.today.to_s
   s.summary     = 'Logtail.com plugin for Fluentd'
   s.description = 'Streams Fluentd logs to the Logtail.com logging service.'

data/lib/fluent/plugin/out_logtail.rb

@@ -5,9 +5,8 @@ module Fluent
   class LogtailOutput < Fluent::BufferedOutput
     Fluent::Plugin.register_output('logtail', self)
 
-    VERSION = "0.2.0".freeze
+    VERSION = "0.1.1".freeze
     CONTENT_TYPE = "application/msgpack".freeze
-    HOST = "in.logtail.com".freeze
     PORT = 443
     PATH = "/".freeze
     MAX_ATTEMPTS = 3.freeze
@@ -16,9 +15,11 @@ module Fluent
 
     config_param :source_token, :string, secret: true
     config_param :ip, :string, default: nil
+    config_param :ingesting_host, :string, default: "in.logs.betterstack.com"
 
     def configure(conf)
       @source_token = conf["source_token"]
+      @ingesting_host = conf["ingesting_host"]
       super
     end
 
@@ -90,7 +91,7 @@ module Fluent
       end
 
       def build_http_client
-        http = Net::HTTP.new(HOST, PORT)
+        http = Net::HTTP.new(@ingesting_host, PORT)
         http.use_ssl = true
         # Verification on Windows fails despite having a valid certificate.
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE

data/spec/fluent/plugin/out_logtail_spec.rb

@@ -8,6 +8,13 @@ describe Fluent::LogtailOutput do
     }
   end
 
+  let(:cloud_config) do
+    %{
+      source_token  abcd1234
+      ingesting_host s1234.eu-nbg-2.betterstackdata.com
+    }
+  end
+
   let(:driver) do
     tag = "test"
     Fluent::Test::BufferedOutputTestDriver.new(Fluent::LogtailOutput, tag) {
@@ -19,6 +26,19 @@ describe Fluent::LogtailOutput do
       end
     }.configure(config)
   end
+
+  let(:cloud_driver) do
+    tag = "test"
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::LogtailOutput, tag) {
+      # v0.12's test driver assume format definition. This simulates ObjectBufferedOutput format
+      if !defined?(Fluent::Plugin::Output)
+        def format(tag, time, record)
+          [time, record].to_msgpack
+        end
+      end
+    }.configure(cloud_config)
+  end
+
   let(:record) do
     {'age' => 26, 'request_id' => '42', 'parent_id' => 'parent', 'routing_id' => 'routing'}
   end
@@ -28,11 +48,11 @@ describe Fluent::LogtailOutput do
   end
 
   describe "#write" do
-    it "should send a chunked request to the Logtail API" do
-      stub = stub_request(:post, "https://in.logtail.com/").
+    it "should send a chunked request to the Logtail API using default host" do
+      stub = stub_request(:post, "https://in.logs.betterstack.com/").
         with(
           :body => start_with("\xDD\x00\x00\x00\x01\x85\xA3age\x1A\xAArequest_id\xA242\xA9parent_id\xA6parent\xAArouting_id\xA7routing\xA2dt\xB4".force_encoding("ASCII-8BIT")),
-          :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer abcd1234', 'Content-Type'=>'application/msgpack', 'User-Agent'=>'Logtail Fluentd/0.2.0'}
+          :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer abcd1234', 'Content-Type'=>'application/msgpack', 'User-Agent'=>'Logtail Fluentd/0.1.1'}
         ).
         to_return(:status => 202, :body => "", :headers => {})
 
@@ -43,7 +63,7 @@ describe Fluent::LogtailOutput do
     end
 
     it "handles 500s" do
-      stub = stub_request(:post, "https://in.logtail.com/").to_return(:status => 500, :body => "", :headers => {})
+      stub = stub_request(:post, "https://in.logs.betterstack.com/").to_return(:status => 500, :body => "", :headers => {})
 
       driver.emit(record)
       driver.run
@@ -52,7 +72,7 @@ describe Fluent::LogtailOutput do
     end
 
     it "handle auth failures" do
-      stub = stub_request(:post, "https://in.logtail.com/").to_return(:status => 403, :body => "", :headers => {})
+      stub = stub_request(:post, "https://in.logs.betterstack.com/").to_return(:status => 403, :body => "", :headers => {})
 
       driver.emit(record)
       driver.run
@@ -60,4 +80,20 @@ describe Fluent::LogtailOutput do
       expect(stub).to have_been_requested.times(1)
     end
   end
+
+  describe "#write to cloud" do
+    it "should send a chunked request to the Logtail API" do
+      stub = stub_request(:post, "https://s1234.eu-nbg-2.betterstackdata.com/").
+        with(
+          :body => start_with("\xDD\x00\x00\x00\x01\x85\xA3age\x1A\xAArequest_id\xA242\xA9parent_id\xA6parent\xAArouting_id\xA7routing\xA2dt\xB4".force_encoding("ASCII-8BIT")),
+          :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer abcd1234', 'Content-Type'=>'application/msgpack', 'User-Agent'=>'Logtail Fluentd/0.1.1'}
+        ).
+        to_return(:status => 202, :body => "", :headers => {})
+
+      cloud_driver.emit(record)
+      cloud_driver.run
+
+      expect(stub).to have_been_requested.times(1)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-logtail
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Logtail.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Logtail.com plugin for Fluentd