prometheus-splash 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285fc8b213dd02cccc8f43153f9e63ba261d96a6f29dd87b0c7f3194130b09d5
-  data.tar.gz: be38d7d3804b186ed62f9e3a50b18dd46ccf37c2fe9406b22fbab8df6ccc7af7
+  metadata.gz: 13eaca07cd4d8de11c4eb5b54798a59d2a16d2b258eab9e800405b9333b7caba
+  data.tar.gz: 00170e2f5a7e8b51ec9b4b638e75ed8a5dd53ba6f5a644a752f83f0c0eb77179
 SHA512:
-  metadata.gz: 9a91bf0cd11d39881f49cb81e3b070da161d8cf24664025360dd1036842c448ce4b86d2498f6d881ec190213780c93b6b15b90a19a4b0410da3a72aa961b2250
-  data.tar.gz: 1c86c9ba9933d8031e5df00543e254cce43732f2f400f729bd2740f4a7f7ec765bc7d14610bd811cf1b8ceeab2d039d791267e9837db4132e6e193e069a2c2fd
+  metadata.gz: 848fcec8f9d390cbd59fdd5104d32667fe03a581ee6597de6bcdd64dc923863d1a821ec417285816bcf093a955b668fa563934b599691292eceee9bfa8e3affa
+  data.tar.gz: 5541a02ed39ae1a86e1602886a9a0eb1590d6bae431517fd8d0a2b91ce1a62092dd641f0dac8a6d496b5b46490cf176cb2cb7707c997b1e671ca40ae55984109

data/CHANGELOG.md

@@ -185,3 +185,12 @@
 ### FIX
 
 * always missing status for log history #65
+
+
+## V 0.8.5
+
+### FEATURE
+
+* WebUI R/W commands, logs, processes
+* cosmetics
+* multiples fix, debugging

data/README.md

@@ -9,7 +9,7 @@ SPLASH is **Supervision with Prometheus of Logs and Asynchronous tasks orchestra
 * Web : http://www.ultragreen.net
 * Github : https://github.com/Ultragreen/prometheus-splash
 * Rubygems : https://rubygems.org/gems/prometheus-splash
-* DOC yardoc : https://www.rubydoc.info/gems/prometheus-splash/0.8.4
+* DOC yardoc : https://www.rubydoc.info/gems/prometheus-splash/0.8.5
 
 Prometheus Logs and Batchs supervision over PushGateway
 

data/config/splash.yml

@@ -73,49 +73,51 @@
 
 ### Sample configuration of commands and scheduling
   :commands:
-    :id_root:
+    - :name: :id_root
       :desc: run id command on root
       :command: id root
-    :true_test:
+    - :name: :true_test
       :desc: "test command returning true : 0"
       :command: "true"
       :schedule:
         :every: "1h"
       :on_failure: :ls_slash_tmp
       :on_success: :pwd
-    :false_test:
+    - :name: :false_test
       :desc: "test command returning false > 0"
       :command: "false"
       :schedule:
         :every: "1h"
       :on_failure: :ls_slash_tmp
       :on_success: :pwd
-    :ls_slash_tmp:
+    - :name: :ls_slash_tmp
       :desc: list file in /tmp
       :command: ls -al /tmp
       :user: daemon
       :on_success: :echo1
-    :pwd:
+    - :name: :pwd
       :desc: run pwd
       :command: pwd
       :on_success: :echo1
       :on_failure: :echo2
-    :echo1:
+    - :name: :echo1
       :desc: echo 'foo'
       :command: echo foo
       :on_failure: :echo3
-    :echo2:
+    - :name: :echo2
       :desc: echo 'bar'
       :command: echo bar
-    :echo3:
+    - :name: :echo3
       :desc: echo 'been'
       :command: echo been
-    :rand_sleep_5:
+    - :name: :rand_sleep_5
       :desc: sleep on a rand 5
       :command: ruby -e 'sleep rand(5)'
       :schedule:
-        :every: "10s"
-    :test_remote_call:
+        :every: "30s"
+      :retention:
+        :hours: 1
+    - :name: :test_remote_call
       :desc: remote call test
       :delegate_to:
         :host: omicron
@@ -138,7 +140,7 @@
 
 ### configuration of monitored processes
   :processes:
-    - :process: cron
+    - :process: :cron
       :patterns:
         - cron
       :retention:

data/lib/splash/cli/commands.rb

@@ -159,7 +159,7 @@ module CLISplash
       end
       log.info "Command : #{command.to_s}" if depht == 0
       aproc = Proc::new do |command,depht|
-        cmd  = commands[command.to_sym]
+        cmd  = commands.select{|item| item[:name] ==  command.to_sym}.first
         if cmd[:on_failure] then
           spacer=  " " * depht + " "
           log.flat "#{spacer}* on failure => #{cmd[:on_failure]}"
@@ -211,16 +211,16 @@ module CLISplash
         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}"
+      log.ko 'No configured commands found' if list.empty?
+      list.each do |command|
+        log.item "#{command[:name].to_s}"
         if options[:detail] then
-          log.arrow "command line : '#{list[command][:command]}'"
-          log.arrow "command description : '#{list[command][:desc]}'"
-          log.arrow "command failure callback : '#{list[command.to_sym][:on_failure]}'" if list[command.to_sym][:on_failure]
-          log.arrow "command success callback : '#{list[command.to_sym][:on_success]}'" if list[command.to_sym][:on_success]
-          if list[command.to_sym][:schedule]
-            sched,val = list[command.to_sym][:schedule].flatten
+          log.arrow "command line : '#{command[:command]}'"
+          log.arrow "command description : '#{command[:desc]}'"
+          log.arrow "command failure callback : '#{command[:on_failure]}'" if command[:on_failure]
+          log.arrow "command success callback : '#{command[:on_success]}'" if command[:on_success]
+          if command[:schedule] then
+            sched,val = command[:schedule].flatten
             log.arrow "command scheduled : #{sched} #{val}."
           end
         end
@@ -235,7 +235,7 @@ module CLISplash
     with --hostname <HOSTNAME>, an other Splash monitored server (only with Redis backend configured)
     LONGDESC
     option :hostname, :type => :string,  :aliases => "-H"
-    def show(command)
+    def show(name)
       unless is_root? then
         splash_exit case: :not_root, :more => "Command show specifications"
       end
@@ -261,14 +261,15 @@ module CLISplash
       else
         list = get_config.commands
       end
