mkit 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa9363526eb6b57ea708a370424cfa71ede7d50f7d91d0d8700e1170f3af5930
-  data.tar.gz: 9c50d7cd862d5573b986f4c3231f76769ab4e5f930839c821232acd0bedf2923
+  metadata.gz: 5c7293226251f8d031a6b864f4ef7e9932a6046be6a7e78e07e203b1d9e4ff9a
+  data.tar.gz: 8a4993da20b730eb02f3f0605e257d255348861f84c3b8412e7b46b94316886c
 SHA512:
-  metadata.gz: 4c30c9847cdada9bbc87c059b1824430462e29d169498144d7e690d5848e30db29aee6008da4b09a59038355d20ee28688fce7a45d018f76b4afeee82ef3e660
-  data.tar.gz: 770e96f7cb6be72e5c0442c51b2f0229ccdb53a6611c8569a58fe370ec1f405a5d7cadd77a22dae8de1075f9202467a79b26c736f158fb661b5b50dd68aa6c66
+  metadata.gz: bdd7a977df1915b70778fb7626836d0718563efc523cd128c2ee797ace0da1cb4c0f20e6b9dc2667bc1cfb03ec8efd0447b891a3a62179af68c01e6418c1d2de
+  data.tar.gz: e2783cd197695782478e29c075343a2bd6a1d5b84f5fe9d97ac7701a9329b1d26f874ab50a4493f85c629cbf2f3f2cf2761223700806d7c7adc322138e0d6cdc

data/README.md

@@ -191,6 +191,7 @@ stop         stop service
 restart      restart service
 create       create new service
 update       update service
+get          print service configuration
 rm           remove service
 exec         execute a command in a running pod
 logs         view service logs

data/lib/mkit/app/controllers/services_controller.rb

@@ -27,8 +27,10 @@ class ServicesController < MKIt::Server
 
   get '/services/:id' do
     srv = find_by_id_or_name
-    resp = if request.env['CONTENT_TYPE'] == 'application/json'
-             srv.to_json
+    resp = if params[:format] == 'yaml'
+             srv.to_h({details: params[:details] == 'true'}).to_yaml
+           elsif params[:format] == 'json'
+             JSON.pretty_generate(srv.to_h({details: params[:details] == 'true'}))
            else
              format_response(srv)
            end
@@ -41,12 +43,14 @@ class ServicesController < MKIt::Server
       srv.log
     else
       pod = find_srv_pod_by_id_or_name(srv)
-      options_parameter = build_options_hash(params: params, options: [:nr_lines, :pods, :follow])
+      options_parameter = build_options_hash(params: params, options: [
+        :nr_lines, :pods, :follow, :details, :timestamps, :clear
+      ])
       request.websocket do |ws|
         listener = nil
         ws.onopen do
           settings.sockets << ws
-          ws.send("<<<< %s | %s >>>>\n" % [srv.name, srv.pod.first.name])
+          ws.send("<<<< %s | %s >>>>\n" % [srv.name, pod.name])
           listener = MKIt::DockerLogListener.new(pod, ws, options: options_parameter)
           settings.listeners << listener
           listener.register

data/lib/mkit/app/helpers/docker_helper.rb

@@ -38,6 +38,14 @@ module MKIt
       `docker logs -n 20 #{instance_id}`
     end
 
+    def logfile(instance_id)
+      `docker inspect --format='{{.LogPath}}' #{instance_id}`
+    end
+
+    def clear_logs(instance_id)
+      `echo > #{logfile(instance_id)}`
+    end
+
     #
     # network
     #

data/lib/mkit/app/helpers/services_helper.rb

@@ -26,10 +26,10 @@ module MKIt
     def find_srv_pod_by_id_or_name(srv)
       if params[:pod_id]
         pod = srv.find_pod_by_id_or_name(params[:pod_id])
-        error 404, "Service pod not found." unless pod
       else
         pod = srv.pod.first
       end
+      error 404, "Service pod not found." unless pod
       pod
     end
 

data/lib/mkit/app/model/pod.rb

@@ -40,7 +40,7 @@ class Pod < ActiveRecord::Base
   end
 
   def set_status_from_docker
-    if self.instance
+    if !self.instance.nil?
       if instance.State.Running
         self.status = MKIt::Status::RUNNING
       else
@@ -85,5 +85,14 @@ class Pod < ActiveRecord::Base
     end
     MkitJob.publish(topic: :pod_destroyed, service_id: self.service.id, data: {pod_id: self.id})
   end
+
+  def to_h
+    {
+      'name' => self.name,
+      'ip' => self.dns_host.nil? || self.dns_host.ip.nil? ? self.ip : self.dns_host.ip,
+      'dns' => self.dns_host.nil? || self.dns_host.name.nil? ? self.ip : self.dns_host.name,
+      'status' => self.status
+    }
+  end
 end
 

data/lib/mkit/app/model/service.rb

@@ -250,6 +250,55 @@ class Service < ActiveRecord::Base
     }
     out
   end
