prometheus-splash 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4ea7ed10be999a00e43e04651616be5db143bbc0d85c11a1ca7126ad68aa33
-  data.tar.gz: dd66e18d9c1633033142b94852f3af61b066dd3dbc80de451f733b379e797203
+  metadata.gz: d510e4761e365c1ee36881fb1a3a4a99a7dbe7965958841497cdcaaadfb0c1b3
+  data.tar.gz: 4f01f486135696ef0142d42362379e59868b1265ce367b3e3aac9853fcc48336
 SHA512:
-  metadata.gz: d923826528d62549cf890121e20474d13e5b88e1d8da3e8bf3136ef3232dd4a92b0bf11a6b4d07817786f192dc7e50e6f018d0611e544fafd906d7b7f8e9f79d
-  data.tar.gz: 3fec4f6263749824d308f1bbbeabf7dbd7ab5bef5f025ec921f0cef0f2ebd0b32584a117550091344b26dcf257cf0ed10fb7d6dbfd887ff8502468595d5ca578
+  metadata.gz: 8b5c84b54b2098f9b027408ab8419fb19964feb1056607d090802acc793c2ccd6a9b98c1c8c2ca91334ccc8a36de88c1bf6cd674b6f5ef9df33a40debbfe84f5
+  data.tar.gz: 1d93b819d8a9592495271a24bdc3e69e63a15489f5885faa729a8e42428a68dada73748ea8440c1338625a36c89d84a260e3bc9cdafa8fb869747864edc001f4

data/CHANGELOG.md

@@ -12,14 +12,14 @@
 * adding \n for LONGDESC Thor #14
 * Doc for command name format in YAML #2
 
-### CHANGE :
+### CHANGES :
 
 * RabbitMQ Credentials and vhosts support #16
 * backend hardening #18
 * remote show with --hostname #12
 
 
-### FEATURE :
+### FEATURES :
 
 * CLI colors and logger CLI /dual #8
 * Log for splash daemon #6
@@ -63,3 +63,21 @@
 ### FIX :
 
 * RabbitMQ Exception catching + refacto connection #31  
+
+
+## V 0.5.0 2020/04/17
+
+### FIX
+
+* auto setup root check without /etc/splash.yml #34
+* empty hostname with --hostname #27
+* foreground execution control #24
+* root required for file backend with command last and get #36
+
+### FEATURES
+
+* command treeview with --hostname #28
+* log horodating with PID #35
+* quiet mode + no-colors and no-emoji #5
+* correlation id in log for daemon #15
+* systemd Splashd service installation #32

data/bin/splash

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby 
+#!/usr/bin/env ruby
 # coding: utf-8
 
 require 'splash/dependencies'
@@ -14,11 +14,16 @@ include Splash::Loggers
 include Splash::Config
 
 unless verify_file(name: CONFIG_FILE, mode: "644", owner: user_root, group: group_root).empty? then
-  puts 'ERROR: Splash need reconfiguration : execution abort, '
-  puts ' => Restart after rebuild (recheck for homemade templates) :'
+  puts 'Splash need reconfiguration : Auto setup launch'
 
-  acase = run_as_root :setupsplash
-  splash_exit acase
+  if is_root? then
+    acase = setupsplash
+    splash_exit acase
+  else
+    puts 'ERROR : auto setup not start, because your not root, please run as root :'
+    puts '(sudo or rvmsudo) splash [conf setup]'
+    exit 50
+  end
 end
 
 CLI.start(ARGV)

data/lib/splash/cli/commands.rb

@@ -27,8 +27,10 @@ module CLISplash
     option :hostname, :type => :string
     def execute(name)
       log = get_logger
+      log.level = :fatal if options[:quiet]
       if is_root? then
         if options[:hostname] then
+          options[:hostname] = Socket.gethostname if options[:hostname] == 'hostname'
           splash_exit({ :case => :options_incompatibility, :more => '--hostname forbidden with delagate commands'}) if get_config.commands[name.to_sym][:delegate_to]
           log.info "Remote Splash configured commands on #{options[:hostname]}:"
           log.info "ctrl+c for interrupt"
@@ -49,13 +51,14 @@ module CLISplash
                                     payload: {:name => name},
                                     :return_to => "splash.#{Socket.gethostname}.returncli",
                                     :queue => "splash.#{options[:hostname]}.input" })
-                res[:more] = "Remote command : :execute_command Scheduled"
-                splash_exit res
               end
             end
           rescue Interrupt
             splash_exit case: :interrupt, more: "Remote command exection"
           end
+          log.receive "Command execute confirmation"
+          res[:more] = "Remote command : :execute_command Scheduled"
+          splash_exit res
         else
           command =  Splash::CommandWrapper::new(name)
           if options[:ack] then
@@ -80,11 +83,12 @@ module CLISplash
     WARNING : scheduling by CLI are not percisted, so use it only for specifics cases.\n
     NOTES : Scheduling, force trace, notifying and callback.
     LONGDESC
-    option :hostname, :type => :string
+    option :hostname, :type => :string, :default => Socket.gethostname
     option :at, :type => :string
     option :in, :type => :string
     def schedule(name)
       log = get_logger
