mkit 0.4.1 → 0.4.3

data/bin/mkitd

@@ -10,23 +10,21 @@ def up
   require 'sinatra/base'
   require 'mkit'
   # defaults
-  PARAMS_CONFIG[:bind] ||= "localhost"
+  PARAMS_CONFIG[:bind] ||= 'localhost'
   PARAMS_CONFIG[:port] ||= 4567
-  #
   MKIt.startup(options: PARAMS_CONFIG)
 
   use Rack::MethodOverride
   use ServicesController
   use MkitJobsController
+  use MkitController
 
   # sinatra::base ignores in parameters
   # set it here or via configure...
-  Sinatra::Application.run!({port: PARAMS_CONFIG[:port], bind: PARAMS_CONFIG[:bind] })
+  Sinatra::Application.run!({ port: PARAMS_CONFIG[:port], bind: PARAMS_CONFIG[:bind] })
   # MKIt::Server.run
 end
 
-
-#
 if ARGV.any?
   require 'optparse'
   parser = OptionParser.new do |op|
@@ -52,4 +50,3 @@ if ARGV.any?
 end
 
 up
-

data/config/mkit_config.yml

@@ -4,11 +4,11 @@ mkit:
   haproxy:
     config_dir: /etc/haproxy/haproxy.d
     ctrl:
-      start:   /etc/init.d/haproxy start
-      stop:    /etc/init.d/haproxy stop
-      reload:  /etc/init.d/haproxy restart
-      restart: /etc/init.d/haproxy restart
-      status:  /etc/init.d/haproxy status
+      start:   systemctl start   haproxy
+      stop:    systemctl stop    haproxy
+      reload:  systemctl reload  haproxy
+      restart: systemctl restart haproxy
+      status:  systemctl status  haproxy
       bin: /usr/sbin/haproxy
   database:
     env: development

data/db/migrate/001_setup.rb

@@ -1,5 +1,6 @@
-class Setup < ActiveRecord::Migration[5.1]
+# frozen_string_literal: true
 
+class Setup < ActiveRecord::Migration[5.1]
   def up
     create_table :services do |t|
       t.string :name
@@ -16,7 +17,7 @@ class Setup < ActiveRecord::Migration[5.1]
       t.timestamp :updated_at
     end
 
-    add_index "services", ["name"], :name => "services_name_id"
+    add_index 'services', ['name'], name: 'services_name_id'
 
     create_table :service_configs do |t|
       t.string :service_id
@@ -82,10 +83,10 @@ class Setup < ActiveRecord::Migration[5.1]
     end
 
     # mkit configs
-    # e.g. 
+    # e.g.
     #   default network pool
     #   rabbitmq address
-    #   haproxy 
+    #   haproxy
     #     config.d path
     #     reload command - pq quero usar o daemontools
     #     stop
@@ -102,4 +103,3 @@ class Setup < ActiveRecord::Migration[5.1]
     drop_table :services
   end
 end
-

data/db/migrate/002_mkit_jobs.rb

@@ -1,5 +1,6 @@
-class MkitJobs < ActiveRecord::Migration[5.1]
+# frozen_string_literal: true
 
+class MkitJobs < ActiveRecord::Migration[5.1]
   def up
     create_table :mkit_jobs do |t|
       t.string :topic
@@ -12,6 +13,4 @@ class MkitJobs < ActiveRecord::Migration[5.1]
       t.timestamp :updated_at
     end
   end
-
 end
-

data/db/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,98 +13,97 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema[7.0].define(version: 2) do
-  create_table "dns_hosts", force: :cascade do |t|
-    t.string "service_id"
-    t.string "pod_id"
-    t.string "name"
-    t.string "ip"
-    t.string "ipv6"
+  create_table 'dns_hosts', force: :cascade do |t|
+    t.string 'service_id'
+    t.string 'pod_id'
+    t.string 'name'
+    t.string 'ip'
+    t.string 'ipv6'
   end
 
-  create_table "leases", force: :cascade do |t|
-    t.string "pool_id"
-    t.string "service_id"
-    t.string "interface_name"
-    t.string "interface_type"
-    t.string "status"
-    t.string "ip"
-    t.datetime "expires_at", precision: nil
+  create_table 'leases', force: :cascade do |t|
+    t.string 'pool_id'
+    t.string 'service_id'
+    t.string 'interface_name'
+    t.string 'interface_type'
+    t.string 'status'
+    t.string 'ip'
+    t.datetime 'expires_at', precision: nil
   end
 