-      if list.keys.include? command.to_sym then
-        log.info "Splash command : #{command}"
-        log.item "command line : '#{list[command.to_sym][:command]}'"
-        log.item "command description : '#{list[command.to_sym][:desc]}'"
-        log.item "command failure callback : '#{list[command.to_sym][:on_failure]}'" if list[command.to_sym][:on_failure]
-        log.item "command success callback : '#{list[command.to_sym][:on_success]}'" if list[command.to_sym][:on_success]
-        if list[command.to_sym][:schedule]
-          sched,val = list[command.to_sym][:schedule].flatten
+      command = list.select{|item| item[:name] == name.to_sym}.first
+      unless command.nil?  then
+        log.info "Splash command : #{command[:name]}"
+        log.item "command line : '#{command[:command]}'"
+        log.item "command description : '#{command[:desc]}'"
+        log.item "command failure callback : '#{command[:on_failure]}'" if command[:on_failure]
+        log.item "command success callback : '#{command[:on_success]}'" if command[:on_success]
+        if command[:schedule]
+          sched,val = command[:schedule].flatten
           log.item "command scheduled : #{sched} #{val}."
         end
         splash_exit case: :quiet_exit
@@ -301,7 +302,7 @@ module CLISplash
                             value[:end_date],
                             value[:exec_time],
                             value[:stdout].empty?,
-                            value[:stdout].empty?]
+                            value[:stderr].empty?]
             end
           end
           if check_unicode_term  then
@@ -349,12 +350,12 @@ module CLISplash
         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
+      list = get_config.commands
       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
+      if list.select{|cmd| cmd[:name] == command.to_sym}.count > 0  then
         log.info "Splash command #{command} previous execution report:\n"
         req  = { :key => command}
         req[:hostname] = options[:hostname] if options[:hostname]

data/lib/splash/cli/daemon.rb

@@ -99,7 +99,7 @@ module CLISplash
     end
 
     # Thor method : sending reset verb over transport in the input queue of Splashd
-    desc "getjobs", "send a reset verb to HOSTNAME daemon over transport (need an active tranport), Typicallly RabbitMQ"
+    desc "reset", "send a reset verb to HOSTNAME daemon over transport (need an active tranport), Typicallly RabbitMQ"
     def reset(hostname=Socket.gethostname)
       log = get_logger
       log.info "ctrl+c for interrupt"

data/lib/splash/cli/webadmin.rb

@@ -35,9 +35,10 @@ module CLISplash
     long_desc <<-LONGDESC
     Starting Splash Daemon\n
     LONGDESC
+    option :foreground, :type => :boolean,  :aliases => "-F"
     desc "start", "Splash WebAdmin Daemon status"
     def start
-      acase = run_as_root :startweb
+      acase = run_as_root :startweb, options
       splash_exit acase
     end
 

data/lib/splash/commands.rb

@@ -48,6 +48,11 @@ module Splash
         @backend = get_backend :execution_trace
       end
 
+
+      def clear
+        @backend.del({:key => @name}) if  @backend.exist?({key: @name})
+      end
+
       def purge(retention)
         retention = {} if retention.nil?
         if retention.include? :hours then
@@ -96,7 +101,7 @@ module Splash
         @config  = get_config
         @url = @config.prometheus_pushgateway_url
         @name = name
-        unless @config.commands.keys.include? @name.to_sym then
+        unless @config.commands.select{|cmd| cmd[:name] == @name.to_sym }.count > 0 then
           splash_exit case: :not_found, more: "command #{@name} is not defined in configuration"
         end
       end
@@ -139,18 +144,20 @@ module Splash
         session = (options[:session])? options[:session] : get_session
         acase = { :case => :quiet_exit }
         exit_code = 0
-        if @config.commands[@name.to_sym][:delegate_to] then
+        command = @config.commands.select{|command| command[:name] == @name.to_sym}.first
+        if command[: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]}", session
+          log.send "Remote command : #{@name} execution delegate to : #{command[:delegate_to][:host]} as : #{command[:delegate_to][:remote_command]}", session
+          log.warn "Local command : #{command[:command]} defined but ignored, because delegate have the priority"
           begin
             transport = get_default_client
             if transport.class == Hash  and transport.include? :case then
               return transport
             else
               res = transport.execute({ :verb => :execute_command,
-                payload: {:name => @config.commands[@name.to_sym][:delegate_to][:remote_command].to_s},
+                payload: {:name => command[:delegate_to][:remote_command].to_s},
                 :return_to => "splash.#{Socket.gethostname}.return",
-                :queue => "splash.#{@config.commands[@name.to_sym][:delegate_to][:host]}.input" })
+                :queue => "splash.#{command[:delegate_to][:host]}.input" })
               exit_code = res[:exit_code]
               log.receive "return with exitcode #{exit_code}", session
 
@@ -164,35 +171,35 @@ module Splash
           start_date = DateTime.now.to_s
           unless options[:trace] then
             log.item "Traceless execution", session
-            if @config.commands[@name.to_sym][:user] then
-              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")
+            if command[:user] then
+              log.item "Execute with user : #{command[:user]}.", session
+              system("sudo -u #{command[:user]} #{command[:command]} > /dev/null 2>&1")
             else
-              system("#{@config.commands[@name.to_sym][:command]} > /dev/null 2>&1")
+              system("#{command[:command]} > /dev/null 2>&1")
             end
             time = Time.now - start
             exit_code = $?.exitstatus
           else
             log.item "Tracefull execution", session
-            if @config.commands[@name.to_sym][:user] then
-              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]}")
+            if command[:user] then
+              log.item "Execute with user : #{command[:user]}.", session
+              stdout, stderr, status = Open3.capture3("sudo -u #{command[:user]} #{command[:command]}")
             else
-              stdout, stderr, status = Open3.capture3(@config.commands[@name.to_sym][:command])
+              stdout, stderr, status = Open3.capture3(command[:command])
             end
             time = Time.now - start
             data = Hash::new
             data[:start_date] = start_date
             data[:end_date] = DateTime.now.to_s
             data[:cmd_name] = @name
-            data[:cmd_line] = @config.commands[@name.to_sym][:command]
-            data[:desc] = @config.commands[@name.to_sym][:desc]
+            data[:cmd_line] = command[:command]
+            data[:desc] = command[:desc]
             data[:status] = status.to_s
             data[:stdout] = stdout
             data[:stderr] = stderr
             data[:exec_time] = time.to_s
             cmdrec = CmdRecords::new @name
-            cmdrec.purge(@config.commands[@name.to_sym][:retention])
+            cmdrec.purge(command[:retention])
             cmdrec.add_record data
             exit_code = status.exitstatus
           end
@@ -205,24 +212,26 @@ module Splash
           end
         end
         if options[:callback] then