+      log.level = :fatal if options[:quiet]
       hostname = (options[:hostname])? options[:hostname] : Socket.gethostname
       splash_exit({ :case => :options_incompatibility, :more => '--at or --in is required'}) unless options[:at] or options[:in]
       splash_exit({ :case => :options_incompatibility, :more => '--at an --in'}) if options[:at] and options[:in]
@@ -101,32 +105,61 @@ module CLISplash
                                   payload: {:name => name, :schedule => schedule},
                                   :return_to => "splash.#{Socket.gethostname}.returncli",
                                   :queue => "splash.#{hostname}.input" })
-          log.receive "Execute command sheduled confirmed"
-          res[:more] = "Remote command : :execute_command with schedule"
-          splash_exit res
         end
       rescue Interrupt
         splash_exit case: :interrupt, more: "Remote command exection"
       end
+      log.receive "Execute command sheduled confirmed"
+      res[:more] = "Remote command : :execute_command with schedule"
+      splash_exit res
 
     end
 
 
     desc "treeview", "Show commands sequence tree"
-    def treeview(command, depht = 0)
+    long_desc <<-LONGDESC
+    Show commands sequence tree\n
+    with --hostname, ask other Splash daemon via transport\n
+    LONGDESC
+    option :hostname, :type => :string
+    def treeview(command)
+      depht = 0
       log  = get_logger
-      log.info "Command : #{command.to_s}" if depht == 0
-      cmd  = get_config.commands[command.to_sym]
-      if cmd[:on_failure] then
-        spacer=  " " * depht + " "
-        log.flat "#{spacer}* on failure => #{cmd[:on_failure]}"
-        treeview(cmd[:on_failure], depht+2)
+      if options[:hostname] then
+        options[:hostname] = Socket.gethostname if options[:hostname] == 'hostname'
+        log.info "Remote Splash scheduling command on #{options[:hostname]}:"
+        log.info "ctrl+c for interrupt"
+        begin
+          transport = get_default_client
+          if transport.class == Hash  and transport.include? :case then
+            splash_exit transport
+          else
+            commands = transport.execute({ :verb => :list_commands,
+                                  :return_to => "splash.#{Socket.gethostname}.returncli",
+                                  :queue => "splash.#{options[:hostname]}.input" })
+          end
+        rescue Interrupt
+          splash_exit case: :interrupt, more: "Remote command exection"
+        end
+        log.receive "Receving list of commands from #{options[:hostname]}"
+      else
+        commands  = get_config.commands
       end
-      if cmd[:on_success] then
-        spacer = " " * depht + " "
-        log.flat "#{spacer}* on success => #{cmd[:on_success]}"
-        treeview(cmd[:on_success],depht+2)
+      log.info "Command : #{command.to_s}" if depht == 0
+      aproc = Proc::new do |command,depht|
+        cmd  = commands[command.to_sym]
+        if cmd[:on_failure] then
+          spacer=  " " * depht + " "
+          log.flat "#{spacer}* on failure => #{cmd[:on_failure]}"
+          aproc.call(cmd[:on_failure], depht+2)
+        end
+        if cmd[:on_success] then
+          spacer = " " * depht + " "
+          log.flat "#{spacer}* on success => #{cmd[:on_success]}"
+          aproc.call(cmd[:on_success],depht+2)
+        end
       end
+      aproc.call(command,depht)
     end
 
 
@@ -142,6 +175,7 @@ module CLISplash
       log = get_logger
       list = {}
       if options[:hostname] then
+        options[:hostname] = Socket.gethostname if options[:hostname] == 'hostname'
         log.info "Remote Splash configured commands on #{options[:hostname]}:"
         log.info  "ctrl+c for interrupt"
         begin
@@ -156,10 +190,11 @@ module CLISplash
         rescue Interrupt
           splash_exit case: :interrupt, more: "remote list Command"
         end
+        log.receive "Receving list of commands from #{options[:hostname]}"
       else
-        log.info "Splash configured commands :"
         list = get_config.commands
       end
+      log.info "Splash configured commands :"
       log.ko 'No configured commands found' if list.keys.empty?
       list.keys.each do |command|
         log.item "#{command.to_s}"
@@ -188,6 +223,7 @@ module CLISplash
       log = get_logger
       list = {}
       if options[:hostname] then
+        options[:hostname] = Socket.gethostname if options[:hostname] == 'hostname'
         log.info "Remote Splash configured commands on #{options[:hostname]}:"
         log.info "ctrl+c for interrupt"
         begin
@@ -202,6 +238,7 @@ module CLISplash
         rescue Interrupt
           splash_exit case: :interrupt, more: "remote list Command"
         end
+        log.receive "Receving list of commands from #{options[:hostname]}"
       else
         list = get_config.commands
       end
@@ -235,8 +272,10 @@ module CLISplash
       if not redis and options[:hostname] then
         splash_exit case: :specific_config_required, :more => "Redis backend is requiered for Remote execution report request"
       end
+      splash_exit case: :not_root if not is_root? and not redis
       list = get_config.commands.keys
       if options[:hostname] then
+        options[:hostname] = Socket.gethostname if options[:hostname] == 'hostname'
         list = backend.list("*", options[:hostname]).map(&:to_sym)
       end
       if list.include? command.to_sym then
@@ -274,6 +313,7 @@ module CLISplash
     option :detail, :type => :boolean
     def getreportlist
       log = get_logger
