kumonos 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc44a86277d8d09adfcb068debfac85413c392e9
-  data.tar.gz: 78e8cb1238eeb0f9d93112d1ab85e7d5a37c379e
+  metadata.gz: 5c137d928413251dd625fb879bb9fadceaec8b67
+  data.tar.gz: 94760987d06167ca471708e592e27fb0163704b8
 SHA512:
-  metadata.gz: dcd381aa25a45a123399c6511525f58647a5587b5d721029e196576c82a7f7067971550af4607ab22e5ee7f9b6318905d8a3e9c81f80683f1212a1803273d66c
-  data.tar.gz: a0e0bb3e72d821c844bd3aa8e04ac19229eb7df2594631d4370005f32c7f77d5933879c6476dae3588b41cf02a484ff974947183729d986712c46d775d586496
+  metadata.gz: 3d7e6457d9cfaa4bce356fbf282fea7c5467628d5766d3d1f6044059807dcd2f608605d1e8c60ce76e0ece3ce85a548056ae3c2e5cfb56613dc19078b4f47305
+  data.tar.gz: fa2dee968425d4eb53f57a9bd6d7f27d24a157c0dd932ad7bb69883293a380574c22cf5ad08656f1f3262fe917d09cc113d2c78433d7f43e56c9dae103fa6d33

data/Dockerfile

@@ -0,0 +1,9 @@
+FROM ruby:2.4
+
+RUN gem i bundler --no-doc
+RUN mkdir -p /kumonos/lib/kumonos
+COPY lib/kumonos/version.rb /kumonos/lib/kumonos/
+COPY Gemfile Gemfile.lock kumonos.gemspec /kumonos/
+WORKDIR /kumonos
+RUN bundle install
+COPY . /kumonos

data/example/envoy.json

@@ -23,7 +23,7 @@
     "lb_type": "round_robin",
     "hosts": [
       {
-        "url": "tcp://socat:2000"
+        "url": "tcp://relay:2000"
       }
     ]
   },

data/exe/kumonos-relay

@@ -0,0 +1,104 @@
+#!/usr/bin/env ruby
+require 'optparse'
+require 'socket'
+require 'logger'
+
+# Convert metric name
+class StatConvertor
+  def initialize(options)
+    @options = options
+  end
+
+  def call(line)
+    convert_cluster(add_default_tag(line)) + "\n"
+  end
+
+  private
+
+  # envoy.cluster.ab-testing.external.upstream_rq_200
+  PATTERN = /\Aenvoy\.cluster\.([^.]+)\./
+  def convert_cluster(line)
+    if line.match(PATTERN)
+      name = Regexp.last_match(1)
+      [
+        line.gsub(PATTERN, 'envoy.cluster.'),
+        ",cluster:#{name}"
+      ].join
+    else
+      line
+    end
+  end
+
+  def add_default_tag(line)
+    [
+      "#{line.chomp}|#",
+      "service-cluster:#{@options[:service_cluster]},",
+      "service-node:#{@options[:service_node]},",
+      "host:#{@options[:host]}"
+    ].join
+  end
+end
+
+logger = Logger.new($stderr)
+
+options = {
+  service_cluster: '',
+  service_node: '',
+  host: Socket.gethostname
+}
+parser = OptionParser.new do |opts|
+  opts.banner = "Usage: #{__FILE__} [options] bind_address:port remote_address:port"
+
+  opts.on('--service-cluster=VAL (required)') { |v| options[:service_cluster] = v }
+  opts.on('--service-node=VAL (required)') { |v| options[:service_node] = v }
+  opts.on('--host=VAL') { |v| options[:host] = v }
+end
+
+argv = parser.parse(ARGV)
+
+if argv.size != 2
+  warn parser.help
+  exit 1
+end
+if options[:service_cluster].empty? || options[:service_node].empty?
+  warn '--service-cluster and --service-node are required'
+  warn parser.help
+  exit 1
+end
+
+convertor = StatConvertor.new(options)
+
+bind_option = argv.shift
+remote_option = argv.shift
+
+source_ip, source_port = *bind_option.split(':')
+unless source_ip && source_port
+  warn "Invalid bind option given: #{bind_option}"
+  exit 1
+end
+
+remote_ip, remote_port = *remote_option.split(':')
+unless remote_ip && remote_port
+  warn "Invalid remote option given: #{remote_option}"
+  exit 1
+end
+
+Thread.abort_on_exception = true
+logger.info("Starting relay: source=#{bind_option} remote=#{remote_option}")
+source = TCPServer.open(source_ip, source_port)
+
+loop do
+  Thread.start(source.accept) do |s|
+    while (body = s.gets)
+      logger.info("recieved #{body.bytesize} bytes")
+      logger.debug(body)
+      next if body.empty?
+
+      b = convertor.call(body)
+      UDPSocket.new.send(b, Socket::MSG_DONTWAIT, remote_ip, remote_port)
+      logger.info("write #{b.bytesize} bytes")
+      logger.debug(b)
+    end
+    s.close
+  end
+end

data/kumonos.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rack'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-json_matcher'

data/lib/kumonos/version.rb

@@ -1,3 +1,3 @@
 module Kumonos
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumonos
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +141,7 @@ email:
 - taiks.4559@gmail.com
 executables:
 - kumonos
+- kumonos-relay
 extensions: []
 extra_rdoc_files: []
 files:
@@ -135,6 +150,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - DEVELOPMENT.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -146,6 +162,7 @@ files:
 - example/envoy.json
 - example/example-with-tls.yml
 - exe/kumonos
+- exe/kumonos-relay
 - kumonos.gemspec
 - lib/kumonos.rb
 - lib/kumonos/clusters.rb
@@ -177,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: A "control plane" for Microservices "service mesh".