-          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
+          on_failure = (command[:on_failure])? command[:on_failure] : false
+          on_success = (command[:on_success])? command[:on_success] : false
           if on_failure and exit_code > 0 then
             log.item "On failure callback : #{on_failure}", session
-            if @config.commands.keys.include?  on_failure then
+            if @config.commands.select {|item| item[:name] == on_failure}.count > 0 then
               @name = on_failure.to_s
               call_and_notify options
             else
-              acase = { :case => :configuration_error , :more => "on_failure call error : #{on_failure} command inexistant."}
+              log.error "on_failure call error : #{on_failure.to_s} command inexistant.", session
+              acase = { :case => :configuration_error , :more => "Command #{command[:name]} callback coniguration error"}
             end
           end
           if on_success and exit_code == 0 then
             log.item "On success callback : #{on_success}", session
-            if @config.commands.keys.include?  on_success then
+            if @config.commands.select {|item| item[:name] == on_success}.count > 0 then
               @name = on_success.to_s
               call_and_notify options
             else
-              acase = { :case => :configuration_error , :more => "on_success call error : #{on_failure} command inexistant."}
+              log.error "on_success call error : #{on_success.to_s} command inexistant."
+              acase = { :case => :configuration_error , :more => "Command #{command[:name]} callback coniguration error"}
             end
           end
         else

data/lib/splash/config.rb

@@ -14,9 +14,13 @@ module Splash
     class ConfigLinter
       def initialize
         @lints_present = {:logs => [:label, :log, :pattern ],
-                          :processes => [:process, :patterns ]}
+                          :processes => [:process, :patterns ],
+                          :commands => [:name, :desc, :command ]}
         @lints_types = {:logs => {:label => Symbol, :log => String, :pattern => String, :retention => Hash},
-                        :processes  => {:process => Symbol, :patterns => Array, :retention => Hash}}
+                        :processes  => {:process => Symbol, :patterns => Array, :retention => Hash},
+                        :commands => {:name => Symbol, :desc => String, :command => String, :schedule => Hash,
+                                      :retention => Hash, :on_failure => Symbol, :on_success => Symbol,
+                                      :user => String, :delegate_to => Hash}}
       end
 
       def verify(options ={})

data/lib/splash/constants.rb

@@ -7,7 +7,7 @@ module Splash
   module Constants
 
     # Current splash version
-    VERSION = "0.8.4"
+    VERSION = "0.9.0"
     # the path to th config file, not overridable by config
     CONFIG_FILE = "/etc/splash.yml"
     # the default execution trace_path if backend file

data/lib/splash/daemon/orchestrator/grammar.rb

@@ -66,7 +66,7 @@ module Splash
         # @return [Hash] Exiter case
         def execute_command(content)
           payload = content[:payload]
-          unless get_config.commands.include? payload[:name].to_sym
+          unless get_config.commands.select {|cmd| cmd[:name] == payload[:name].to_sym}.count > 0 then
             @log.item "Command not found", content[:session]
             return { :case => :not_found }
           end

data/lib/splash/daemon/orchestrator.rb

@@ -84,7 +84,7 @@ module Splash
             if VERBS.include? content[:verb]
               @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
+              get_default_client.publish queue: content[:return_to], message: res.to_yaml unless content[:return_to] == :ignore
               @log.send "Result to #{content[:return_to]}.", session
             else
               @log.receive "INVALID remote order, verb : #{content[:verb].to_s}", session
@@ -100,9 +100,9 @@ module Splash
           else
             sched,value = @config.daemon_procmon_scheduling.flatten
             @log.item "Initializing logs monitorings & notifications."
-            @log_result = LogScanner::new
             @server.send sched,value do
               begin
+                @log_result = LogScanner::new
                 session = get_session
                 @metric_manager.inc_logs_monitoring
                 @log.trigger "Logs monitoring for Scheduling : #{sched.to_s} #{value.to_s}", session
@@ -122,9 +122,9 @@ module Splash
           else
             sched,value = @config.daemon_logmon_scheduling.flatten
             @log.item "Initializing processes monitorings & notifications."
-            @process_result = ProcessScanner::new
             @server.send sched,value do
               begin
+                @process_result = ProcessScanner::new
                 session = get_session
                 @metric_manager.inc_processes_monitoring
                 @log.trigger "Processes monitoring for Scheduling : #{sched.to_s} #{value.to_s}", session
@@ -155,15 +155,14 @@ module Splash
 
         # prepare commands Scheduling
         def init_commands_scheduling
-          config = get_config.commands
-          commands = config.select{|key,value| value.include? :schedule}.keys
+          commands = @config.commands.select{|command| command.include? :schedule}
           commands.each do |command|
-            sched,value = config[command][:schedule].flatten
-            @log.arrow "Scheduling command #{command.to_s}"
+            sched,value = command[:schedule].flatten
+            @log.arrow "Scheduling command #{command[:name].to_s}"
             @server.send sched,value do
               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
+              @log.trigger "Executing Scheduled command #{command[:name].to_s} for Scheduling : #{sched.to_s} #{value.to_s}", session
+              execute command: command[:name].to_s, session: session
             end
           end
         end

data/lib/splash/dependencies.rb

@@ -50,6 +50,7 @@ module Splash
 
 
     # Splash
+    require 'splash/monkeys'
     require 'splash/constants'
     require 'splash/helpers'
     require 'splash/config'

data/lib/splash/helpers.rb

@@ -358,7 +358,7 @@ module Splash
     # @return [Boolean]
     def check_unicode_term
       return false unless ENV.include? "TERM"
-      if ENV.values_at("LC_ALL","LC_CTYPE","LANG").compact.first.include?("UTF-8") and ENV.values_at('TERM').first.include? "xterm" then
+      if ENV.values_at("LC_ALL","LC_CTYPE","LANG").compact.include?("UTF-8") and ENV.values_at('TERM').include? "xterm" then
         return true
       else
         return false

data/lib/splash/monkeys.rb

@@ -0,0 +1,5 @@
+class Object
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+end

data/lib/splash/sequences.rb

@@ -25,12 +25,17 @@ module Splash
         list[name][:definition].each do |step|
           log.info "STEP : #{step[:step]}",session
           if step[:on_host].nil? then
-            command =  CommandWrapper::new(step[:command].to_s)
+            if get_config.commands.select{|cmd| cmd[:name] == step[:command]}.count > 0 then
+              command =  CommandWrapper::new(step[:command].to_s)
               step[:callback] = true if step[:callback].nil?
               step[:trace] = true if step[:trace].nil?
               step[:notify] = true if step[:notify].nil?
               step[:session] = session
               acase = command.call_and_notify step