+      options[:hostname] = Socket.gethostname if options[:hostname] == 'hostname'
       if options[:hostname] and options[:all] then
         splash_exit case: :options_incompatibility, more: "--all, --hostname"
       end
@@ -282,6 +322,7 @@ module CLISplash
       if not redis and (options[:hostname] or options[:all]) then
         splash_exit case: :specific_config_required, more: "Redis Backend requiered for Remote execution report Request"
       end
+      splash_exit case: :not_root if not is_root? and not redis
       pattern = (options[:pattern])? options[:pattern] : '*'
       if options[:all] then
         res = backend.listall pattern

data/lib/splash/cli/config.rb

@@ -25,15 +25,22 @@ module CLISplash
       splash_exit acase
     end
 
-    desc "version", "display current Splash version"
+    desc "version", "Display current Splash version"
     def version
       log = get_logger
       config = get_config
       log.info "Splash version : #{config.version}, Author : #{config.author}"
-      log_info config.copyright
+      log.info config.copyright
       splash_exit case: :quiet_exit
     end
 
+    desc "service", "Install Splashd Systemd service"
+    def service
+      acase = run_as_root :addservice
+      splash_exit acase
+    end
+
+
   end
 
 end

data/lib/splash/cli/daemon.rb

@@ -19,17 +19,6 @@ module CLISplash
     LONGDESC
     desc "start", "Starting Splash Daemon"
     def start
-      log = get_logger
-      if options[:purge] then
-        transport = get_default_client
-        if transport.class == Hash  and transport.include? :case then
-          splash_exit transport
-        else
-          queue = "splash.#{Socket.gethostname}.input"
-          transport.purge queue: queue
-          log.info "Queue : #{queue} purged"
-        end
-      end
       acase = run_as_root :startdaemon, options
       splash_exit acase
     end
@@ -38,6 +27,7 @@ module CLISplash
     desc "purge", "Purge Transport Input queue of Daemon"
     def purge
       log = get_logger
+      log.level = :fatal if options[:quiet]
       transport = get_default_client
       if transport.class == Hash  and transport.include? :case then
         splash_exit transport

data/lib/splash/cli/logs.rb

@@ -40,9 +40,10 @@ module CLISplash
 
     desc "monitor", "monitor logs in config"
     def monitor
+      log = get_logger
+      log.level = :fatal if options[:quiet]
       result = Splash::LogScanner::new
       result.analyse
-      result.notify
       splash_exit result.notify
 
     end

data/lib/splash/cli.rb

@@ -6,6 +6,21 @@ class CLI < Thor
     true
   end
 
+
+  def initialize(*args)
+    super
+    log = get_logger
+    options[:colors.to_s]
+    log.emoji  = options[:emoji.to_s]
+    log.color  = options[:colors.to_s]
+  end
+
+  class_option :quiet, :desc => "Quiet mode, limit output to :fatal", :aliases => "-q", :type => :boolean
+  class_option :emoji, :desc => "Display Emoji", :type => :boolean, :default => true
+  class_option :colors, :desc => "Display colors", :type => :boolean, :default => true
+
+
+
   include CLISplash
   desc "commands SUBCOMMAND ...ARGS", "Managing commands/batchs supervision"
   subcommand "commands", Commands

data/lib/splash/commands.rb

@@ -37,18 +37,18 @@ module Splash
       @@metric_time.set(time)
       hostname = Socket.gethostname
       Prometheus::Client::Push.new(@name, hostname, @url).add(@@registry)
-      get_logger.ok "Prometheus Gateway notified."
       return { :case => :quiet_exit}
     end
 
 
     def call_and_notify(options)
       log = get_logger
+      session = (options[:session])? options[:session] : get_session
       acase = { :case => :quiet_exit }
       exit_code = 0
       if @config.commands[@name.to_sym][:delegate_to] then
         return { :case => :options_incompatibility, :more => '--hostname forbidden with delagate commands'} if options[:hostname]
-        log.send "Remote command : #{@name} execution delegate to : #{@config.commands[@name.to_sym][:delegate_to][:host]} as : #{@config.commands[@name.to_sym][:delegate_to][:remote_command]}"
+        log.send "Remote command : #{@name} execution delegate to : #{@config.commands[@name.to_sym][:delegate_to][:host]} as : #{@config.commands[@name.to_sym][:delegate_to][:remote_command]}", session
         begin
           transport = get_default_client
           if transport.class == Hash  and transport.include? :case then
@@ -59,18 +59,18 @@ module Splash
               :return_to => "splash.#{Socket.gethostname}.return",
               :queue => "splash.#{@config.commands[@name.to_sym][:delegate_to][:host]}.input" })
             exit_code = res[:exit_code]
-            log.receive "return with exitcode #{exit_code}"
+            log.receive "return with exitcode #{exit_code}", session
 
           end
         end
       else
-        log.info "Executing command : '#{@name}' "
+        log.info "Executing command : '#{@name}' ", session
         start = Time.now
         start_date = DateTime.now.to_s
         unless options[:trace] then
-          log.item "Traceless execution"
+          log.item "Traceless execution", session
           if @config.commands[@name.to_sym][:user] then