+  def to_h(options = {})
+    details = options[:details] || false
+    yaml = {}
+    yaml['service'] = {}
+    srv = yaml['service']
+    srv['name'] = self.name
+    srv['image'] = self.image
+    srv['command'] = self.command
+    srv['network'] = self.pods_network
+    if details
+      srv['status'] = self.status
+      srv['version'] = self.version
+      srv['ip'] = self.lease.ip
+      srv['dns'] = self.dns_host.name
+      srv['pods'] = []
+      self.pod.each { |p|
+        srv['pods'] << p.to_h
+      }
+    end
+    srv['ports'] = []
+    self.service_port.each { |p|
+      "#{p.external_port}:#{p.internal_port}:#{p.mode}:#{p.load_bal}".tap { |x|
+        if p.ssl == 'true'
+          x << ':ssl'
+          if !p.crt.nil? && p.crt != MKIt::Utils.proxy_cert
+            x << ":#{p.crt}"
+          end
+        end
+        srv['ports'] << x
+      }
+    }
+    srv['resources'] = {}
+    srv['resources']['min_replicas'] = self.min_replicas
+    srv['resources']['max_replicas'] = self.max_replicas
+    srv['volumes'] = []
+    self.volume.each { |v|
+      if v.ctype ==  MKIt::CType::DOCKER_STORAGE.to_s
+        srv['volumes'] << "docker://#{v.name}:#{v.path}"
+      elsif v.ctype ==  MKIt::CType::LOCAL_STORAGE.to_s
+        srv['volumes'] << "#{v.name}:#{v.path}"
+      end
+    }
+    srv['environment'] = {}
+    self.service_config.each { |c|
+      srv['environment'][c.key] = "#{c.value}"
+    }
+    yaml
+  end
+
   def as_json(options = {})
     srv = super
     a=[:pod, :volume, :service_config, :service_port]

data/lib/mkit/client/command_parser.rb

@@ -56,6 +56,8 @@ class CommandParser
     end
     raise InvalidParametersException.new('Invalid command or parameters.', c) if request.nil?
 
+    fill_request_defaults(request, request_data)
+
     validate_command(command, request_data)
     # 
     {
@@ -65,6 +67,18 @@ class CommandParser
     }
   end
 
+  def fill_request_defaults(request, request_data)
+    if !request.nil? && !request[:defaults].nil?
+      request[:defaults].each do |key, value|
+        request[:params] ||= []
+        unless request[:params].include?(key.to_sym)
+          request[:params] << key.to_sym
+          request_data[key.to_sym] = value
+        end
+      end
+    end
+  end
+
   # args = command[:args]
   # argv = ARGV.dup - cmd
   # request = command[:request]
@@ -84,7 +98,8 @@ class CommandParser
     if vararg
       request_data[vararg[:name].to_sym] = varargs
       request[:params] ||= []
-      request[:params] << ["#{vararg[:name].to_sym}",  varargs ]
+      request[:params] << vararg[:name].to_sym unless request[:params].include?(vararg[:name].to_sym)
+      request_data[vararg[:name].to_sym] = varargs
     end
 
     # flag and options
@@ -146,7 +161,7 @@ class CommandParser
     request[:uri] = request[:uri] + arg[:uri] unless arg[:uri].nil?
     unless arg[:param].nil?
       request[:params] ||= []