-  create_table "mkit_jobs", force: :cascade do |t|
-    t.string "topic"
-    t.string "service_id"
-    t.string "pod_id"
-    t.string "status"
-    t.string "retries"
-    t.string "payload"
-    t.datetime "created_at", precision: nil
-    t.datetime "updated_at", precision: nil
+  create_table 'mkit_jobs', force: :cascade do |t|
+    t.string 'topic'
+    t.string 'service_id'
+    t.string 'pod_id'
+    t.string 'status'
+    t.string 'retries'
+    t.string 'payload'
+    t.datetime 'created_at', precision: nil
+    t.datetime 'updated_at', precision: nil
   end
 
-  create_table "pods", force: :cascade do |t|
-    t.string "service_id"
-    t.string "pod_id"
-    t.string "name"
-    t.string "ip"
-    t.string "image"
-    t.string "status"
+  create_table 'pods', force: :cascade do |t|
+    t.string 'service_id'
+    t.string 'pod_id'
+    t.string 'name'
+    t.string 'ip'
+    t.string 'image'
+    t.string 'status'
   end
 
-  create_table "pools", force: :cascade do |t|
-    t.string "name"
-    t.string "ip"
-    t.string "range"
-    t.string "netmask"
-    t.string "status"
-    t.boolean "preferred", default: false
+  create_table 'pools', force: :cascade do |t|
+    t.string 'name'
+    t.string 'ip'
+    t.string 'range'
+    t.string 'netmask'
+    t.string 'status'
+    t.boolean 'preferred', default: false
   end
 
-  create_table "service_configs", force: :cascade do |t|
-    t.string "service_id"
-    t.string "key"
-    t.string "value"
-    t.string "ctype"
-    t.string "version"
+  create_table 'service_configs', force: :cascade do |t|
+    t.string 'service_id'
+    t.string 'key'
+    t.string 'value'
+    t.string 'ctype'
+    t.string 'version'
   end
 
-  create_table "service_ports", force: :cascade do |t|
-    t.string "service_id"
-    t.string "internal_port"
-    t.string "external_port"
-    t.string "mode"
-    t.string "load_bal"
-    t.string "version"
+  create_table 'service_ports', force: :cascade do |t|
+    t.string 'service_id'
+    t.string 'internal_port'
+    t.string 'external_port'
+    t.string 'mode'
+    t.string 'load_bal'
+    t.string 'version'
   end
 
-  create_table "services", force: :cascade do |t|
-    t.string "name"
-    t.string "image"
-    t.string "qdm"
-    t.string "command"
-    t.integer "max_replicas", default: 1
-    t.integer "min_replicas", default: 1
-    t.string "lease_id"
-    t.string "pods_network", default: "mkit"
-    t.string "version"
-    t.string "status"
-    t.datetime "created_at", precision: nil, default: "2023-12-28 12:41:59"
-    t.datetime "updated_at", precision: nil
-    t.index ["name"], name: "services_name_id"
+  create_table 'services', force: :cascade do |t|
+    t.string 'name'
+    t.string 'image'
+    t.string 'qdm'
+    t.string 'command'
+    t.integer 'max_replicas', default: 1
+    t.integer 'min_replicas', default: 1
+    t.string 'lease_id'
+    t.string 'pods_network', default: 'mkit'
+    t.string 'version'
+    t.string 'status'
+    t.datetime 'created_at', precision: nil, default: '2023-12-28 12:41:59'
+    t.datetime 'updated_at', precision: nil
+    t.index ['name'], name: 'services_name_id'
   end
 
-  create_table "settings", force: :cascade do |t|
-    t.string "key"
-    t.string "value"
+  create_table 'settings', force: :cascade do |t|
+    t.string 'key'
+    t.string 'value'
   end
 
-  create_table "volumes", force: :cascade do |t|
-    t.string "service_id"
-    t.string "name"
-    t.string "path"
-    t.string "ctype"
-    t.string "status"
-    t.string "version"
+  create_table 'volumes', force: :cascade do |t|
+    t.string 'service_id'
+    t.string 'name'
+    t.string 'path'
+    t.string 'ctype'
+    t.string 'status'
+    t.string 'version'
   end
-
 end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'mkit/version'
+
+class MkitController < MKIt::Server
+  get '/mkit/version' do
+    "MKIt version #{MKIt::VERSION}\n"
+  end
+
+  put '/mkit/proxy/restart' do
+    MKIt::HAProxy.restart
+  end
+
+  put '/mkit/proxy/start' do
+    MKIt::HAProxy.start
+  end
+
+  put '/mkit/proxy/stop' do
+    MKIt::HAProxy.stop
+  end
+
+  get '/mkit/proxy/status' do
+    MKIt::HAProxy.status
+  end
+end

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

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'mkit/app/model/mkit_job'
 
 class MkitJobsController < MKIt::Server