-            log.item "Execute with user : #{@config.commands[@name.to_sym][:user]}."
+            log.item "Execute with user : #{@config.commands[@name.to_sym][:user]}.", session
             system("sudo -u #{@config.commands[@name.to_sym][:user]} #{@config.commands[@name.to_sym][:command]} > /dev/null 2>&1")
           else
             system("#{@config.commands[@name.to_sym][:command]} > /dev/null 2>&1")
@@ -78,9 +78,9 @@ module Splash
           time = Time.now - start
           exit_code = $?.exitstatus
         else
-          log.item "Tracefull execution"
+          log.item "Tracefull execution", session
           if @config.commands[@name.to_sym][:user] then
-            log.item "Execute with user : #{@config.commands[@name.to_sym][:user]}."
+            log.item "Execute with user : #{@config.commands[@name.to_sym][:user]}.", session
             stdout, stderr, status = Open3.capture3("sudo -u #{@config.commands[@name.to_sym][:user]} #{@config.commands[@name.to_sym][:command]}")
           else
             stdout, stderr, status = Open3.capture3(@config.commands[@name.to_sym][:command])
@@ -101,15 +101,17 @@ module Splash
           data[:exec_time] = time.to_s
           backend = get_backend :execution_trace
           key = @name
+          
           backend.put key: key, value: data.to_yaml
           exit_code = status.exitstatus
         end
-        log.ok "Command executed"
-        log.arrow "exitcode #{exit_code}"
+        log.ok "Command executed", session
+        log.arrow "exitcode #{exit_code}", session
         if options[:notify] then
           acase = notify(exit_code,time.to_i)
+          get_logger.ok "Prometheus Gateway notified.",session
         else
-          log.item "Without Prometheus notification"
+          log.item "Without Prometheus notification", session
         end
       end
 
@@ -117,7 +119,7 @@ module Splash
         on_failure = (@config.commands[@name.to_sym][:on_failure])? @config.commands[@name.to_sym][:on_failure] : false
         on_success = (@config.commands[@name.to_sym][:on_success])? @config.commands[@name.to_sym][:on_success] : false
         if on_failure and exit_code > 0 then
-          log.item "On failure callback : #{on_failure}"
+          log.item "On failure callback : #{on_failure}", session
           if @config.commands.keys.include?  on_failure then
             @name = on_failure.to_s
             call_and_notify options
@@ -126,7 +128,7 @@ module Splash
           end
         end
         if on_success and exit_code == 0 then
-          log.item "On success callback : #{on_success}"
+          log.item "On success callback : #{on_success}", session
           if @config.commands.keys.include?  on_success then
             @name = on_success.to_s
             call_and_notify options
@@ -135,7 +137,7 @@ module Splash
           end
         end
       else
-        log.item "Without callbacks sequences"
+        log.item "Without callbacks sequences", session
       end
       acase[:exit_code] = exit_code
       return acase

data/lib/splash/config/service.rb

@@ -0,0 +1,26 @@
+# coding: utf-8
+
+
+module Splash
+  module ConfigUtilities
+    include Splash::Constants
+    include Splash::Helpers
+
+    def addservice(options = {})
+      local_service_file = search_file_in_gem "prometheus-splash", "templates/splashd.service"
+      config = get_config
+      self.extend Splash::Loggers
+      log = get_logger
+      log.info "Splashd Systemd Service installation"
+      service_file = "splashd.service"
+      systemd_path = "/etc/systemd/system"
+      return { :case => :options_incompatibility, :more => "Systemd not avaible on this System" } if verify_folder({ :name => systemd_path}) == [:inexistant]
+      log.item "Installing service file : #{service_file} in #{systemd_path}"
+      if install_file source: local_service_file, target: "#{systemd_path}/#{service_file}", mode: "755", owner: config.user_root, group: config.group_root then
+        return { :case => :quiet_exit, :more => "Splashd Systemd service installed" }
+      else
+        return { :case => :error_exit, :more => "Splashd Systemd service could not be installed" }
+      end
+    end
+  end
+end

data/lib/splash/config.rb

@@ -115,11 +115,14 @@ module Splash
 
     end
 
+
+
+    @@config=nil
     # factory of Configuration Class instance
     # @param [String] config_file the path of the YAML Config file
     # @return [SPlash::Config::Configuration]
     def get_config(config_file=CONFIG_FILE)
-      return Configuration::new config_file
+      return @@config ||= Configuration::new(config_file)
     end
 
 

data/lib/splash/constants.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 module Splash
   module Constants
-    VERSION = "0.4.5"
+    VERSION = "0.5.0"
 
     # the path to th config file, not overridable by config
     CONFIG_FILE = "/etc/splash.yml"

data/lib/splash/controller.rb

@@ -12,10 +12,30 @@ module Splash
       def startdaemon(options = {})
         config = get_config
         log = get_logger
+        log.level = :fatal if options[:quiet]
         unless verify_service host: config.prometheus_pushgateway_host ,port: config.prometheus_pushgateway_port then
           return {:case => :service_dependence_missing, :more => 'Prometheus Gateway'}
         end
+        realpid = get_processes pattern: get_config.daemon_process_name
+        foreground  = get_processes patterns: [ "splash", "foreground" ]
+        unless foreground.empty? or options[:foreground] then
+          return {:case => :already_exist, :more => "Splash Process already launched on foreground "}
+        end
+
         unless File::exist? config.full_pid_path then
