kumonos 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f80bafc25db408cb0165a8d5dd67dec8b9719420
-  data.tar.gz: b007c2291e51524c2188f8d25e0380821f3f1541
+SHA256:
+  metadata.gz: 952ff01c0ea52b0ec8b24acf94fc2e58da06ae47d467e349f120c9b7eaff2102
+  data.tar.gz: 6ca2a61ce2a1022a7a7cc7bfda0129c15a2a7d145b8afb8f4ed14e7d31db8aa8
 SHA512:
-  metadata.gz: aedffb0e21214cc5720532a5edf220b27e7173de44317cadb02d4821d8573c65b6de1937d5cae11dd18ed5eeb20f088c9c153bba7bbf71eafc546db3a7ac307d
-  data.tar.gz: 92cf7fa7e6341cba6f8d8ec714c45af66ee5fea626f43d3e89a4ccf986f9e71b961aa2a79bd98b2777f1c0ddadcfd5ebb22796a90197126ce56889fa984cb62a
+  metadata.gz: 2036f5f8649540ef1e43f4292dfe0b497320046fda0937459778d7b163c5e9073c0102796e854b68da2adff98ae1bd51bc391d07df1fb7d65a22777b7747592c
+  data.tar.gz: d65444682fde1eb1b8b7c881a777670c49e4ce68d52e86c1deef573b3da7e59e76dc1351a765c879185a59edae77f444c661c29d192ffb6cee3cb356f7eeed34

data/example/envoy_config.yml

@@ -11,7 +11,4 @@ discovery_service:
   refresh_delay_ms: 30000
   connect_timeout_ms: 1000
 statsd:
-  address: relay:2000
-  tls: false
-  type: strict_dns
-  connect_timeout_ms: 1000
+  address: statsd-exporter:9125

data/lib/kumonos/envoy.rb

@@ -14,7 +14,7 @@ module Kumonos
           new(
             h.fetch('version'),
             discovery_service,
-            h['statsd'] ? build_statsd_cluster(h['statsd']) : nil,
+            h['statsd'] ? h['statsd'].fetch('address') : nil,
             Listener.build(h.fetch('listener'), discovery_service),
             Admin.build(h.fetch('admin'))
           )
@@ -41,12 +41,41 @@ module Kumonos
         h.delete(:statsd)
         h.delete(:listener)
         h[:admin] = admin.to_h
-        h[:listeners] = [listener.to_h]
-        h[:cluster_manager] = { cds: discovery_service.to_h, clusters: [] }
+        h[:static_resources] = {
+          listeners: [listener.to_h],
+          clusters: [discovery_service.cluster.to_h]
+        }
+        h[:dynamic_resources] = {
+          cds_config: {
+            api_config_source: {
+              cluster_names: [discovery_service.cluster.name],
+              refresh_delay: {
+                seconds: discovery_service.refresh_delay_ms / 1000.0
+              }
+            }
+          }
+        }
 
         if statsd
-          h[:statsd_tcp_cluster_name] = statsd.name
-          h[:cluster_manager][:clusters] << statsd.to_h
+          statsd_address, statsd_port = statsd.split(':')
+          h[:stats_sinks] = [
+            {
+              name: 'envoy.dog_statsd',
+              config: {
+                address: {
+                  socket_address: {
+                    protocol: 'UDP',
+                    address: statsd_address,
+                    port_value: Integer(statsd_port)
+                  }
+                }
+              }
+            }
+          ]
+          h[:stats_config] = {
+            use_all_default_tags: true,
+            stats_tags: []
+          }
         end
 
         h
@@ -56,7 +85,8 @@ module Kumonos
     Listener = Struct.new(:address, :access_log_path, :discovery_service) do
       class << self
         def build(h, discovery_service)
-          new(h.fetch('address'), h.fetch('access_log_path'), discovery_service)
+          address = AddressParser.call(h.fetch('address'))
+          new(address, h.fetch('access_log_path'), discovery_service)
         end
       end
 
@@ -64,21 +94,38 @@ module Kumonos
         h = super
         h.delete(:discovery_service)
         h.delete(:access_log_path)