-
   # curl localhost:4567/mkitjobs
   get '/mkitjobs' do
     JSON.pretty_generate(JSON.parse(MkitJob.all.to_json))
@@ -24,14 +25,12 @@ class MkitJobsController < MKIt::Server
   end
 
   post '/mkitjobs' do
-    xx = "no file"
+    xx = 'no file'
     if params[:file]
       tempfile = params[:file][:tempfile]
-      xx= YAML.load(tempfile.read)
+      xx = YAML.safe_load(tempfile.read)
       puts xx
     end
     JSON.pretty_generate(JSON.parse(xx.to_json))
   end
-
 end
-

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

@@ -1,5 +1,6 @@
-class PodsController < MKIt::Server
+# frozen_string_literal: true
 
+class PodsController < MKIt::Server
   get '/services/:service_id/pods' do
     "Not implemented\n"
   end
@@ -17,14 +18,12 @@ class PodsController < MKIt::Server
   end
 
   post '/services/:service_id/pods' do
-    xx = "no file"
+    xx = 'no file'
     if params[:file]
       tempfile = params[:file][:tempfile]
-      xx= YAML.load(tempfile.read)
+      xx = YAML.safe_load(tempfile.read)
       puts xx
     end
     JSON.pretty_generate(JSON.parse(xx.to_json))
   end
-
 end
-

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mkit/app/model/service'
 require 'mkit/app/helpers/services_helper'
 
@@ -6,11 +8,8 @@ class ServicesController < MKIt::Server
 
   # curl localhost:4567/services
   get '/services' do
-    if params[:verbose]
-      verbose = params[:verbose] == 'true'
-    else
-      verbose = false
-    end
+    verbose = params[:verbose] == 'true'
+
     if params[:id]
       redirect "/services/#{params[:id]}"
     elsif params[:name]
@@ -24,20 +23,25 @@ class ServicesController < MKIt::Server
 
   get '/services/:id' do
     srv = find_by_id_or_name
-    if request.env['CONTENT_TYPE'] == 'application/json'
-      resp = srv.to_json
-    else
-      resp = format_response(srv)
-    end
+    resp = if request.env['CONTENT_TYPE'] == 'application/json'
+             srv.to_json
+           else
+             format_response(srv)
+           end
     resp
   end
 
+  get '/services/:id/logs' do
+    srv = find_by_id_or_name
+    srv.log
+  end
+
   # curl -X PUT localhost:4567/services/1  -F "file=@mkit/samples/mkit.yml"
   put '/services/:id' do
     srv = find_by_id_or_name
     if params[:file]
       tempfile = params[:file][:tempfile]
-      yaml = YAML.load(tempfile.read)
+      yaml = YAML.safe_load(tempfile.read)
       srv.update!(yaml.to_o)
     end
     format_response(srv)
@@ -52,10 +56,10 @@ class ServicesController < MKIt::Server
 
   # curl -X POST localhost:4567/services  -F "file=@mkit/samples/mkit.yml"
   post '/services' do
-    srv = "no file"
+    srv = 'no file'
     if params[:file]
       tempfile = params[:file][:tempfile]
-      yaml = YAML.load(tempfile.read)
+      yaml = YAML.safe_load(tempfile.read)
       srv = Service.create(yaml.to_o)
     end
     format_response(srv)
@@ -77,4 +81,11 @@ class ServicesController < MKIt::Server
     MkitJob.publish(topic: :stop_service, service_id: srv.id)
     format_response(srv)
   end
+
+  put '/services/:id/restart' do
+    srv = find_by_id_or_name
+    MkitJob.publish(topic: :stop_service, service_id: srv.id)
+    MkitJob.publish(topic: :start_service, service_id: srv.id)
+    format_response(srv)
+  end
 end

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

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'mkit/cmd_runner'
 
 module MKIt
   module DockerHelper
-
     # from ERB template
     def create_instance(cmd)
       MKIt::CmdRunner.run(cmd)
@@ -22,7 +23,7 @@ module MKIt
 
     def inspect_instance(instance_id)
       # this one does not work on ubunto MKIt::CmdRunner.run("docker inspect #{instance_id}")
