logstash-output-clickhouse 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05f2b2d96799587dc5678cd80a6ef5d0c62a103797a298dfbe86acb1dbe09b89
-  data.tar.gz: ffeb98ddb2e27497ff54e9304180a2a44e88d093ce33755f842409a2101d4153
+  metadata.gz: 20cb59bb456f397ff9408209d676deb3c46214abbd874a5499ab5f7387bb80b9
+  data.tar.gz: 471cd0087a01acbcd6ed8efaa93e09f89102a2b2785bcfa7bb117e7ed8dd2b0d
 SHA512:
-  metadata.gz: 1c6d244d35441f46a0b49b79d1f278004e634334349d3949ec8d49e96fb02e31c942d13f8be72e7ddcd9996687acf81f1378b3587cbab6c6a9a9f93eb6634a6a
-  data.tar.gz: 530b73e05f582bf9b9af8a3be95aa1139fd0b21c3a75b411635453fa9c5e4bc538f8fb8477ab2388fad2560570c92a3623d614c97e69f103850ef6e54d45a23a
+  metadata.gz: 3319460b03965943afecff0c3b910ebfb57611566f02b255b7fb3afd6b2a7f6781b89990cf667286972ed27bb503b90833a300f20450a0ad3e637c2144b3f37e
+  data.tar.gz: 609792b63cc1aa8d073f272e9539458738914c4ed1a795b22e23d6a86724b6e9c7e0277b533d0e02fa03d40168799197a614d3208e129b8ba534a8bb3ea80aee

data/README.md

@@ -1,4 +1,5 @@
 # Logstash Plugin
+[![Gem Version](https://badge.fury.io/rb/logstash-output-clickhouse.svg)](https://badge.fury.io/rb/logstash-output-clickhouse)
 
 This plugin is a modified version of the Lucidworks logstash json_batch. That plugin is available [here](https://github.com/lucidworks/logstash-output-json_batch). 
 

data/lib/logstash/outputs/clickhouse.rb

@@ -2,7 +2,6 @@
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "logstash/json"
-require "logstash/util/shortname_resolver"
 require "uri"
 require "stud/buffer"
 require "logstash/plugin_mixins/http_client"
@@ -78,10 +77,6 @@ class LogStash::Outputs::ClickHouse < LogStash::Outputs::Base
     params = { "query" => "INSERT INTO #{table} FORMAT JSONEachRow" }.merge(@extra_params)
     @http_query = "?#{URI.encode_www_form(params)}"
 
-    @hostnames_pool =
-      parse_http_hosts(http_hosts,
-                       ShortNameResolver.new(ttl: @host_resolve_ttl_sec, logger: @logger))
-
     buffer_initialize(
       :max_items => @flush_size,
       :max_interval => @idle_flush_time,
@@ -91,39 +86,6 @@ class LogStash::Outputs::ClickHouse < LogStash::Outputs::Base
     print_plugin_info()
   end # def register
 
-  private
-
-  def parse_http_hosts(hosts, resolver)
-    ip_re = /^[\d]+\.[\d]+\.[\d]+\.[\d]+$/
-
-    lambda {
-      hosts.flat_map { |h|
-        scheme = URI(h).scheme
-        host = URI(h).host
-        port = URI(h).port
-        path = URI(h).path
-
-        if ip_re !~ host
-          resolver.get_addresses(host).map { |ip|
-            "#{scheme}://#{ip}:#{port}#{path}"
-          }
-        else
-          [h]
-        end
-      }
-    }
-  end
-
-  private
-
-  def get_host_addresses()
-    begin
-      @hostnames_pool.call
-    rescue Exception => ex
-      @logger.error("Error while resolving host", :error => ex.to_s)
-    end
-  end
-
   # This module currently does not support parallel requests as that would circumvent the batching
   def receive(event)
     buffer_receive(event)
@@ -159,7 +121,7 @@ class LogStash::Outputs::ClickHouse < LogStash::Outputs::Base
       documents << LogStash::Json.dump(mutate(event.to_hash())) << "\n"
     end
 
-    hosts = get_host_addresses()
+    hosts = @http_hosts.clone
 
     make_request(documents, hosts, @http_query, 1, 1, hosts.sample)
   end

data/logstash-output-clickhouse.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "logstash-output-clickhouse"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
   s.licenses = ["Apache-2.0"]
   s.summary = "This output lets you `POST` messages as JSON in a batched fashion to ClickHouse HTTP endpoint"
   s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-clickhouse
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - kmajk
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
@@ -125,7 +125,6 @@ files:
 - LICENSE
 - README.md
 - lib/logstash/outputs/clickhouse.rb
-- lib/logstash/util/shortname_resolver.rb
 - logstash-output-clickhouse.gemspec
 homepage: https://github.com/maltoze/logstash-output-clickhouse
 licenses:

data/lib/logstash/util/shortname_resolver.rb

@@ -1,40 +0,0 @@
-require 'resolv'
-require 'mini_cache'
-
-class ShortNameResolver
-  def initialize(ttl:, logger:)
-    @ttl = ttl
-    @store = MiniCache::Store.new
-    @logger = logger
-  end
-
-  private
-  def resolve_cached(shortname)
-    @store.get_or_set(shortname) do
-      addresses = resolve(shortname)
-      raise "Bad shortname '#{shortname}'" if addresses.empty?
-      MiniCache::Data.new(addresses, expires_in: @ttl)
-    end
-  end
-
-  private
-  def resolve(shortname)
-    addresses = Resolv::DNS.open do |dns|
-      dns.getaddresses(shortname).map { |r| r.to_s }
-    end
-
-    @logger.info("Resolved shortname '#{shortname}' to addresses #{addresses}")
-
-    return addresses
-  end
-
-  public
-  def get_address(shortname)
-    return resolve_cached(shortname).sample
-  end
-
-  public
-  def get_addresses(shortname)
-    return resolve_cached(shortname)
-  end
-end