-        h[:filters] = [
+        h[:name] = 'egress'
+        h[:filter_chains] = [
           {
-            type: 'read',
-            name: 'http_connection_manager',
-            config: {
-              codec_type: 'auto',
-              stat_prefix: 'egress_http',
-              access_log: [{ path: access_log_path }],
-              rds: {
-                cluster: discovery_service.cluster.name,
-                route_config_name: DEFAULT_ROUTE_NAME,
-                refresh_delay_ms: discovery_service.refresh_delay_ms
-              },
-              filters: [{ type: 'decoder', name: 'router', config: {} }]
-            }
+            filters: [
+              {
+                name: 'envoy.http_connection_manager',
+                config: {
+                  codec_type: 'AUTO',
+                  stat_prefix: 'egress_http',
+                  access_log: [
+                    {
+                      name: 'envoy.file_access_log',
+                      config: {
+                        path: access_log_path
+                      }
+                    }
+                  ],
+                  rds: {
+                    config_source: {
+                      api_config_source: {
+                        cluster_names: [discovery_service.cluster.name],
+                        refresh_delay: {
+                          seconds: discovery_service.refresh_delay_ms / 1000.0
+                        }
+                      }
+                    },
+                    route_config_name: DEFAULT_ROUTE_NAME
+                  },
+                  http_filters: [{ name: 'envoy.router' }]
+                }
+              }
+            ]
           }
         ]
         h
@@ -89,13 +136,14 @@ module Kumonos
       class << self
         def build(h)
           lb = h.fetch('lb')
+          host, port = lb.split(':')
           cluster = Cluster.new(
             lb.split(':').first,
-            'strict_dns',
+            'STRICT_DNS',
             h.fetch('tls'),
             h.fetch('connect_timeout_ms'),
-            'round_robin',
-            [{ 'url' => "tcp://#{lb}" }]
+            'ROUND_ROBIN',
+            [{ 'socket_address' => { 'address' => host, 'port_value' => Integer(port) } }]
           )
           new(h.fetch('refresh_delay_ms'), cluster)
         end
@@ -117,8 +165,15 @@ module Kumonos
 
       def to_h
         h = super
+        h[:type] = type.upcase
+        h.delete(:lb_type)
+        h[:lb_policy] = lb_type.upcase
         h.delete(:tls)
-        h[:ssl_context] = {} if tls
+        h[:tls_context] = {} if tls
+        h.delete(:connect_timeout_ms)
+        h[:connect_timeout] = {
+          seconds: connect_timeout_ms / 1000.0
+        }
         h
       end
     end
@@ -126,9 +181,24 @@ module Kumonos
     Admin = Struct.new(:address, :access_log_path) do
       class << self
         def build(h)
-          new(h.fetch('address'), h.fetch('access_log_path'))
+          address = AddressParser.call(h.fetch('address'))
+          new(address, h.fetch('access_log_path'))
         end
       end
     end
+
+    # Parse old address string
+    module AddressParser
+      def self.call(address)
+        raise "invalid address given: #{address}" if address !~ %r{tcp://([^:]+):(\d+)}
+
+        {
+          socket_address: {
+            address: Regexp.last_match(1),
+            port_value: Integer(Regexp.last_match(2))
+          }
+        }
+      end
+    end
   end
 end

data/lib/kumonos/version.rb

@@ -1,3 +1,3 @@
 module Kumonos
-  VERSION = '0.10.2'.freeze
+  VERSION = '0.11.0'.freeze
 end

data/lib/schemas/envoy.json

@@ -85,29 +85,14 @@
     "statsd": {
       "type": "object",
       "id": "/properties/statsd",
-      "additionalProperties": false,
+      "additionalProperties": true,
       "required": [
-        "address",
-        "tls",
-        "type",
-        "connect_timeout_ms"
+        "address"
       ],
       "properties": {
         "address": {
           "type": "string",
           "id": "/properties/statsd/properties/address"
-        },
-        "tls": {
-          "type": "boolean",
-          "id": "/properties/statsd/properties/tls"
-        },
-        "type": {
-          "type": "string",
-          "id": "/properties/statsd/properties/type"
-        },
-        "connect_timeout_ms": {
-          "type": "integer",
-          "id": "/properties/statsd/properties/connect_timeout_ms"
         }
       }
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumonos
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -141,7 +141,6 @@ email:
 - taiks.4559@gmail.com
 executables:
 - kumonos
-- kumonos-relay
 extensions: []
 extra_rdoc_files: []
 files:
@@ -162,7 +161,6 @@ files:
 - example/envoy_config.yml
 - example/example-with-tls.yml
 - exe/kumonos
-- exe/kumonos-relay
 - kumonos.gemspec
 - lib/kumonos.rb
 - lib/kumonos/clusters.rb
@@ -193,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A "control plane" for Microservices "service mesh".

data/exe/kumonos-relay

@@ -1,135 +0,0 @@
-#!/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_status_code(convert_listener(convert_cluster(add_default_tag(line)))) + "\n"
-  end
-
-  private
-
-  STATS_CODE_PATTERN = /(upstream|downstream)_rq_(\dxx|\d{3})/
-  def convert_status_code(line)
-    if line.match(STATS_CODE_PATTERN)
-      stream = Regexp.last_match(1)
-      code = Regexp.last_match(2)
-      [
-        line.gsub(STATS_CODE_PATTERN, "#{stream}_rq_by_code"),
-        ",status_code:#{code}"
-      ].join
-
-    else
-      line
-    end
-  end
-
-  # envoy.cluster.ab-testing.external.upstream_rq_200:1|c
-  CLUSTER_PATTERN = /\Aenvoy\.cluster\.([^.]+)\./
-  def convert_cluster(line)
-    if line.match(CLUSTER_PATTERN)
-      name = Regexp.last_match(1)
-      [
-        line.gsub(CLUSTER_PATTERN, 'envoy.cluster.'),
-        ",cluster:#{name}"
-      ].join
-    else
-      line
-    end
-  end
-
-  # XXX: ipv4 only
-  # envoy.listener.0.0.0.0_9211.http.egress_http.downstream_rq_5xx:0|c
-  LISTENER_PATTERN = /\Aenvoy\.listener\.(\d+\.\d+\.\d+.\d+_\d+)./
-  def convert_listener(line)
-    if line.match(LISTENER_PATTERN)
-      listener = Regexp.last_match(1)
-      [
-        line.gsub(LISTENER_PATTERN, 'envoy.listener.'),
-        ",listener:#{listener}"
-      ].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)
-logger.level = ENV['LOG_LEVEL'] || 'info'
-
-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.debug("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.debug("write #{b.bytesize} bytes")
-      logger.debug(b)
-    end
-    s.close
-  end
-end