-      x = %x{docker inspect #{instance_id}}
+      x = `docker inspect #{instance_id}`
       JSON.parse(x).first
     end
 
@@ -30,6 +31,13 @@ module MKIt
       MKIt::CmdRunner.run("docker exec -it #{instance_id} #{cmd}")
     end
 
+    #
+    # logs
+    #
+    def logs(instance_id)
+      `docker logs -n 20 #{instance_id}`
+    end
+
     #
     # network
     #
@@ -39,7 +47,7 @@ module MKIt
     end
 
     def network_exists?(network_name)
-      x = MKIt::CmdRunner.run("docker network ls")
+      x = MKIt::CmdRunner.run('docker network ls')
       x.match(/\b#{network_name}\b/)
     end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mkit/utils'
 
 module MKIt
@@ -6,9 +8,9 @@ module MKIt
       root = MKIt::Utils.root
       File.read("#{root}/lib/mkit/app/templates/#{template}.erb")
     end
-  
+
     def parse_template(template, data = {})
-       ERB.new(read_template(template)).result_with_hash(data)
+      ERB.new(read_template(template)).result_with_hash(data)
     end
 
     def parse_model(template)

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

@@ -1,54 +1,32 @@
+# frozen_string_literal: true
+
+require 'text-table'
 module MKIt
   module ServicesHelper
-    def str_template
-      "%-5s   %-18s   %-15s  %-25s  %-10s"
-    end
-
-    def header_template
-      ["id", "name", "addr", "ports", "status"]
-    end
-
-    def _format(template, data)
-      template % data
-    end
-
-    def format_response(data, verbose = false)
-      resp = []
-      header = _format(str_template, header_template)
-      resp << header
-      if data.respond_to?"each"
-        data.each { | srv |
-          ports = srv.service_port&.each.map { |p| "#{p.mode}/#{p.external_port}"}.join(",")
-          resp << _format(str_template, [srv.id, srv.name, srv.lease&.ip, ports, srv.status])
-          resp+=service_pods(srv) if verbose
-        }
+    def format_response(data, _verbose = false)
+      table = Text::Table.new
+      table.head = %w[id name addr ports pods status]
+      if data.respond_to? 'each'
+        data.each do |srv|
+          table.rows << build_table_row(srv)
+        end
       else
-        ports = data.service_port&.each.map { |p| "#{p.mode}/#{p.external_port}"}.join(",")
-        resp << _format(str_template, [data.id, data.name, data.lease&.ip, ports, data.status])
-        resp+=service_pods(data)
+        table.rows << build_table_row(data)
       end
-      resp << ""
-      resp.join("\n")
-    end
-
-    def service_pods(srv)
-      resp=[]
-      resp << "  pods"
-      resp << _format("    %-5s   %-15s   %-15s   %-15s   %-10s", ["id", "pod_id", "pod_name", "pod_ip", "status"])
-      srv.pod.each { |pod|
-        name = pod.name.nil? ? "" : pod.name[0..11]
-        pod_id = pod.pod_id.nil? ? "" : pod.pod_id[0..11]
-        resp << _format("    %-5s   %-15s   %-15s   %-15s   %-10s", [pod.id, pod_id, name, pod.ip, pod.status])
-      }
-      resp
+      table.to_s
     end
 
     def find_by_id_or_name
       srv = Service.find_by_id(params[:id])
-      srv = Service.find_by_name(params[:id]) unless srv
+      srv ||= Service.find_by_name(params[:id])
       error 404, "Couldn't find Service '#{params[:id]}'\n" unless srv
       srv
     end
 
+    def build_table_row(data)
+      ports = data.service_port&.each.map { |p| "#{p.mode}/#{p.external_port}" }.join(',')
+      pods = data.pod.each.map { |p| p.name.to_s }.join(' ')
+      [data.id, data.name, data.lease&.ip, ports, pods, data.status]
+    end
   end
 end

data/lib/mkit/app/mkit_server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mkit/exceptions'
 
 module MKIt

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

@@ -131,7 +131,7 @@ class Service < ActiveRecord::Base
   end
 
   def create_pods_network
-    create_network(self.pods_network) if !network_exists?(self.pods_network)
+    create_network(self.pods_network) unless network_exists?(self.pods_network)
   end
 
   def deploy_network
@@ -237,6 +237,15 @@ class Service < ActiveRecord::Base
     }
   end
 
+  def log
+    out = ""
+    self.pod.each { |p|
+      out << "<<<< %s | %s >>>>\n" % [self.name, p.name]
+      puts logs(p.name)
+      out << logs(p.name)
+    }
+    out
+  end
   def as_json(options = {})
     srv = super
     a=[:pod, :volume, :service_config, :service_port]

data/lib/mkit/version.rb

@@ -1,4 +1,4 @@
 module MKIt
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end