+          unless realpid.empty? then
+            return {:case => :already_exist, :more => "Splash Process already launched "}
+          end
+          if options[:purge] then
+            transport = get_default_client
+            if transport.class == Hash  and transport.include? :case then
+              splash_exit transport
+            else
+              queue = "splash.#{Socket.gethostname}.input"
+              transport.purge queue: queue
+              log.info "Queue : #{queue} purged"
+            end
+          end
           daemon_config = {:description => config.daemon_process_name,
               :pid_file => config.full_pid_path,
               :stdout_trace => config.full_stdout_trace_path,
@@ -43,6 +63,8 @@ module Splash
 
       def stopdaemon(options = {})
           config = get_config
+          log = get_logger
+          log.level = :fatal if options[:quiet]
           if File.exist?(config.full_pid_path) then
             begin
               pid = `cat #{config.full_pid_path}`.to_i
@@ -63,9 +85,13 @@ module Splash
         config = get_config
         pid = realpid = ''
         pid = `cat #{config.full_pid_path}`.to_s if File.exist?(config.full_pid_path)
-        realpid = get_process pattern: get_config.daemon_process_name
+        listpid = get_processes({ :pattern => get_config.daemon_process_name})
         pid.chomp!
-        realpid.chomp!
+        if listpid.empty? then
+          realpid = ''
+        else
+          realpid = listpid.first
+        end
         unless realpid.empty? then
           log.item "Splash Process is running with PID #{realpid} "
         else

data/lib/splash/dependencies.rb

@@ -26,6 +26,7 @@ module Splash
       require 'tty-pager'
       require 'colorize'
       require "redis"
+      require 'ps-ruby'
 
     rescue Gem::GemNotFoundException
       $stderr.puts "Loadind error, it's like you try to run Splash, with a lake of dependencies."

data/lib/splash/exiter.rb

@@ -20,6 +20,7 @@ module Splash
 
        # global
        :quiet_exit => {:code => 0},
+       :error_exit => {:code => 99, :message => "Operation failure"},
 
        # events
        :interrupt => {:message => "Splash user operation interrupted", :code => 33},

data/lib/splash/helpers.rb

@@ -13,18 +13,20 @@ module Splash
       return Etc.getgrgid(0).name
     end
 
-    # facilité pour récupérer un PID depuis une regexp
+    # facilité pour récupérer les PID depuis une regexp
     # @param [Hash] options
-    # @option options [String] :pattern une regexp
+    # @option options [String] :pattern un motif de regexp
+    # @option options [Array] :patterns Un tableau de motif de regexp
     # @return [String] le PID
-    def get_process(options = {})
-      pattern = options[:pattern]
-      res = `ps aux|grep '#{pattern}'|grep -v grep`.to_s
-      unless res.empty? then
-        return res.split(/\s+/)[1]
-      else
-        return ''
+    def get_processes(options = {})
+      patterns = []
+      patterns  = options[:patterns] if options[:patterns]
+      patterns << options[:pattern] if options[:pattern]
+      res = PS.get_all_processes
+      patterns.each do |item|
+        res = res.find_processes item
       end
+      return res.pick_attr('PID')
     end
 
 
@@ -156,7 +158,10 @@ module Splash
        }
       if options[:foreground]
         change_logger logger: :dual
+        Process.setproctitle options[:description] if options[:description]
+        p $0
         return yield
+        p 'titi'
       end
       fork do
         change_logger logger: :daemon

data/lib/splash/loggers/daemon.rb

@@ -16,9 +16,15 @@ module Splash
 
 
       def log(options)
+        pid = Process.pid.to_s
+        date = DateTime.now.to_s
         level = (ALIAS.keys.include? options[:level])?  ALIAS[options[:level]] : options[:level]
         if @active_levels.include? level then
-          @stream.puts "#{alt(options[:level])} #{options[:message]}"
+          unless options[:session].empty? then
+            @stream.puts "[#{date}] (#{pid}) (#{options[:session]}) #{alt(options[:level])} : #{options[:message]}"
+          else
+            @stream.puts "[#{date}] (#{pid}) #{alt(options[:level])} : #{options[:message]}"
+          end
         end
       end
 
@@ -26,6 +32,8 @@ module Splash
         @stream.close
       end
 
+
+
     end
 
   end

data/lib/splash/loggers.rb

@@ -18,6 +18,10 @@ module Splash
 #      end
     end
 
+    def get_session
+      return "#{Time.now.to_i.to_s}#{rand(999)}"
+    end
+
 
     def change_logger(options = {})
       options[:force] = true
@@ -34,13 +38,13 @@ module Splash
         :schedule => :info, :arrow => :info, :send => :info,
         :receive => :info, :error => :result, :success => :result }
       LEVELS.each do |method|
-        define_method(method) do |message|
-            self.log({ :level => method, :message => message})
+        define_method(method) do |message,session = ''|
+            self.log({ :level => method, :message => message, :session => session})
         end
       end
       ALIAS.keys.each do |method|
-        define_method(method) do |message|
-            self.log({ :level => method, :message => message})
+        define_method(method) do |message,session = ''|
+            self.log({ :level => method, :message => message, :session => session})
         end
       end
       def initialize

data/lib/splash/logs.rb

@@ -42,15 +42,16 @@ module Splash
     end
 
     # start notification on prometheus for metric logerrors, logmissing; loglines