+            else
+              log.error "Commmand #{step[:command]} not found, for STEP : #{step[:step]}", session
+              acase =  splash_return :not_found
+            end
           else
             log.info "Remote execution of #{step[:command]} on #{step[:on_host]}", session
             begin

data/lib/splash/webadmin/api/routes/commands.rb

@@ -16,7 +16,7 @@ WebAdminApp.get '/api/commands/show/:name.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
   log.call "API : commands, verb : GET, route : show, item : #{params[:name]} , format : #{format}"
-  commands_recordset = get_config.commands[params[:name].to_sym]
+  commands_recordset = get_config.commands.select {|command| command[:name] == params[:name].to_sym}.first
   unless commands_recordset.nil? then
     obj = splash_return case: :quiet_exit
     obj[:data] = commands_recordset
@@ -26,3 +26,15 @@ WebAdminApp.get '/api/commands/show/:name.?:format?' do
   content_type format
   format_response(obj, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
 end
+
+WebAdminApp.get '/api/commands/history/:name.?:format?' do
+  log = get_logger
+  format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
+  log.call "API : commands, verb : GET, route : history, format : #{format}"
+  record = Splash::Commands::CmdRecords::new(params[:name]).get_all_records
+  history =  splash_return case: :quiet_exit, :more => "command monitoring history"
+  history[:data] = record
+  content_type format
+  status 201
+  format_response(history, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+end

data/lib/splash/webadmin/api/routes/config.rb

@@ -30,6 +30,7 @@ WebAdminApp.post '/api/config/addlog.?:format?' do
   res = get_config.add_record :record => YAML::load(request.body.read), :key => :label, :type => :logs, :clean => true
   case res[:status]
   when :success
+    rehash_daemon
     addlog = splash_return case: :quiet_exit, :more => "add log done"
   when :already_exist
     addlog = splash_return case: :already_exist, :more => "add log twice nto allowed"
@@ -49,6 +50,7 @@ WebAdminApp.post '/api/config/addprocess.?:format?' do
   res = get_config.add_record :record => YAML::load(request.body.read), :type => :processes, :key => :process, :clean => true
   case res[:status]
   when :success
+    rehash_daemon
     addprocess = splash_return case: :quiet_exit, :more => "add process done"
   when :already_exist
     addprocess = splash_return case: :already_exist, :more => "add process twice not allowed"
@@ -60,6 +62,26 @@ WebAdminApp.post '/api/config/addprocess.?:format?' do
   format_response(addprocess, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
 end
 
+WebAdminApp.post '/api/config/addcommand.?:format?' do
+  log = get_logger
+  addcommand = {}
+  format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
+  log.call "API : config, verb : POST, route : addcommand, format : #{format}"
+  res = get_config.add_record :record => YAML::load(request.body.read), :type => :commands, :key => :name, :clean => true
+  case res[:status]
+  when :success
+    rehash_daemon
+    addcommand = splash_return case: :quiet_exit, :more => "add command done"
+  when :already_exist
+    addcommand = splash_return case: :already_exist, :more => "add command twice not allowed"
+  when :failure
+    addpraddcommandocess = splash_return case: :configuration_error, :more => "add command failed"
+    addcommand[:data] = res
+  end
+  content_type format
+  format_response(addcommand, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+end
+
 
 
 WebAdminApp.delete '/api/config/deletelog/:label.?:format?' do
@@ -72,6 +94,7 @@ WebAdminApp.delete '/api/config/deletelog/:label.?:format?' do
   res = get_config.delete_record :type => :logs, key: :label, label: params[:label].to_sym
   case res[:status]
   when :success
+    rehash_daemon
     deletelog = splash_return case: :quiet_exit, :more => "delete log done"
   when :not_found
     deletelog = splash_return case: :not_found, :more => "nothing done for logs"
@@ -92,6 +115,7 @@ WebAdminApp.delete '/api/config/deleteprocess/:process.?:format?' do
   res = get_config.delete_record :type => :processes, :key => :process, process: params[:process].to_sym
   case res[:status]
   when :success
+    rehash_daemon
     deleteprocess = splash_return case: :quiet_exit, :more => "delete process done"
   when :not_found
     deleteprocess = splash_return case: :not_found, :more => "nothing done for processes"
@@ -101,3 +125,24 @@ WebAdminApp.delete '/api/config/deleteprocess/:process.?:format?' do
   content_type format
   format_response(deleteprocess, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
 end
+
+WebAdminApp.delete '/api/config/deletecommand/:command.?:format?' do
+  log = get_logger
+  format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
+  log.call "API : config, verb : DELETE, route : deletecommand, format : #{format}"
+  deletecommand = {}
+  cmdrec = Splash::Commands::CmdRecords::new params[:command].to_sym
+  cmdrec.clear
+  res = get_config.delete_record :type => :commands, :key => :name, name: params[:command].to_sym
+  case res[:status]
+  when :success
+    rehash_daemon
+    deletecommand = splash_return case: :quiet_exit, :more => "delete command done"
+  when :not_found
+    deletecommand = splash_return case: :not_found, :more => "nothing done for commands"
+  else
+    deletecommand = splash_return case: :configuration_error, :more => "delete command failed"
+  end
+  content_type format
+  format_response(deletecommand, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+end

data/lib/splash/webadmin/main.rb

@@ -9,6 +9,7 @@ class WebAdminApp < Sinatra::Base
   include Splash::Daemon::Controller
   include Splash::Logs
   include Splash::Processes
+  include Splash::Transports
 
   set :server, 'thin'
   set :port, get_config.webadmin_port
@@ -21,7 +22,18 @@ class WebAdminApp < Sinatra::Base
     rehash_config
   end
 
-
+  def rehash_daemon
+    status = get_processes({ :pattern => get_config.daemon_process_name}).empty?
+    if status == false then
+      transport = get_default_client
+      unless transport.class == Hash  and transport.include? :case then
+        transport.publish queue: "splash.#{Socket.gethostname}.input",
+                          message: { :verb => :reset,
+                            :return_to => :ignore,
+                            :queue => "splash.#{Socket.gethostname}.input" }.to_yaml
+      end
+    end
+  end
 
 end
 

data/lib/splash/webadmin/portal/controllers/commands.rb

@@ -1,9 +1,107 @@
-WebAdminApp.get '/commands' do
+WebAdminApp.get '/commands/?:status?/?:command?' do
   get_menu 2
   log = get_logger
   log.call "WEB : commands, verb : GET, controller : /commands"
   url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/commands/list.yml"
   raw = RestClient::Request.execute(method: 'GET', url: url,timeout: 10)
   @data = YAML::load(raw)[:data]
+  @command_failed = params[:command] if params[:status] == 'failure'
+  @command_saved = params[:command] if params[:status] == 'success'
   slim :commands, :format => :html
 end
+
+WebAdminApp.get '/get_command_history/:command' do
+  get_menu 2
+  log = get_logger
+  log.call "WEB : commands, verb : GET, controller : /get_command_history/:command"
+  @data = {}
+  url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/commands/history/#{params[:command].to_s}.yml"
+  raw = RestClient::Request.execute(method: 'GET', url: url,timeout: 10)
+  res = YAML::load(raw)
+  @data = res[:data] if res[:status] == :success
+  @command = params[:command].to_s
+  slim :command_history, :format => :html
+end
+
+WebAdminApp.get '/add_modify_command/?:command?' do
+  get_menu 2
+  log = get_logger
+  log.call "WEB : commands, verb : GET, controller : /add_modify_command/?:command?"
+  @data = {}
+  if params[:command] then
+    url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/commands/show/#{params[:command].to_s}.yml"
+    raw = RestClient::Request.execute(method: 'GET', url: url,timeout: 10)
+    res = YAML::load(raw)
+    @data = res[:data] if res[:status] == :success
+    if @data[:retention].class == Hash then
+      prov = @data[:retention].flatten.reverse.join(' ')
+      @data[:retention] = prov
+    end
+    if @data[:schedule].class == Hash then
+      prov = @data[:schedule].flatten.join(' ')
+      @data[:schedule] = prov
+    end
+    if @data[:delegate_to].class == Hash then
+      prov = "#{@data[:delegate_to][:remote_command]}@#{@data[:delegate_to][:host]}"
+      @data[:delegate_to] = prov
+    end
+    @data[:old_command] = params[:command].to_s
+  end
+  slim :command_form, :format => :html
+end
+
+
+WebAdminApp.post '/save_command' do
+  get_menu 2
+  log = get_logger
+  log.call "WEB : commands, verb : POST, controller : /save_command"
+  data = {}
+  unless params[:retention].blank?
+    value, key = params[:retention].split(' ')
+    key = (key.nil?)? :days : key.to_sym
+    value = value.to_i
+    key = :days if key == :day
+    key = :hours if key == :hour
+    if [:hours,:days].include? key then
+      data[:retention] = {key => value}
+    end
+  end
+
+  unless params[:schedule].blank?
+    key, value = params[:schedule].split(' ')
+    key = key.to_sym unless key.nil?
+    value = '' if value.nil?
+    if [:in,:every,:at].include? key and value.match(/\d+[m,d,s,h]/) then
+      data[:schedule] = {key => value }
+    end
+  end
+
+  unless params[:delegate_to].blank?
+    key, value = params[:delegate_to].split('@')
+    unless  key.blank? or value.blank? then
+      data[:delegate_to] = {:remote_command => key.to_sym, :host => value.to_sym }
+    end
+  end
+
+  data[:desc] = params[:desc]
+  data[:command] = params[:command] unless params[:command].blank?
+  data[:on_failure] = params[:on_failure].to_sym unless params[:on_failure].blank?
+  data[:on_success] = params[:on_success].to_sym unless params[:on_success].blank?
+  data[:user] = params[:user] unless params[:user].blank?
+  data[:name] = params[:name].split(' ').first.to_sym
+  puts params.to_yaml
+  puts data.to_yaml
+  redirect "/command/failure/#{params[:name].to_s}" if data[:command].blank? and data[:delegate_to].blank?
+  if params[:update] then
+    url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/config/deletecommand/#{params[:old_command]}"
+    raw = RestClient::Request.execute(method: 'DELETE', url: url,timeout: 10)
+  end
+  url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/config/addcommand.yml"
+  raw = RestClient::Request.execute(method: 'POST', url: url,timeout: 10, payload: data.to_yaml)
+  res = YAML::load(raw)
+  if res[:status] == :success then
+    redirect "/commands/success/#{params[:name].to_s}"
+  else
+    redirect "/commands/failure/#{params[:name].to_s}"
+  end
+end

data/lib/splash/webadmin/portal/controllers/logs.rb

@@ -29,6 +29,10 @@ WebAdminApp.get '/add_modify_log/?:label?' do
     res = YAML::load(raw)
     @data = res[:data] if res[:status] == :success
     @data[:old_label] = params[:label].to_s
+    if @data[:retention].class == Hash then
+      prov = @data[:retention].flatten.reverse.join(' ')
+      @data[:retention] = prov
+    end
   end
   slim :log_form, :format => :html
 end
@@ -50,11 +54,21 @@ end
 WebAdminApp.post '/save_log' do
   get_menu 0
   log = get_logger
-  log.call "WEB : logs, verb : POST, controller : /save_log/?:label?"
+  log.call "WEB : logs, verb : POST, controller : /save_log "
   data = {}
+  unless params[:retention].blank?
+    value, key = params[:retention].split(' ')
+    key = (key.nil?)? :days : key.to_sym
+    value = value.to_i
+    key = :days if key == :day
+    key = :hours if key == :hour
+    if [:hours,:days].include? key then
+      data[:retention] = {key => value}
+    end
+  end
   data[:log] = params[:log]
   data[:pattern] = params[:pattern]
-  data[:label] = params[:label].to_sym
+  data[:label] = params[:label].split(' ').first.to_sym
   if params[:update] then
     url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/config/deletelog/#{params[:old_label]}"
     raw = RestClient::Request.execute(method: 'DELETE', url: url,timeout: 10)

data/lib/splash/webadmin/portal/controllers/processes.rb

@@ -27,6 +27,10 @@ WebAdminApp.get '/add_modify_process/?:process?' do
     raw = RestClient::Request.execute(method: 'GET', url: url,timeout: 10)
     res = YAML::load(raw)
     @data = res[:data] if res[:status] == :success
+    if @data[:retention].class == Hash then
+      prov = @data[:retention].flatten.reverse.join(' ')
+      @data[:retention] = prov
+    end
     if @data[:patterns].class == Array then
       prov = @data[:patterns].join('|')
       @data[:patterns] = prov
@@ -53,10 +57,20 @@ end
 WebAdminApp.post '/save_process' do
   get_menu 1
   log = get_logger
-  log.call "WEB : processes, verb : POST, controller : /save_process/?:process?"
+  log.call "WEB : processes, verb : POST, controller : /save_process"
   data = {}
   data[:patterns] = params[:patterns].split('|')
-  data[:process] = params[:process].to_sym
+  data[:process] = params[:process].split(' ').first.to_sym
+  unless params[:retention].blank?
+    value, key = params[:retention].split(' ')
+    key = (key.nil?)? :days : key.to_sym
+    value = value.to_i
+    key = :days if key == :day
+    key = :hours if key == :hour
+    if [:hours,:days].include? key then
+      data[:retention] = {key => value}
+    end
+  end
   if params[:update] then
     url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/config/deleteprocess/#{params[:old_process]}"
     raw = RestClient::Request.execute(method: 'DELETE', url: url,timeout: 10)

data/lib/splash/webadmin/portal/views/command_form.slim

@@ -0,0 +1,45 @@
+- unless @data.empty?
+  h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Modify Splash command definition : #{@data[:process]}
+- else
+  h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Add new Splash command definition
+
+script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.2/jquery.validate.min.js"
+
+form.uk-form.uk-form-horizontal#query action="/save_command" method="POST"
+  div.uk-text-bold Definition
+  label.uk-form-label for="name" Name
+  <input class="uk-form-width-large" id="name" type="text" placeholder="name" name="name" value="#{@data[:name].to_s}" required>
+  div &nbsp;
+  label.uk-form-label for="command" Command
+  <input class="uk-form-width-large" id="command" type="text" placeholder="command" name="command" value="#{@data[:command].to_s}">
+  div &nbsp;
+  label.uk-form-label for="desc" Description
+  <input class="uk-form-width-large" id="desc" type="text" placeholder="description" name="desc" value="#{@data[:desc]}" required>
+  div &nbsp;
+  label.uk-form-label for="desc" Become User
+  <input class="uk-form-width-large" id="user" type="text" placeholder="user" name="user" value="#{@data[:user]}">
+  div &nbsp;
+  label.uk-form-label for="retention" Retention (Like "2 hours, 2 days")
+  <input class="uk-form-width-large" id="retention" type="text" placeholder="retention" name="retention" value="#{@data[:retention]}">
+  div &nbsp;
+  label.uk-form-label for="schedule" Scheduling (Like "'every 10m', 'in 1h', 'at 12:00'")
+  <input class="uk-form-width-large" id="schedule" type="text" placeholder="scheduling" name="schedule" value="#{@data[:schedule]}">
+  div &nbsp;
+  label.uk-form-label for="delegate_to" Delegation (Like "task_name@hostname")
+  <input class="uk-form-width-large" id="delegate_to" type="text" placeholder="delegation" name="delegate_to" value="#{@data[:delegate_to]}">
+  div &nbsp;
+  div &nbsp;
+  div.uk-text-bold Callbacks
+  label.uk-form-label for="on_success" On success
+  <input class="uk-form-width-large" id="on_success" type="text" placeholder="on success" name="on_success" value="#{@data[:on_success]}">
+  div &nbsp;
+  label.uk-form-label for="on_success" On failure
+  <input class="uk-form-width-large" id="on_failure" type="text" placeholder="on failure" name="on_failure" value="#{@data[:on_failure]}">
+  div &nbsp;
+  - unless @data.empty?
+    input type="hidden" name="update" value="true"
+    input type="hidden" name="old_command" value="#{@data[:old_command].to_s}"
+  div.uk-align-right
+    input.uk-button.uk-button-small-primary type="submit" value="Submit"
+javascript:
+  $("#query").validate();

data/lib/splash/webadmin/portal/views/command_history.slim

@@ -0,0 +1,27 @@
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;History for command #{@command} executions and monitoring
+
+
+-
+div.uk-width-medium-1-1
+  div.uk-panel.uk-panel-box
+    span.uk-text-large.uk-text-bold List of records
+    br
+    table#logrecords.uk-table.uk-table-hover.uk-table-striped
+      thead
+        tr
+          th Start Date
+          th End Date
+          th Execution time (sec)
+          th Status
+          th STDOUT empty ?
+          th STDERR empty ?
+
+      tbody
+        - @data.reverse.each do |key|
+          tr class="#{(key[key.keys.first][:status].to_s.split.last == "0")? 'uk-text-success' : 'uk-text-danger'}"
+            td  #{key.keys.first}
+            td  #{key[key.keys.first][:end_date]}
+            td  #{key[key.keys.first][:exec_time]}
+            td  #{key[key.keys.first][:status].to_s}
+            td  #{key[key.keys.first][:stdout].empty?}
+            td  #{key[key.keys.first][:stderr].empty?}

data/lib/splash/webadmin/portal/views/commands.slim

@@ -1,14 +1,49 @@
 h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Commands configured in Splash
 
+- unless @log_saved.nil?
+  javascript:
+    UIkit.notify("Command definition #{@command_saved} saved", {status:'success'});
+- unless @log_failed.nil?
+  javascript:
+    UIkit.notify("Command definition #{@command_saved} not saved", {status:'danger'});
+
+javascript:
+  $(document).on( 'click','input.delete-command',function(){
+    var id = this.id;
+    var url = "/api/config/deletecommand/" +  id + ".json";
+    UIkit.modal.confirm('Are you sure?', function(){
+      console.debug(url)
+      $.ajax({
+        url: url,
+        type: 'DELETE',
+        success: function( data ) {
+          console.debug(data)
+          if (data['status'] == 'success') {
+            $('div#commandrecords h3#' + id).remove();
+            $('div#commandrecords div#' + id).remove();
+            UIkit.notify("Deleting log for " + id + " done", {status:'success'});
+          }
+          else
+          {
+            UIkit.notify("Deleting log for " + id + " failed !", {status:'danger'});
+          }
+        },
+        error: function(e) {
+          UIkit.notify("Deleting log for " + id + " failed !", {status:'danger'});
+        }
+      });
+    });
+  });
+
 div.uk-width-medium-1-1
   div.uk-panel.uk-panel-box
     span.uk-text-large.uk-text-bold List of commands availables
     br
 
-    div.uk-accordion(data-uk-accordion)
-      - @data.each do |command,content|
-        h3.uk-accordion-title <b>Name</b> : #{command}
-        div.uk-accordion-content
+    div#commandrecords.uk-accordion(data-uk-accordion)
+      - @data.reverse.each do |command|
+        h3.uk-accordion-title id="#{command[:name].to_s}" <i class="uk-icon-play-circle-o"></i>&nbsp;<b>Name</b> : #{command[:name]}
+        div.uk-accordion-content id="#{command[:name].to_s} "
           table.uk-table.uk-table-hover.uk-table-striped
             thead
               tr
@@ -19,31 +54,46 @@ div.uk-width-medium-1-1
                 td
                   dl.uk-description-list-horizontal
                     dt <i class="uk-icon-th-list"></i>&nbsp;Description
-                    dd #{content[:desc]}
-                    - if content[:command]
+                    dd #{command[:desc]}
+                    - if command[:command]
                       dt <i class="uk-icon-cog"></i>&nbsp;Command Line
-                      dd #{content[:command]}
-                    - if content[:schedule]
+                      - if command[:delegate_to]
+                        dd.uk-text-danger #{command[:command]} <i>(ignored because delegate_to is set)</i>
+                      - else
+                        dd #{command[:command]}
+                    - if command[:schedule]
                       dt <i class="uk-icon-calendar"></i>&nbsp;Schedule
                       dd
                         <ul>
-                          <li> <b><i>Type</b></i> : #{content[:schedule].keys.first}</li>
-                          <li> <b><i>Value</b></i> : #{content[:schedule].values.first}</li>
+                          <li> <b><i>Type</b></i> : #{command[:schedule].keys.first}</li>
+                          <li> <b><i>Value</b></i> : #{command[:schedule].values.first}</li>
                         </ul>
-                    - if content[:on_success]
+                    - if command[:on_success]
                       dt <i class="uk-icon-check"></i>&nbsp;Execute on success
-                      dd #{content[:on_success]}
-                    - if content[:on_failure]
+                      dd #{command[:on_success]}
+                    - if command[:on_failure]
                       dt <i class="uk-icon-bolt"></i>&nbsp;Execute on failure
-                      dd #{content[:on_failure]}
-                    - if content[:user]
+                      dd #{command[:on_failure]}
+                    - if command[:user]
                       dt <i class="uk-icon-user"></i>&nbsp;become user
-                      dd #{content[:user]}
-                    - if content[:delegate_to]
+                      dd #{command[:user]}
+                    - if command[:delegate_to]
                       dt <i class="uk-icon-chevron-circle-right"></i>&nbsp;Remote delegation
                       dd
                         <ul>
-                          <li> <i><b>Host</b></i> : #{content[:delegate_to][:host]}</li>
-                          <li> <b><i>Remote Command</b></i> : #{content[:delegate_to][:remote_command]}</li>
+                          <li> <i><b>Host</b></i> : #{command[:delegate_to][:host]}</li>
+                          <li> <b><i>Remote Command</b></i> : #{command[:delegate_to][:remote_command]}</li>
                         </ul>
+                    - if command[:retention].class == Hash
+                      dt <i class="uk-icon-calendar-minus-o"></i>&nbsp;History retention
+                      dd #{command[:retention].flatten.reverse.join(' ')}
                 td
+                  input.delete-command.uk-button.uk-button-mini.uk-button-danger id="#{command[:name].to_s}" value="Delete"
+                  br
+                  input.modify-process.uk-button.uk-button-mini.uk-button-primary id="#{command[:name].to_s}" value="Modify" onclick="location.href='/add_modify_command/#{command[:name].to_s}';"
+                  br
+                  input.history-command.uk-button.uk-button-mini.uk-button-primary id="#{command[:name].to_s}" value="History" onclick="location.href='/get_command_history/#{command[:name].to_s}';"
+  div.uk-align-right
+    form.uk-form.uk-form-horizontal#query action="/add_modify_command" method="GET"
+      div &nbsp;
+      input.add-process.uk-button type="submit" value="Add new process"

data/lib/splash/webadmin/portal/views/log_form.slim

@@ -15,6 +15,9 @@ form.uk-form.uk-form-horizontal#query action="/save_log" method="POST"
   label.uk-form-label for="log" Log file
   <input class="uk-form-width-large" id="log" type="text" placeholder="log" name="log" value="#{@data[:log]}" required>
   div &nbsp;
+  label.uk-form-label for="retention" Retention (Like "2 hours, 2 days")
+  <input class="uk-form-width-large" id="retention" type="text" placeholder="retention" name="retention" value="#{@data[:retention]}">
+  div &nbsp;
   - unless @data.empty?
     input type="hidden" name="update" value="true"
     input type="hidden" name="old_label" value="#{@data[:old_label].to_s}"

data/lib/splash/webadmin/portal/views/log_history.slim

@@ -15,8 +15,8 @@ div.uk-width-medium-1-1
           th Nb Errors
           th Full Nb of lines
       tbody
-        - @data.each do |key|
-          tr
+        - @data.reverse.each do |key|
+          tr class="#{(key[key.keys.first][:status] == :clean)? 'uk-text-success' : 'uk-text-danger'}"
             td  #{key.keys.first}
             td  #{key[key.keys.first][:file]}
             td  #{key[key.keys.first][:status]}

data/lib/splash/webadmin/portal/views/logs.slim

@@ -74,23 +74,25 @@ div.uk-width-medium-1-1
       tbody
         - @data.each do |log|
           tr id="#{log[:label].to_s}"
-            td <b>Label</b> : #{log[:label]}
+            td <i class="uk-icon-tag"></i>&nbsp;<b>Label</b> : #{log[:label]}
             td
               ul
-                li <b>File</b> : #{log[:log]}
-                li <b>Pattern</b> : #{log[:pattern]}
+                li <i class="uk-icon-file"></i>&nbsp;<b>File</b> : #{log[:log]}
+                li <i class="uk-icon-binoculars"></i>&nbsp;<b>Pattern</b> : #{log[:pattern]}
+                - if log[:retention].class == Hash
+                  li <i class="uk-icon-calendar-minus-o"></i>&nbsp;<b>History retention</b> : #{log[:retention].flatten.reverse.join(' ')}
             td
               - if @result[log[:label]][:status] == :missing
                 div.uk-badge.uk-badge-warning missing
               - if @result[log[:label]][:status] == :clean
                 div.uk-badge.uk-badge-success success
                 ul
-                  li <b>Lines count</b> : #{@result[log[:label]][:lines]}
+                  li <i class="uk-icon-asterisk"></i>&nbsp;<b>Lines count</b> : #{@result[log[:label]][:lines]}
               - if @result[log[:label]][:status] == :matched
                 div.uk-badge.uk-badge-danger matched
                 ul
-                  li <b>Lines count</b> : #{@result[log[:label]][:lines]}
-                  li <b class="uk-text-danger">Matchs count : #{@result[log[:label]][:count]} </b>
+                  li <i class="uk-icon-asterisk"></i>&nbsp;<b>Lines count</b> : #{@result[log[:label]][:lines]}
+                  li <i class="uk-icon-bolt"></i>&nbsp;<b class="uk-text-danger">Matchs count : #{@result[log[:label]][:count]} </b>
             td
               input.delete-log.uk-button.uk-button-mini.uk-button-danger id="#{log[:label].to_s}" value="Delete"
               br

data/lib/splash/webadmin/portal/views/process_form.slim

@@ -9,9 +9,12 @@ form.uk-form.uk-form-horizontal#query action="/save_process" method="POST"
   label.uk-form-label for="process" Process
   <input class="uk-form-width-large" id="process" type="text" placeholder="process" name="process" value="#{@data[:process].to_s}" required>
   div &nbsp;
-  label.uk-form-label for="patterns" Patterns
+  label.uk-form-label for="patterns" Patterns (separator is "|")
   <input class="uk-form-width-large" id="patterns" type="text" placeholder="patterns" name="patterns" value="#{@data[:patterns]}" required>
     div &nbsp;
+    label.uk-form-label for="retention" Retention (Like "2 hours, 2 days")
+    <input class="uk-form-width-large" id="retention" type="text" placeholder="retention" name="retention" value="#{@data[:retention]}">
+    div &nbsp;
   - unless @data.empty?
     input type="hidden" name="update" value="true"
     input type="hidden" name="old_process" value="#{@data[:old_process].to_s}"

data/lib/splash/webadmin/portal/views/process_history.slim

@@ -15,10 +15,10 @@ div.uk-width-medium-1-1
           th % CPU
           th % MEM
       tbody
-        - @data.each do |key|
-          tr
+        - @data.reverse.each do |key|
+          tr class="#{(key[key.keys.first][:status] == :running)? 'uk-text-success' : 'uk-text-danger'}"
             td  #{key.keys.first}
             td  #{key[key.keys.first][:process]}
             td  #{key[key.keys.first][:status]}
-            td  #{key[key.keys.first][:cpu]}
-            td  #{key[key.keys.first][:mem]}
+            td  #{key[key.keys.first][:cpu_percent]}
+            td  #{key[key.keys.first][:mem_percent]}

data/lib/splash/webadmin/portal/views/processes.slim

@@ -72,20 +72,23 @@ div.uk-width-medium-1-1
         tbody
           - @data.each do |process|
             tr id="#{process[:process].to_s}"
-              td <b>Process</b> : #{process[:process]}
+              td <i class="uk-icon-cog"></i>&nbsp;<b>Process</b> : #{process[:process]}
               td
-                span.uk-text-bold Patterns
+                - if process[:retention].class == Hash
+                  div <i class="uk-icon-calendar-minus-o"></i>&nbsp;<b>History retention</b> : #{process[:retention].flatten.reverse.join(' ')}
+                span.uk-text-bold <i class="uk-icon-binoculars"></i>&nbsp; Patterns
                 ul
                   - process[:patterns].each do |pattern|
                     li= pattern
+
               td
                 - if @result[process[:process]][:status] == :inexistant
                   div.uk-badge.uk-badge-danger not running
                 - if @result[process[:process]][:status] == :running
                   div.uk-badge.uk-badge-success running
                   ul
-                    li <b>CPU usage</b> : #{@result[process[:process]][:cpu]}
-                    li <b>MEM usage</b> : #{@result[process[:process]][:mem]}
+                    li <i class="uk-icon-percent"></i>&nbsp;<b>CPU usage</b> : #{@result[process[:process]][:cpu]}
+                    li <i class="uk-icon-percent"></i>&nbsp;<b>MEM usage</b> : #{@result[process[:process]][:mem]}
               td
                 input.delete-process.uk-button.uk-button-mini.uk-button-danger id="#{process[:process].to_s}" value="Delete"
                 br

data/lib/splash/webadmin.rb

@@ -20,6 +20,7 @@ module Splash
       # Start the Splash Daemon
       # @param [Hash] options
       # @option options [Symbol] :quiet activate quiet mode for log (limit to :fatal)
+      # @option options [Symbol] :foreground run webadmin in foreground
       # @return [Hash] Exiter Case (:quiet_exit, :already_exist, :unknown_error or other)
       def startweb(options = {})
         require 'splash/webadmin/main'
@@ -37,7 +38,8 @@ module Splash
           daemon_config = {:description => config.webadmin_process_name,
               :pid_file => config.webadmin_full_pid_path,
               :stdout_trace => config.webadmin_full_stdout_trace_path,
-              :stderr_trace => config.webadmin_full_stderr_trace_path
+              :stderr_trace => config.webadmin_full_stderr_trace_path,
+              :foreground => options[:foreground]
             }
 
           ["int","term","hup"].each do |type| daemon_config["sig#{type}_handler".to_sym] = Proc::new {  WebAdminApp.quit! } end

data/templates/Dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:latest
+RUN gem install prometheus-splash
+RUN splash conf set
+EXPOSE 9234
+CMD ["splash","web", "start" ,"-F"]

data/templates/docker-compose.yml

@@ -0,0 +1,14 @@
+version: "3"
+
+services:
+  redis:
+    image: redis:latest
+
+  splash:
+    build: .
+    env_file: .env
+    ports:
+      - 9234:9234
+    depends_on:
+      - redis
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Romain GEORGES
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -431,6 +431,7 @@ files:
 - lib/splash/loggers/dual.rb
 - lib/splash/loggers/web.rb
 - lib/splash/logs.rb
+- lib/splash/monkeys.rb
 - lib/splash/processes.rb
 - lib/splash/sequences.rb
 - lib/splash/templates.rb
@@ -464,6 +465,8 @@ files:
 - lib/splash/webadmin/portal/public/images/logo_splash.png
 - lib/splash/webadmin/portal/public/images/logo_splash_reduce.png
 - lib/splash/webadmin/portal/public/images/logo_splash_tiny.png
+- lib/splash/webadmin/portal/views/command_form.slim
+- lib/splash/webadmin/portal/views/command_history.slim
 - lib/splash/webadmin/portal/views/commands.slim
 - lib/splash/webadmin/portal/views/documentation.slim
 - lib/splash/webadmin/portal/views/home.slim
@@ -483,6 +486,8 @@ files:
 - prometheus-splash.gemspec
 - spec/helpers_spec.rb
 - spec/templates_spec.rb
+- templates/.env
+- templates/Dockerfile
 - templates/ansible-splash/Vagrantfile
 - templates/ansible-splash/deploy.yml
 - templates/ansible-splash/group_vars/DEV.yml
@@ -505,6 +510,7 @@ files:
 - templates/ansible-splash/roles/supervision_master/tasks/main.yml
 - templates/ansible-splash/roles/supervision_master/templates/alertmanager.yml.j2
 - templates/ansible-splash/roles/supervision_master/templates/prometheus.yml.j2
+- templates/docker-compose.yml
 - templates/report.txt
 - templates/splashd.service
 - test.sh
@@ -513,7 +519,7 @@ homepage: https://github.com/Ultragreen/prometheus-splash
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -529,7 +535,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Supervision with Prometheus of Logs and Asynchronous tasks orchestration
   for Services or Hosts