-      request[:params] << %W[#{arg[:name]} #{arg[:param]}]
+      request[:params] << arg[:name].to_sym unless request[:params].include?(arg[:name].to_sym)
     end
   end
 

data/lib/mkit/client/commands.yaml

@@ -95,6 +95,57 @@
   request:
     verb: put
     uri: "/services/<%=id%>"
+- cmd: get
+  request:
+    verb: get
+    uri: "/services/<%=id%>"
+    defaults:
+      format: yaml
+  usage:
+    - "<service_id_or_name> [options]"
+  help: print service configuration
+  args:
+    - name: id
+      help:
+        - id
+        - Service id or name
+      mandatory: true
+    - name: format
+      help:
+        - -y
+        - ...as yaml format (default)
+      mandatory: false
+      param: "yaml"
+      type: flag
+      switch:
+        - "-y"
+    - name: format
+      help:
+        - -j
+        - ...as json format
+      mandatory: false
+      param: "json"
+      type: flag
+      switch:
+        - "-j"
+    - name: format
+      help:
+        - -t
+        - ...as table format (i.e. status format)
+      mandatory: false
+      param: "table"
+      type: flag
+      switch:
+        - "-t"
+    - name: details
+      help:
+        - -d
+        - include service dynamic details
+      mandatory: false
+      param: "<%=true%>"
+      type: flag
+      switch:
+        - "-d"
 - cmd: rm
   usage:
     - "<service_id_or_name>"
@@ -194,6 +245,25 @@
       type: option
       switch:
         - "-n"
+    - name: timestamps
+      help:
+        - -t
+        - Show timestamps
+      mandatory: false
+      param: "<%=true%>"
+      type: flag
+      switch:
+        - "-t"
+        - "--timestamps"
+    - name: details
+      help:
+        - -d
+        - Show extra details
+      mandatory: false
+      param: "<%=true%>"
+      type: flag
+      switch:
+        - "-d"
 - cmd: version
   help: prints mkit client and server version
   request:

data/lib/mkit/client/console_websocket_client.rb

@@ -17,7 +17,7 @@ module MKIt
         ws = Faye::WebSocket::Client.new(@uri, nil, @options)
 
         ws.on :open do |_event|
-          puts "Connected to WebSocket server"
+          puts "Connected to remote server"
           puts "\r\n"
         end
 

data/lib/mkit/client/http_client.rb

@@ -38,15 +38,17 @@ module MKIt
       @client.request(req)
     end
 
-    def request(request, request_data = nil)
+    def request(request, request_data = {})
       req = nil
       uri = request[:uri]
       request[:file] = request_data[:file]
 
       unless request[:params].nil? || request[:params].empty?
-        uri = uri + '?' + request[:params].map { |k, v| "#{k}=#{v}" }.join('&')
+        uri = uri + '?' + request[:params].map { |k| "#{k}=#{request_data[k]}" }.join('&')
       end
       uri = ERB.new(uri).result_with_hash(request_data)
+      # puts "Request URI: #{uri}"
+
       case request[:verb].to_sym
       when :post
         req = Net::HTTP::Post.new(uri)

data/lib/mkit/client/log_websocket_client.rb

@@ -21,7 +21,7 @@ module MKIt
         ws = Faye::WebSocket::Client.new(@uri, nil, @options)
 
         ws.on :open do |_event|
-          puts "Connected to WebSocket server"
+          puts "Connected to remote server"
           puts "\r\n"
         end
 

data/lib/mkit/client/websocket_client.rb

@@ -23,7 +23,7 @@ module MKIt
     def request(request, request_data)
       uri = request[:uri]
       unless request[:params].nil? || request[:params].empty?
-        uri = uri + '?' + request[:params].map { |k, v| "#{k}=#{v}" }.join('&')
+        uri = uri + '?' + request[:params].map { |k| "#{k}=#{request_data[k]}" }.join('&')
       end
       uri = ERB.new("#{@ws_url}#{uri}").result_with_hash(request_data)
 

data/lib/mkit/pods/docker_log_listener.rb

@@ -1,15 +1,25 @@
 require "mkit/cmd/shell_client"
+require "mkit/app/helpers/docker_helper"
 
 module MKIt
   class DockerLogListener < MKIt::ShellClient
 
+    include DockerHelper
+
     def initialize(pod, ws, options: {})
+      if options[:clear]
+        clear_logs(pod.name)
+      end
       @pod = pod
       @ws = ws
       command = "docker logs"
       command += " -f" if options[:follow] == 'true'
       command += " -n #{options[:nr_lines]}" if options[:nr_lines]
       command += " -n 10" unless options[:nr_lines]
+      command += " -t" if options[:timestamps] == 'true'
+      command += " --since #{options[:since]}" if options[:since]
+      command += " --until #{options[:until]}" if options[:until]
+      command += " --details" if options[:details] == 'true'
       command += " #{@pod.name}"
       super(command: command)
     end

data/lib/mkit/version.rb

@@ -1,4 +1,4 @@
 module MKIt
-  VERSION = "0.8.0"
+  VERSION = "0.9.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkit
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Vasco Santos
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 2025-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-dns
@@ -452,13 +452,12 @@ files:
 - samples/apps/redis.yml
 - samples/daemontools/log/run
 - samples/daemontools/run
-- samples/soketi.yaml
 - samples/systemd/mkitd.service
 homepage: https://github.com/valexsantos/mkit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -473,8 +472,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Micro Kubernets on Ruby
 test_files: []

data/samples/soketi.yaml

@@ -1,32 +0,0 @@
-service:
-  name: soketi
-  image: quay.io/soketi/soketi:0.17-16-alpine
-#  image: giovannedev/soketi:latest
-  ports:
-    #- 80:6001:http:round_robin
-    - 6001:6001:tcp:round_robin
-    - 6002:6001:tcp:round_robin:ssl
-    - 9601:9601:tcp:round_robin
-  resources:
-    max_replicas: 1
-    min_replicas: 1
-  environment:
-    SOKETI_PORT: 6001
-    SOKETI_METRICS_SERVER_PORT: 9601
-    SOKETI_DEBUG: 1
-    SOKETI_MODE: full
-    SOKETI_APP_ID: app-id
-    SOKETI_APP_KEY: app-key
-    SOKETI_APP_SECRET: app-secret
-    # PUSHER_HOST: 127.0.0.1
-    # PUSHER_PORT: 6001
-    # PUSHER_SCHEME: http # or https
-    SOKETI_PORT: 6001
-    SOKETI_SCHEME: http # or https
-    METRICS_SERVER_PORT: 9601
-    SOKETI_DEFAULT_APP_ENABLED: true
-    SOKETI_DEFAULT_APP_ENABLE_CLIENT_MESSAGES: true
-    DEFAULT_APP_ENABLE_CLIENT_MESSAGES: true
-    #SOKETI_DB_REDIS_HOST: redis
-    #SOKETI_DB_REDIS_PORT: 6379
-    #SOKETI_DB_REDIS_PASSWORD: password