-    def notify
+    def notify(options = {})
       log = get_logger
       unless verify_service host: @config.prometheus_pushgateway_host ,port: @config.prometheus_pushgateway_port then
         return  { :case => :service_dependence_missing, :more => "Prometheus Notification not send." }
       end
-      log.info "Sending metrics to Prometheus Pushgateway"
+      session = (options[:session]) ? options[:session] : log.get_session
+      log.info "Sending metrics to Prometheus Pushgateway", session
       @logs_target.each do |item|
         missing = (item[:status] == :missing)? 1 : 0
-        log.item "Sending metrics for #{item[:log]}"
+        log.item "Sending metrics for #{item[:log]}", session
         @metric_count.set(item[:count], labels: { log: item[:log] })
         @metric_missing.set(missing, labels: { log: item[:log] })
         lines = (item[:lines])? item[:lines] : 0
@@ -59,7 +60,7 @@ module Splash
       hostname = Socket.gethostname
       url = "http://#{@config.prometheus_pushgateway_host}:#{@config.prometheus_pushgateway_port}"
       Prometheus::Client::Push.new('Splash',hostname, url).add(@registry)
-      log.ok "Sending to Prometheus PushGateway done."
+      log.ok "Sending to Prometheus PushGateway done.", session
       return {:case => :quiet_exit }
     end
 

data/lib/splash/orchestrator/grammar.rb

@@ -14,36 +14,37 @@ module Splash
         terminate
       end
 
-      def ping(payload)
-        return "Pong : #{payload[:hostname]} !"
+      def ping(content)
+        return "Pong : #{content[:payload][:hostname]} !"
       end
 
 
-      def list_commands
+      def list_commands(content)
         return get_config.commands
       end
 
-      def ack_command(payload)
-        return execute command: payload[:name], ack: true
+      def ack_command(content)
+        return execute command: content[:payload][:name], ack: true
       end
 
 
-      def execute_command(payload)
+      def execute_command(content)
+        payload = content[:payload]
         unless get_config.commands.include? payload[:name].to_sym
-          @log.item "Command not found"
+          @log.item "Command not found", content[:session]
           return { :case => :not_found }
         end
         if payload.include? :schedule then
           sched,value = payload[:schedule].flatten
-          @log.schedule "remote call command #{payload[:name]}, scheduling : #{sched.to_s} #{value}"
+          @log.schedule "remote call command #{payload[:name]}, scheduling : #{sched.to_s} #{value}", content[:session]
           @server.send sched,value do
-            @log.trigger "Executing Scheduled command #{payload[:name]} for Scheduling : #{sched.to_s} #{value}"
-            execute command: payload[:name]
+            @log.trigger "Executing Scheduled command #{payload[:name]} for Scheduling : #{sched.to_s} #{value}", content[:session]
+            execute command: payload[:name], session: content[:session]
           end
           return { :case => :quiet_exit }
         else
-          @log.info "Execute direct command"
-          res = execute command: payload[:name]
+          @log.info "Execute direct command",  content[:session]
+          res = execute command: payload[:name], session: content[:session]
           return res
         end
       end

data/lib/splash/orchestrator.rb

@@ -31,11 +31,12 @@ module Splash
           @log.item "Initializing logs monitorings & notifications."
           @server.send sched,value do
             begin
-              @log.trigger "Logs monitoring for Scheduling : #{sched.to_s} #{value.to_s}"
+              session = get_session
+              @log.trigger "Logs monitoring for Scheduling : #{sched.to_s} #{value.to_s}", session
               @result.analyse
-              @result.notify
+              @result.notify :session => session
             rescue Errno::ECONNREFUSED
-              @log.error "PushGateway seems to be done, please start it."
+              @log.error "PushGateway seems to be done, please start it.", session
             end
           end
           hostname = Socket.gethostname
@@ -45,17 +46,15 @@ module Splash
           end
           transport.subscribe(:block => true) do |delivery_info, properties, body|
             content = YAML::load(body)
+            session = get_session
+            content[:session] = session
             if VERBS.include? content[:verb]
-              @log.receive "Valid remote order, verb : #{content[:verb].to_s}"
-              if content[:payload] then
-                res = self.send content[:verb], content[:payload]
-              else
-                res = self.send content[:verb]
-              end
+              @log.receive "Valid remote order, verb : #{content[:verb].to_s}", session
+              res = self.send content[:verb], content
               get_default_client.publish queue: content[:return_to], message: res.to_yaml
-              @log.send "Result to #{content[:return_to]}."
+              @log.send "Result to #{content[:return_to]}.", session
             else
-              @log.receive "INVALID remote order, verb : #{content[:verb].to_s}"
+              @log.receive "INVALID remote order, verb : #{content[:verb].to_s}", session
               get_default_client.publish queue: content[:return_to], message: "Unkown verb #{content[:verb]}".to_yaml
             end
           end
@@ -76,8 +75,9 @@ module Splash
               sched,value = config[command][:schedule].flatten
               @log.arrow "Scheduling command #{command.to_s}"
               @server.send sched,value do
-                @log.trigger "Executing Scheduled command #{command.to_s} for Scheduling : #{sched.to_s} #{value.to_s}"
-                execute command: command.to_s
+                session  = get_session
+                @log.trigger "Executing Scheduled command #{command.to_s} for Scheduling : #{sched.to_s} #{value.to_s}", session
+                execute command: command.to_s, session: session
               end
             end
 
@@ -88,7 +88,7 @@ module Splash
           if options[:ack] then
             command.ack
           else
-            return command.call_and_notify trace: true, notify: true, callback: true
+            return command.call_and_notify trace: true, notify: true, callback: true, session: options[:session]
           end
         end
 

data/prometheus-splash.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rufus-scheduler','~> 3.6.0'
   spec.add_runtime_dependency 'redis','~> 4.1.3'
   spec.add_runtime_dependency 'bunny','~> 2.15.0'
+  spec.add_runtime_dependency 'ps-ruby','~> 0.0.4'
   spec.add_runtime_dependency 'tty-markdown','~> 0.6.0'
   spec.add_runtime_dependency 'tty-pager','~> 0.12.1'
   spec.add_runtime_dependency 'colorize','~> 0.8.1'

data/templates/ansible-splash/Vagrantfile

@@ -17,7 +17,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", inline: <<-SHELL
      sudo apt-get update
      sudo apt-add-repository --yes --update ppa:ansible/ansible
-     apt-get install -y git ansible
+     apt-get install -y git ansible python-apt
      git clone https://github.com/Ultragreen/prometheus-splash.git
      cd prometheus-splash/templates/ansible-splash
      ansible-playbook -i inventory.dev deploy.yml

data/templates/ansible-splash/deploy.yml

@@ -1,6 +1,7 @@
 ---
-- name: PREPARE TESTING ocalhost entries for test
+- name: PREPARE TESTING localhost entries for test #only for testing with Vagrant, remove for real usages
   hosts: supervision_master
+  become: yes
   tasks:
   - lineinfile:
       path: /etc/hosts
@@ -10,7 +11,25 @@
       group: root
       mode: '0644'
     when: patch_etc_hosts
+  - lineinfile:
+      path: /etc/hosts
+      state: absent
+      regexp: '^127\.0\.1\.1'
+    when: patch_etc_hosts
 
+- name: PREPARE packages
+  hosts: supervision_master #for real usage => precise all
+  become: yes
+  tasks:
+  - apt:
+      update_cache: yes
+      force_apt_get: yes
+      cache_valid_time: 3600
+      pkg:
+      - python-apt
+      - screen
+      - emacs-nox
+      - htop
 
 
 
@@ -18,6 +37,7 @@
   become: yes
   hosts: mq
   tasks:
+  - apt: update_cache=yes force_apt_get=yes cache_valid_time=3600
   - include_role:
       name: mq
     when: install_mq
@@ -26,6 +46,7 @@
   become: yes
   hosts: backend
   tasks:
+  - apt: update_cache=yes force_apt_get=yes cache_valid_time=3600
   - include_role:
       name: backend
     when: install_backend
@@ -33,17 +54,23 @@
 - name: Deploy Supervision Master
   become: yes
   hosts: supervision_master
+  tasks:
+  - apt: update_cache=yes force_apt_get=yes cache_valid_time=3600
   roles:
     - supervision_master
 
 - name: Deploy Supervision Gateway
   become: yes
   hosts: supervision_gateway
+  tasks:
+  - apt: update_cache=yes force_apt_get=yes cache_valid_time=3600
   roles:
     - supervision_gateway
 
 - name: Deploy Splash
   become: yes
   hosts: splash_nodes
+  tasks:
+  - apt: update_cache=yes force_apt_get=yes cache_valid_time=3600
   roles:
     - splash

data/templates/ansible-splash/group_vars/DEV.yml

@@ -7,6 +7,8 @@ patch_etc_hosts: true
 mq_port: 5672
 mq_admin_username: admin
 mq_admin_password: adminmdppwd
+mq_ip: 127.0.0.1
+mq_nodename: rabbit
 
 mq_splash_username: splash
 mq_splash_password: mdptest

data/templates/ansible-splash/roles/mq/handlers/main.yml

@@ -1,5 +1,5 @@
 
 ---
-- name: restart rabbitmq
+- name: restart Rabbitmq
   service: name=rabbitmq-server state=restarted
   become: yes

data/templates/ansible-splash/roles/mq/tasks/main.yml

@@ -6,10 +6,23 @@
 
 - name: MQ enable rabbitmq plugins
   rabbitmq_plugin: names=rabbitmq_management,rabbitmq_tracing,rabbitmq_federation state=enabled
-  notify: restart rabbitmq
+  notify: restart Rabbitmq
 
+- name: MQ Configuration
+  template:
+    src: rabbitmq-env.conf.j2
+    dest: /etc/rabbitmq/rabbitmq-env.conf
+    owner: rabbitmq
+    group: rabbitmq
+    mode: 0644
+  notify: restart Rabbitmq
+
+- name: MQ Force restart RabbitMQ for conf update directly
+  meta: flush_handlers
+  
 - name: add Admin users
   rabbitmq_user:
+    node: "rabbit@{{ groups['mq'][0] }}"
     user: "{{ mq_admin_username }}"
     password: "{{ mq_admin_password }}"
     tags: administrator,"{{ mq_admin_username }}"
@@ -22,17 +35,20 @@
 
 - name: remove default guest user
   rabbitmq_user:
+    node: "rabbit@{{ groups['mq'][0] }}"
     user: guest
     state: absent
 
 
 - name: MQ Configure Splash vhost
   rabbitmq_vhost:
+    node: "rabbit@{{ groups['mq'][0] }}"
     name: "{{ mq_splash_vhost }}"
     state: present
 
 - name: MQ Add Splash service user
   rabbitmq_user:
+    node: "rabbit@{{ groups['mq'][0] }}"
     user: "{{ mq_splash_username }}"
     password: "{{ mq_splash_password }}"
     vhost: "{{ mq_splash_vhost}}"

data/templates/ansible-splash/roles/mq/templates/rabbitmq-env.conf.j2

@@ -0,0 +1,13 @@
+# Defaults to rabbit. This can be useful if you want to run more than one node
+# per machine - RABBITMQ_NODENAME should be unique per erlang-node-and-machine
+# combination. See the clustering on a single machine guide for details:
+# http://www.rabbitmq.com/clustering.html#single-machine
+NODENAME={{ mq_nodename }}@{{ groups['mq'][0]}}
+
+# By default RabbitMQ will bind to all interfaces, on IPv4 and IPv6 if
+# available. Set this if you only want to bind to one network interface or#
+# address family.
+NODE_IP_ADDRESS={{ mq_ip }}
+
+# Defaults to 5672.
+NODE_PORT={{ mq_port }}

data/templates/ansible-splash/roles/splash/tasks/main.yml

@@ -8,6 +8,7 @@
   gem:
     name: prometheus-splash
     state: present
+    user_install: no
 
 - name: SPLASH Check if setup done
   stat:

data/templates/splashd.service

@@ -15,7 +15,7 @@ ExecStop=/usr/local/bin/splash daemon stop
 Restart=on-failure
 
 # Configures the time to wait before service is stopped forcefully.
-TimeoutStopSec=300
+TimeoutStopSec=30
 
 [Install]
 WantedBy=multi-user.target

data/test.sh

@@ -0,0 +1,42 @@
+rvmsudo splash config set 
+rvmsudo splash config san 
+
+
+splash conf version
+
+splash conf version --no-colors
+splash conf version --no-emoji
+
+splash logs an
+splash log mon 
+splash logs show /tmp/test
+splash logs show /tmtp/toto
+splash logs list
+splash logs list --detail  
+
+
+
+splash com list --detail 
+splash com list 
+splash com treeview pwd
+splash com show echo1
+rvmsudo splash com exe true_test
+rvmsudo splash com exe false_test
+splash com lastrun true_test
+splash com get 
+
+rvmsudo splash dae start 
+rvmsudo splash dae ping 
+
+rvmsudo splash com exe test_remote_call
+
+rvmsudo splash com sched echo2 --in '2s'
+rvmsudo splash com sched echo2 --in '2s' --hostname
+rvmsudo splash com exe echo1 --hostname
+
+
+splash com list --hostname
+splash com get --all
+splash com get --hostname 
+splash com tree echo1 --hostname
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.15.0
+- !ruby/object:Gem::Dependency
+  name: ps-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: tty-markdown
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +268,7 @@ files:
 - lib/splash/commands.rb
 - lib/splash/config.rb
 - lib/splash/config/sanitycheck.rb
+- lib/splash/config/service.rb
 - lib/splash/config/setup.rb
 - lib/splash/constants.rb
 - lib/splash/controller.rb
@@ -279,12 +294,12 @@ files:
 - templates/ansible-splash/group_vars/PROD.yml
 - templates/ansible-splash/group_vars/all.yml
 - templates/ansible-splash/inventory.dev
-- templates/ansible-splash/inventory.prod
 - templates/ansible-splash/roles/backend/handlers/main.yml
 - templates/ansible-splash/roles/backend/tasks/main.yml
 - templates/ansible-splash/roles/backend/templates/redis.conf.j2
 - templates/ansible-splash/roles/mq/handlers/main.yml
 - templates/ansible-splash/roles/mq/tasks/main.yml
+- templates/ansible-splash/roles/mq/templates/rabbitmq-env.conf.j2
 - templates/ansible-splash/roles/splash/tasks/main.yml
 - templates/ansible-splash/roles/splash/templates/splash.yml.j2
 - templates/ansible-splash/roles/supervision_gateway/handlers/main.yml
@@ -295,6 +310,7 @@ files:
 - templates/ansible-splash/roles/supervision_master/templates/prometheus.yml.j2
 - templates/report.txt
 - templates/splashd.service
+- test.sh
 - ultragreen_roodi_coding_convention.yml
 homepage: http://www.ultragreen.net
 licenses:

data/templates/ansible-splash/inventory.prod

@@ -1,26 +0,0 @@
-# TEMPLATE
-[PROD:children]
-backend
-mq
-splash_nodes
-supervision_master
-supervision_gateway
-
-
-[backend]
-backend ansible_host=X.X.X.X
-
-[mq]
-mq ansible_host=X.X.X.X
-
-
-[splash_nodes]
-node1 ansible_host=X.X.X.X
-node2 ansible_host=X.X.X.X
-
-
-[supervision_gateway]
-pushgateway ansible_host=X.X.X.X
-
-[supervision_master]
-prometheus ansible_host=X.X.X.X