prometheus-splash 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60d3aa2e635dbea8022a1804e9886e495648ce777db2293442ae3a16bae7e25a
-  data.tar.gz: 14912be5e4171daae1ee7706f98ac7974c43a96d56e7daa58a1e9a40d46b60ee
+  metadata.gz: a1089bb88ba3cb916cae48b6253559c5542028ab7752d9c08d5a90cb95a45c9f
+  data.tar.gz: 90280e53cbf7124b191707fd089afcd48f29bbf68d332fc2acc7865efc2f70b4
 SHA512:
-  metadata.gz: d66a48e63fd8940c6343113511e1ad91531037013a042a79348a755de74e6447a791854fa2ec82461c38695370402e30790ac7660fd75c0cc82c0f5ef788701d
-  data.tar.gz: 9d59657c45219e31af8a6c85fc137925ee03ccecc7a98e62848ba28540ec2e39df674fcd391b51334c4bc1252de487a5a55110a286707fee9a38e54bf85a3cfc
+  metadata.gz: c50f695e45c368955df4c919faa179c32ae333ce9d0e5676e9da0b1497893d08c526a2ba0a07fdaa7172972831fa43e7a16522404e112d1fdae156a1dfc2fbac
+  data.tar.gz: c8923535e3af5102bb02c3571cc29a220d83a02e2aa71885ab6022800ad3144361e583302de6021d690922c8f49c503a0e5eb3198cb1e7fa745377727462dae8

data/CHANGELOG.md

@@ -151,7 +151,14 @@
 * reshash config and reset + grammar and Cli
 * refacto config
 
-## V0.8.1
+## V 0.8.1
 
 ### FEATURE
-* #55 historisation for reports for all
+* full Web UI features for Logs (R/W)
+* API Logs Full
+
+## V 0.8.2
+
+### FIX
+* WebAdmin UI bugs and cosmetics
+* API (constants CLONE for exiter)

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.1
+* DOC yardoc : https://www.rubydoc.info/gems/prometheus-splash/0.8.2
 
 Prometheus Logs and Batchs supervision over PushGateway
 

data/lib/splash/cli/logs.rb

@@ -62,6 +62,9 @@ module CLISplash
 
     end
 
+
+    
+
     # Thor method : display a specific Splash configured log monitor
     desc "show LOG", "show Splash configured log monitoring for LOG"
     def show(logrecord)

data/lib/splash/config.rb

@@ -11,58 +11,124 @@ module Splash
     include Splash::ConfigUtilities
 
 
+    class ConfigLinter
+      def initialize
+        @lints_present = {:logs => [:label, :log, :pattern ]}
+        @lints_types = {:logs => {:label => Symbol, :log => String, :pattern => String, :retention => Hash}}
+      end
+
+      def verify(options ={})
+        status = :success
+        missings = []
+        type_errors = []
+        useless = []
+        options[:record].each do |key,value|
+          useless.push key unless @lints_present[options[:type]].include? key or @lints_types[options[:type]].keys.include? key
+          type_errors.push key if @lints_types[options[:type]][key] != value.class and (@lints_present[options[:type]].include? key or @lints_types[options[:type]].keys.include? key)
+        end
+        @lints_present[options[:type]].each do |item|
+          missings.push item unless options[:record].keys.include? item
+        end
+
+        status = :failure if (missings.count > 0) or (type_errors.count > 0)
+        return {:missings => missings, :type_errors => type_errors, :useless => useless, :status => status}
+      end
+
+    end
+
     # Class to manage configuration in Splash from Splash::Constants override by Yaml CONFIG
     class Configuration < Hash
       include Splash::Constants
 
+      attr_accessor :config_from_file
+
       # constructor : read config file and map against Constants
       def initialize(config_file=CONFIG_FILE)
-        config_from_file = readconf config_file
+        @config_file = config_file
+        hash_config_to_default
+
+      end
+
+
+      def hash_config_to_default
+        @config_from_file = readconf @config_file
         self[:version] = VERSION
         self[:author] = "#{AUTHOR} <#{EMAIL}>"
         self[:copyright] = "#{COPYRIGHT} #{LICENSE}"
 
-        self[:prometheus_url] = (config_from_file[:prometheus][:url])? config_from_file[:prometheus][:url] : PROMETHEUS_URL
-        self[:prometheus_pushgateway_url] = (config_from_file[:prometheus][:pushgateway])? config_from_file[:prometheus][:pushgateway] : PROMETHEUS_PUSHGATEWAY_URL
-        self[:prometheus_alertmanager_url] = (config_from_file[:prometheus][:alertmanager])? config_from_file[:prometheus][:alertmanager] : PROMETHEUS_ALERTMANAGER_URL
+        self[:prometheus_url] = (@config_from_file[:prometheus][:url])? @config_from_file[:prometheus][:url] : PROMETHEUS_URL
+        self[:prometheus_pushgateway_url] = (@config_from_file[:prometheus][:pushgateway])? @config_from_file[:prometheus][:pushgateway] : PROMETHEUS_PUSHGATEWAY_URL
+        self[:prometheus_alertmanager_url] = (@config_from_file[:prometheus][:alertmanager])? @config_from_file[:prometheus][:alertmanager] : PROMETHEUS_ALERTMANAGER_URL
 
-        self[:daemon_process_name] = (config_from_file[:daemon][:process_name])? config_from_file[:daemon][:process_name] : DAEMON_PROCESS_NAME
-        self[:daemon_logmon_scheduling] = (config_from_file[:daemon][:logmon_scheduling])? config_from_file[:daemon][:logmon_scheduling] : DAEMON_LOGMON_SCHEDULING
-        self[:daemon_metrics_scheduling] = (config_from_file[:daemon][:metrics_scheduling])? config_from_file[:daemon][:metrics_scheduling] : DAEMON_METRICS_SCHEDULING
-        self[:daemon_procmon_scheduling] = (config_from_file[:daemon][:procmon_scheduling])? config_from_file[:daemon][:procmon_scheduling] : DAEMON_PROCMON_SCHEDULING
-        self[:daemon_pid_file] = (config_from_file[:daemon][:files][:pid_file])? config_from_file[:daemon][:files][:pid_file] : DAEMON_PID_FILE
-        self[:daemon_stdout_trace] = (config_from_file[:daemon][:files][:stdout_trace])? config_from_file[:daemon][:files][:stdout_trace] : DAEMON_STDOUT_TRACE
-        self[:daemon_stderr_trace] = (config_from_file[:daemon][:files][:stderr_trace])? config_from_file[:daemon][:files][:stderr_trace] : DAEMON_STDERR_TRACE
+        self[:daemon_process_name] = (@config_from_file[:daemon][:process_name])? @config_from_file[:daemon][:process_name] : DAEMON_PROCESS_NAME
+        self[:daemon_logmon_scheduling] = (@config_from_file[:daemon][:logmon_scheduling])? @config_from_file[:daemon][:logmon_scheduling] : DAEMON_LOGMON_SCHEDULING
+        self[:daemon_metrics_scheduling] = (@config_from_file[:daemon][:metrics_scheduling])? @config_from_file[:daemon][:metrics_scheduling] : DAEMON_METRICS_SCHEDULING
+        self[:daemon_procmon_scheduling] = (@config_from_file[:daemon][:procmon_scheduling])? @config_from_file[:daemon][:procmon_scheduling] : DAEMON_PROCMON_SCHEDULING
+        self[:daemon_pid_file] = (@config_from_file[:daemon][:files][:pid_file])? @config_from_file[:daemon][:files][:pid_file] : DAEMON_PID_FILE
+        self[:daemon_stdout_trace] = (@config_from_file[:daemon][:files][:stdout_trace])? @config_from_file[:daemon][:files][:stdout_trace] : DAEMON_STDOUT_TRACE
+        self[:daemon_stderr_trace] = (@config_from_file[:daemon][:files][:stderr_trace])? @config_from_file[:daemon][:files][:stderr_trace] : DAEMON_STDERR_TRACE
 
 
-        self[:webadmin_port] = (config_from_file[:webadmin][:port])? config_from_file[:webadmin][:port] : WEBADMIN_PORT
-        self[:webadmin_ip] = (config_from_file[:webadmin][:ip])? config_from_file[:webadmin][:ip] : WEBADMIN_IP
-        self[:webadmin_proxy] = (config_from_file[:webadmin][:proxy])? config_from_file[:webadmin][:proxy] : WEBADMIN_PROXY
-        self[:webadmin_process_name] = (config_from_file[:webadmin][:process_name])? config_from_file[:webadmin][:process_name] : WEBADMIN_PROCESS_NAME
-        self[:webadmin_pid_file] = (config_from_file[:webadmin][:files][:pid_file])? config_from_file[:webadmin][:files][:pid_file] : WEBADMIN_PID_FILE
-        self[:webadmin_stdout_trace] = (config_from_file[:webadmin][:files][:stdout_trace])? config_from_file[:webadmin][:files][:stdout_trace] : WEBADMIN_STDOUT_TRACE
-        self[:webadmin_stderr_trace] = (config_from_file[:webadmin][:files][:stderr_trace])? config_from_file[:webadmin][:files][:stderr_trace] : WEBADMIN_STDERR_TRACE
+        self[:webadmin_port] = (@config_from_file[:webadmin][:port])? @config_from_file[:webadmin][:port] : WEBADMIN_PORT
+        self[:webadmin_ip] = (@config_from_file[:webadmin][:ip])? @config_from_file[:webadmin][:ip] : WEBADMIN_IP
+        self[:webadmin_proxy] = (@config_from_file[:webadmin][:proxy])? @config_from_file[:webadmin][:proxy] : WEBADMIN_PROXY
+        self[:webadmin_process_name] = (@config_from_file[:webadmin][:process_name])? @config_from_file[:webadmin][:process_name] : WEBADMIN_PROCESS_NAME
+        self[:webadmin_pid_file] = (@config_from_file[:webadmin][:files][:pid_file])? @config_from_file[:webadmin][:files][:pid_file] : WEBADMIN_PID_FILE
+        self[:webadmin_stdout_trace] = (@config_from_file[:webadmin][:files][:stdout_trace])? @config_from_file[:webadmin][:files][:stdout_trace] : WEBADMIN_STDOUT_TRACE
+        self[:webadmin_stderr_trace] = (@config_from_file[:webadmin][:files][:stderr_trace])? @config_from_file[:webadmin][:files][:stderr_trace] : WEBADMIN_STDERR_TRACE
 
 
-        self[:pid_path] = (config_from_file[:paths][:pid_path])? config_from_file[:paths][:pid_path] : PID_PATH
-        self[:trace_path] = (config_from_file[:paths][:trace_path])? config_from_file[:paths][:trace_path] : TRACE_PATH
+        self[:pid_path] = (@config_from_file[:paths][:pid_path])? @config_from_file[:paths][:pid_path] : PID_PATH
+        self[:trace_path] = (@config_from_file[:paths][:trace_path])? @config_from_file[:paths][:trace_path] : TRACE_PATH
 
 
         self[:execution_template_tokens] = EXECUTION_TEMPLATE_TOKENS_LIST
-        self[:execution_template_path] = (config_from_file[:templates][:execution][:path])? config_from_file[:templates][:execution][:path] : EXECUTION_TEMPLATE
+        self[:execution_template_path] = (@config_from_file[:templates][:execution][:path])? @config_from_file[:templates][:execution][:path] : EXECUTION_TEMPLATE
+
+        self[:transports] = {} ; self[:transports].merge! TRANSPORTS_STRUCT ; self[:transports].merge! @config_from_file[:transports] if @config_from_file[:transports]
+        self[:backends] = {} ; self[:backends].merge! BACKENDS_STRUCT ; self[:backends].merge! @config_from_file[:backends] if @config_from_file[:backends]
+        self[:loggers] = {} ; self[:loggers].merge! LOGGERS_STRUCT ; self[:loggers].merge! @config_from_file[:loggers] if @config_from_file[:loggers]
+
+        self[:processes] = (@config_from_file[:processes])? @config_from_file[:processes] : {}
+        self[:logs] = (@config_from_file[:logs])? @config_from_file[:logs] : {}
+        self[:commands] = (@config_from_file[:commands])? @config_from_file[:commands] : {}
+        self[:sequences] = (@config_from_file[:sequences])? @config_from_file[:sequences] : {}
+        self[:transfers] = (@config_from_file[:transfers])? @config_from_file[:transfers] : {}
+      end
 
-        self[:transports] = {} ; self[:transports].merge! TRANSPORTS_STRUCT ; self[:transports].merge! config_from_file[:transports] if config_from_file[:transports]
-        self[:backends] = {} ; self[:backends].merge! BACKENDS_STRUCT ; self[:backends].merge! config_from_file[:backends] if config_from_file[:backends]
-        self[:loggers] = {} ; self[:loggers].merge! LOGGERS_STRUCT ; self[:loggers].merge! config_from_file[:loggers] if config_from_file[:loggers]
 
-        self[:processes] = (config_from_file[:processes])? config_from_file[:processes] : {}
-        self[:logs] = (config_from_file[:logs])? config_from_file[:logs] : {}
-        self[:commands] = (config_from_file[:commands])? config_from_file[:commands] : {}
-        self[:sequences] = (config_from_file[:sequences])? config_from_file[:sequences] : {}
-        self[:transfers] = (config_from_file[:transfers])? config_from_file[:transfers] : {}
+      def add_log(options = {})
+        @config_from_file = readconf @config_file
+        res = ConfigLinter::new.verify(options)
+        if res[:status] == :success then
+          if @config_from_file[:logs].select{|item| item[:label] == options[:record][:label]}.count > 0 then
+            return {:status => :already_exist}
+          else
+            res[:useless].each {|item| options[:record].delete item} if options[:clean]
+            @config_from_file[:logs].push options[:record]
+            writeconf
+            hash_config_to_default
+            return {:status => :success}
+          end
+        else
+          return res
+        end
+      end
+
 
+      def delete_log(options = {})
+        @config_from_file = readconf @config_file
+        unless @config_from_file[:logs].select{|item| item[:label] == options[:label]}.count > 0 then
+          return {:status => :not_found}
+        else
+          @config_from_file[:logs].delete_if {|value| options[:label] == value[:label] }
+          writeconf
+          hash_config_to_default
+          return {:status => :success}
+        end
       end
 
+
       # @!group accessors on configurations Items
 
       # getter for full Config Hash
@@ -272,6 +338,16 @@ module Splash
         return YAML.load_file(file)[:splash]
       end
 
+      # write config to file from @config_from_file
+      # @param [String] file default from CONFIG_FILE
+      # @return [Bool] if ok
+      def writeconf(file = CONFIG_FILE)
+        File.open(file,"w") do |f|
+          data = {}
+          data[:splash] = @config_from_file
+          f.write(data.to_yaml)
+        end
+      end
 
     end
 

data/lib/splash/constants.rb

@@ -7,8 +7,7 @@ module Splash
   module Constants
 
     # Current splash version
-    VERSION = "0.8.1"
-
+    VERSION = "0.8.2"
     # 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/exiter.rb

@@ -60,7 +60,7 @@ module Splash
 
     def splash_return(options = {})
 
-      data = EXIT_MAP[options[:case]]
+      data = EXIT_MAP[options[:case]].clone
       data[:status] = (data[:code]>0)? :failure : :success
       data[:more] = options[:more] if options[:more]
       return data

data/lib/splash/helpers.rb

@@ -340,7 +340,7 @@ module Splash
       response = case format
                  when 'application/json' then JSON.pretty_generate(data)
                  when 'text/x-yaml' then data.to_yaml
-                 else JSON.pretty_generate(data)
+                 else data.to_yaml
                  end
       return response
     end

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

@@ -5,7 +5,7 @@
 WebAdminApp.get '/api/commands/list.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : commands, verb : GET, route : list, format : #{format}"
+  log.call "API : commands, verb : GET, route : list, format : #{format}"
   obj =  splash_return case: :quiet_exit, :more => "Commands list"
   obj[:data] = get_config.commands
   content_type format
@@ -15,7 +15,7 @@ WebAdminApp.get '/api/commands/list.?:format?' do
 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}"
+  log.call "API : commands, verb : GET, route : show, item : #{params[:name]} , format : #{format}"
   commands_recordset = get_config.commands[params[:name].to_sym]
   unless commands_recordset.nil? then
     obj = splash_return case: :quiet_exit

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

@@ -1,10 +1,61 @@
 WebAdminApp.get '/api/config/full.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : config, verb : GET, route : show, format : #{format}"
+  log.call "API : config, verb : GET, route : full, format : #{format}"
   config = get_config.full
-  obj =  splash_return case: :quiet_exit, :more => "logses list"
+  obj =  splash_return case: :quiet_exit, :more => "Show internal Splash Config"
   obj[:data] = config
   content_type format
   format_response(obj, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
 end
+
+WebAdminApp.get '/api/config/fromfile.?:format?' do
+  log = get_logger
+  fromfile = {}
+  format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
+  log.call "API : config, verb : GET, route : fromfile, format : #{format}"
+  config = get_config.config_from_file
+  fromfile =  splash_return case: :quiet_exit, :more => "Show config from file"
+  fromfile[:data] = config
+  content_type format
+  format_response(fromfile, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+end
+
+
+WebAdminApp.post '/api/config/addlog.?:format?' do
+  log = get_logger
+  addlog = {}
+  format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
+  log.call "API : config, verb : POST, route : addlog, format : #{format}"
+  res = get_config.add_log :record => YAML::load(request.body.read), :type => :logs, :clean => true
+  case res[:status]
+  when :success
+    addlog = splash_return case: :quiet_exit, :more => "add logs"
+  when :already_exist
+    addlog = splash_return case: :already_exist, :more => "add logs"
+  when :failure
+    addlog = splash_return case: :configuration_error, :more => "add logs"
+    addlog[:data] = res
+  end
+  content_type format
+  format_response(addlog, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+end
+
+
+WebAdminApp.delete '/api/config/deletelog/:label.?:format?' do
+  log = get_logger
+  format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
+  log.call "API : config, verb : DELETE, route : deletelog, format : #{format}"
+  res = get_config.delete_log label: params[:label].to_sym
+  deletelog = {}
+  case res[:status]
+  when :success
+    deletelog = splash_return case: :quiet_exit, :more => "delete logs"
+  when :not_found
+    deletelog = splash_return case: :not_found, :more => "delete logs"
+  else
+    deletelog = splash_return case: :configuration_error, :more => "delete logs"
+  end
+  content_type format
+  format_response(deletelog, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+end

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

@@ -4,56 +4,71 @@
 
 WebAdminApp.get '/api/logs/list.?:format?' do
   log = get_logger
+  list = {}
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : logs, verb : GET, route : list, format : #{format}"
+  log.call "API : logs, verb : GET, route : list, format : #{format}"
   logs_recordset = get_config.logs
-  obj =  splash_return case: :quiet_exit, :more => "logses list"
-  obj[:data] = logs_recordset
+  list =  splash_return case: :quiet_exit, :more => "logs list"
+  list[:data] = logs_recordset
   content_type format
-  format_response(obj, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+  format_response(list, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
   end
 
 WebAdminApp.get '/api/logs/show/:name.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : logs, verb : GET, route : show, item : #{params[:name]} , format : #{format}"
+  log.call "API : logs, verb : GET, route : show, item : #{params[:name]} , format : #{format}"
   logs_recordset = get_config.logs.select{|item| item[:label] == params[:name].to_sym }
+  show = {}
   unless logs_recordset.empty? then
     record = logs_recordset.first
-    obj = splash_return case: :quiet_exit
-    obj[:data] = record
+    show = splash_return case: :quiet_exit
+    show[:data] = record
+    status 201
   else
-    obj = splash_return case: :not_found, :more => "logs not configured"
+    show = splash_return case: :not_found, :more => "logs not configured"
   end
-  format_response(obj, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+  format_response(show, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
 end
 
 WebAdminApp.post '/api/logs/analyse.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : logs, verb : POST, route : analyse, format : #{format}"
+  log.call "API : logs, verb : POST, route : analyse, format : #{format}"
   results = Splash::Logs::LogScanner::new
   results.analyse
   res = results.output
-  obj =  splash_return case: :quiet_exit, :more => "logs analyse report"
-  obj[:data] = res
+  analyse =  splash_return case: :quiet_exit, :more => "logs analyse report"
+  analyse[:data] = res
   status 201
   content_type format
-  format_response(obj, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+  format_response(analyse, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
 end
 
 WebAdminApp.post '/api/logs/monitor.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : logs, verb : POST, route : monitor, format : #{format}"
+  log.call "API : logs, verb : POST, route : monitor, format : #{format}"
   results = Splash::Logs::LogScanner::new
   results.analyse
-  res = splash_return results.notify
-  if res[:status] == :failure then
+  monitor = splash_return results.notify
+  if monitor[:status] == :failure then
     status 503
   else
     status 201
   end
   content_type format
-  format_response(res, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+  format_response(monitor, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+end
+
+WebAdminApp.get '/api/logs/history/:label.?:format?' do
+  log = get_logger
+  format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
+  log.call "API : logs, verb : GET, route : history, format : #{format}"
+  record = Splash::Logs::LogsRecords::new(params[:label]).get_all_records
+  history =  splash_return case: :quiet_exit, :more => "log 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/process.rb

@@ -5,7 +5,7 @@
 WebAdminApp.get '/api/process/list.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : process, verb : GET, route : list, format : #{format}"
+  log.call "API : process, verb : GET, route : list, format : #{format}"
   process_recordset = get_config.processes
   obj =  splash_return case: :quiet_exit, :more => "Processes list"
   obj[:data] = process_recordset
@@ -16,7 +16,7 @@ WebAdminApp.get '/api/process/list.?:format?' do
 WebAdminApp.get '/api/process/show/:name.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : process, verb : GET, route : show, item : #{params[:name]} , format : #{format}"
+  log.call "API : process, verb : GET, route : show, item : #{params[:name]} , format : #{format}"
   process_recordset = get_config.processes.select{|item| item[:process] == params[:name] }
   unless process_recordset.empty? then
     record = process_recordset.first
@@ -32,7 +32,7 @@ end
 WebAdminApp.post '/api/process/analyse.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : process, verb : POST, route : analyse, format : #{format}"
+  log.call "API : process, verb : POST, route : analyse, format : #{format}"
   results = Splash::Processes::ProcessScanner::new
   results.analyse
   res = results.output
@@ -46,7 +46,7 @@ end
 WebAdminApp.post '/api/process/monitor.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : process, verb : POST, route : monitor, format : #{format}"
+  log.call "API : process, verb : POST, route : monitor, format : #{format}"
   results = Splash::Processes::ProcessScanner::new
   results.analyse
   res = splash_return results.notify

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

@@ -5,7 +5,7 @@
 WebAdminApp.get '/api/sequences/list.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : sequences, verb : GET, route : list, format : #{format}"
+  log.call "API : sequences, verb : GET, route : list, format : #{format}"
   obj =  splash_return case: :quiet_exit, :more => "Sequences list"
   obj[:data] = get_config.sequences
   content_type format
@@ -15,7 +15,7 @@ WebAdminApp.get '/api/sequences/list.?:format?' do
 WebAdminApp.get '/api/sequences/show/:name.?:format?' do
   log = get_logger
   format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
-  log.call "api : sequences, verb : GET, route : show, item : #{params[:name]} , format : #{format}"
+  log.call "API : sequences, verb : GET, route : show, item : #{params[:name]} , format : #{format}"
   sequences_recordset = get_config.sequences[params[:name].to_sym]
   unless sequences_recordset.nil? then
     obj = splash_return case: :quiet_exit

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

@@ -1,5 +1,7 @@
 WebAdminApp.get '/commands' 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]

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

@@ -1,5 +1,7 @@
 WebAdminApp.get '/documentation' do
   get_menu 6
+  log = get_logger
+  log.call "WEB : documentation, verb : GET, controller : /documentation"
     filename = search_file_in_gem("prometheus-splash","README.md")
     @data = Kramdown::Document.new(File::readlines(filename).join).to_html
     slim :documentation, :format => :html

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

@@ -1,4 +1,6 @@
 WebAdminApp.get '/' do
+  log = get_logger
+  log.call "WEB : BASE, verb : GET, controller : /"
   get_menu -1
   url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/config/full.yml"
   @raw = RestClient::Request.execute(method: 'GET', url: url,timeout: 10)
@@ -9,12 +11,15 @@ end
 
 WebAdminApp.get '/home' do
   get_menu 0
+  log = get_logger
+  log.call "WEB : home, verb : GET, controller : /home"
   slim :home, :format => :html
 end
 
 WebAdminApp.get '/daemon/:action' do
   content_type :text
-
+  log = get_logger
+  log.call "WEB : daemon, verb : GET, controller : /daemon/:action"
   case params[:action]
   when 'start'
     startdaemon scheduling: true, purge: false

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

@@ -1,5 +1,7 @@
-WebAdminApp.get '/logs' do
+WebAdminApp.get '/logs/?:status?/?:label?' do
   get_menu 0
+  log = get_logger
+  log.call "WEB : logs, verb : GET, controller : /logs/?:status?/?:label?"
   url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/logs/list.yml"
   raw = RestClient::Request.execute(method: 'GET', url: url,timeout: 10)
   @data = YAML::load(raw)[:data]
@@ -7,8 +9,49 @@ WebAdminApp.get '/logs' do
   raw = RestClient::Request.execute(method: 'POST', url: url,timeout: 10)
   prov = YAML::load(raw)[:data]
   @result = {}
+  @log_failed = params[:label] if params[:status] == 'failure'
+  @log_saved = params[:label] if params[:status] == 'success'
   prov.each {|item|
     @result[item[:label]] = item
   }
   slim :logs, :format => :html
 end
+
+
+WebAdminApp.get '/add_modify_log/?:label?' do
+  get_menu 0
+  log = get_logger
+  log.call "WEB : logs, verb : POST, controller : /add_modify_log/?:label?"
+  @data = {}
+  if params[:label] then
+    url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/logs/show/#{params[:label].to_s}.yml"
+    raw = RestClient::Request.execute(method: 'GET', url: url,timeout: 10)
+    res = YAML::load(raw)
+    @data = res[:data] if res[:status] == :success
+    @data[:old_label] = params[:label].to_s
+  end
+  slim :logs_form, :format => :html
+end
+
+
+WebAdminApp.post '/save_log' do
+  get_menu 0
+  log = get_logger
+  log.call "WEB : logs, verb : POST, controller : /save_log/?:label?"
+  data = {}
+  data[:log] = params[:log]
+  data[:pattern] = params[:pattern]
+  data[:label] = params[:label].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)
+  end
+  url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/config/addlog.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 "/logs/success/#{params[:label].to_s}"
+  else
+    redirect "/logs/failure/#{params[:label].to_s}"
+  end
+end

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

@@ -1,5 +1,7 @@
 WebAdminApp.get '/processes' do
   get_menu 1
+  log = get_logger
+  log.call "WEB : processes, verb : GET, controller : /processes"
   url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/process/list.yml"
   raw = RestClient::Request.execute(method: 'GET', url: url,timeout: 10)
   @data = YAML::load(raw)[:data]

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

@@ -19,7 +19,8 @@ end
 
 WebAdminApp.get '/proxy/links' do
   get_menu 5
-
+  log = get_logger
+  log.call "WEB : proxy, verb : GET, controller : /proxy/links"
   config = get_config
   if config.webadmin_proxy == true then
     @proxy = true

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

@@ -1,14 +1,19 @@
 WebAdminApp.get '/restclient' do
+  log = get_logger
+  log.call "WEB : restclient, verb : GET, controller : /restclient"
   get_menu 4
   slim :restclient,  :format => :html
 end
 
 WebAdminApp.post '/restclient/query' do
+  log = get_logger
+  log.call "WEB : processes, verb : GET, controller : /restclient/query"
   @method = params[:method]
   @url = params[:url]
+  @body = params[:body]
   @notfound = false
   begin
-    @result = RestClient::Request.execute(method: @method.to_sym, url: @url,timeout: 10)
+    @result = RestClient::Request.execute(method: @method.to_sym, url: @url,timeout: 10, payload: @body)
   rescue SocketError
     @result = false
   rescue RestClient::NotFound => e

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

@@ -1,5 +1,7 @@
 WebAdminApp.get '/sequences' do
   get_menu 3
+  log = get_logger
+  log.call "WEB : sequences, verb : GET, controller : /sequences"
   url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/sequences/list.yml"
   raw = RestClient::Request.execute(method: 'GET', url: url,timeout: 10)
   @data = YAML::load(raw)[:data]

data/lib/splash/webadmin/portal/public/css/ultragreen.css

@@ -10,7 +10,13 @@
   height: 7em;
 }
 
+h2 {
+  color: green;
+}
 
+.error {
+  color: red;
+}
 
 .wrapper {
     overflow-y:scroll;

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

@@ -1,4 +1,4 @@
-h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Commands configured in Splash
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Commands configured in Splash
 
 div.uk-width-medium-1-1
   div.uk-panel.uk-panel-box

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

@@ -1,3 +1,3 @@
-h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medkit "></i>&nbsp;&nbsp;Splash Documentation
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medkit "></i>&nbsp;&nbsp;Splash Documentation
 div
   == "#{@data}"

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

@@ -30,30 +30,29 @@ javascript:
 div.uk-grid
   div.uk-width-medium-1-1
     div.uk-panel.uk-panel-box
-      div.uk-text-large.uk-text-bold <i class="uk-icon-cogs uk-icon-justify uk-icon-large"></i>&nbsp;&nbsp;Splash Daemon status
-      table.uk-table
-        tr
-          td
-            b Actions :
-            div.uk-button-group
-              - if @status == false
-                button.uk-button(id="start" disabled): i.uk-icon-play
-                button.uk-button(id="stop"): i.uk-icon-stop
-              - else
-                button.uk-button(id="start"): i.uk-icon-play
-                button.uk-button(id="stop" disabled): i.uk-icon-stop
-          td
-            b Status :
+      div.uk-grid
+        div.uk-width-1-3.uk-text-large.uk-text-bold.uk-text-success <i class="uk-icon-cogs uk-icon-justify uk-icon-large"></i>&nbsp;&nbsp;Splash Daemon status
+        div.uk-width-1-3
+          b Actions :
+          div.uk-button-group
             - if @status == false
-              div.uk-badge.uk-badge-success.uk-badge-notifications(id="daemon") ON
+              button.uk-button(id="start" disabled): i.uk-icon-play
+              button.uk-button(id="stop"): i.uk-icon-stop
             - else
-              div.uk-badge.uk-badge-danger.uk-badge-notifications(id="daemon") OFF
+              button.uk-button(id="start"): i.uk-icon-play
+              button.uk-button(id="stop" disabled): i.uk-icon-stop
+        div.uk-width-1-3
+          b Status :
+          - if @status == false
+            div.uk-badge.uk-badge-success.uk-badge-notifications(id="daemon") ON
+          - else
+            div.uk-badge.uk-badge-danger.uk-badge-notifications(id="daemon") OFF
 
 
 div.uk-grid
   div.uk-width-medium-1-2
     div.uk-panel.uk-panel-box
-      span.uk-text-large.uk-text-bold Global Configuration
+      span.uk-text-large.uk-text-bold.uk-text-success Global Configuration
       br
       span.uk-text-bold <i>Logger and display</i> :
       ul
@@ -68,7 +67,7 @@ div.uk-grid
 
   div.uk-width-medium-1-2
     div.uk-panel.uk-panel-box
-      span.uk-text-large.uk-text-bold Transport and Backend
+      span.uk-text-large.uk-text-bold.uk-text-success Transport and Backend
       br
       span.uk-text-bold <i>Backend</i> :
       ul
@@ -94,7 +93,7 @@ div.uk-grid
 div.uk-grid
   div.uk-width-medium-1-2
     div.uk-panel.uk-panel-box
-      span.uk-text-large.uk-text-bold Daemon
+      span.uk-text-large.uk-text-bold.uk-text-success Daemon
       br
       ul
         li <b>Logs monitoring scheduling: </b> #{@data[:daemon_logmon_scheduling]}
@@ -110,7 +109,7 @@ div.uk-grid
 
   div.uk-width-medium-1-2
     div.uk-panel.uk-panel-box
-      span.uk-text-large.uk-text-bold Web UI
+      span.uk-text-large.uk-text-bold.uk-text-success Web UI
       br
       span.uk-text-bold <i>Webadmin</i> :
       ul

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

@@ -11,8 +11,7 @@ html lang="fr-fr" dir="ltr"
     link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/uikit/2.27.5/css/uikit.gradient.min.css" integrity="sha512-Vjr6Vz5D/gNvTBfQW581ssADQr1j8fAOU0seE2SxO8UvsCBZBoFQS9Lec3hkmZbpcYnsifkBtdQaHU4x6MylGw==" crossorigin="anonymous"
     link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/uikit/2.27.5/css/components/sticky.gradient.css" integrity="sha512-BY0A+4FEGeikNxmo9Q30BZMGRDykKHScJlOSeGq0uq+ylGDJD3zAApnktyKv9tzira1p0ow+B7VqIlRR2CBWoA==" crossorigin="anonymous"
     link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/uikit/2.27.5/css/components/accordion.gradient.min.css" integrity="sha512-Cfd5PRktfT5WA1yUJbYkzjEHvT+9KzqPP1Z1OJud3CFUrkoAc6iIWawoMqPFmtvmxxDNV5RAHfe5DCISV+Gd9A==" crossorigin="anonymous"
-
-
+    link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/uikit/2.27.5/css/components/notify.gradient.min.css" integrity="sha512-HOJctZ/0ww0jFHLHNlNODVEwKf1QxiDKyt3TQZRYZl7e7QSi6whfokIvuMJRoUwykB1SXW4eBeK6MecW4TWFFA==" crossorigin="anonymous"
 
     link rel="stylesheet" href="/css/ultragreen.css"
 
@@ -20,6 +19,7 @@ html lang="fr-fr" dir="ltr"
     script src="https://cdnjs.cloudflare.com/ajax/libs/uikit/2.27.5/js/uikit.min.js" integrity="sha512-KI08ZutCgdasDMwp5rPKd9nF8r+eAy/bZH3Rjova6HfkDv1W7J72sNW+K++KvMp3HL7z0cCykV9vixJACHeCew==" crossorigin="anonymous"
     script src="https://cdnjs.cloudflare.com/ajax/libs/uikit/2.27.5/js/components/sticky.min.js" integrity="sha512-B21PoHN5PsI7sU3cUcNbitUsXp6Zzp81ZDlKJr1xRXwEh3WSftRmgSOgRYxB8h/SlgW+jazkmOXerT33NB7jGA==" crossorigin="anonymous"
     script src="https://cdnjs.cloudflare.com/ajax/libs/uikit/2.27.5/js/components/accordion.min.js" integrity="sha512-7UmYoHJ9tTZiNqlBuUgnr2l82TmZxhiOVXIjiMVP/hPFQJopjEBfVEFPjNdv97OX8K/FIZ4kAXSE+SRTfUkPMg==" crossorigin="anonymous"
+    script src="https://cdnjs.cloudflare.com/ajax/libs/uikit/2.27.5/js/components/notify.min.js" integrity="sha512-gaUF+WYo5jZ2OjLCBfhz+4NAtt0YHDtcxulSv6/+1xDP9QysfsqljFadHN6sWkLvyXzKtQ7efofABRJfWOVwtw==" crossorigin="anonymous"
 
 
   body

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

@@ -1,32 +1,79 @@
-h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Logs configured in Splash
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Logs configured in Splash
+
+
+- unless @log_saved.nil?
+  javascript:
+    UIkit.notify("Log record #{@log_saved} saved", {status:'success'});
+- unless @log_failed.nil?
+  javascript:
+    UIkit.notify("Log record #{@log_saved} not saved", {status:'danger'});
+
+
+javascript:
+  $(document).on( 'click','input.delete-log',function(){
+    var id = this.id;
+    var url = "/api/config/deletelog/" +  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') {
+            $('table#logrecords tr#' + 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 logs monitored
     br
-    table.uk-table.uk-table-hover.uk-table-striped
+    table#logrecords.uk-table.uk-table-hover.uk-table-striped
       thead
         tr
           th Log record label
           th Definition
           th Status
-        tbody
-          - @data.each do |log|
-            tr
-              td <b>Label</b> : #{log[:label]}
-              td
+          th Actions
+      tbody
+        - @data.each do |log|
+          tr id="#{log[:label].to_s}"
+            td <b>Label</b> : #{log[:label]}
+            td
+              ul
+                li <b>File</b> : #{log[:log]}
+                li <b>Pattern</b> : #{log[:pattern]}
+            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]}
+              - if @result[log[:label]][:status] == :matched
+                div.uk-badge.uk-badge-danger matched
                 ul
-                  li <b>File</b> : #{log[:log]}
-                  li <b>Pattern</b> : #{log[:pattern]}
-              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]}
-                - 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 <b>Lines count</b> : #{@result[log[:label]][:lines]}
+                  li <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
+              input.modify-log.uk-button.uk-button-mini.uk-button-primary id="#{log[:label].to_s}" value="Modify" onclick="location.href='/add_modify_log/#{log[:label].to_s}';"
+              br
+              input.history-log.uk-button.uk-button-mini.uk-button-primary id="#{log[:label].to_s}" value="History" onclick="location.href='/history/#{log[:label].to_s}';"
+  div.uk-align-right
+    form.uk-form.uk-form-horizontal#query action="/add_modify_log" method="GET"
+      div &nbsp;
+      input.add-log.uk-button type="submit" value="Add new log"

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

@@ -0,0 +1,24 @@
+- unless @data.empty?
+  h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Modify Splash log monitoring : #{@data[:label]}
+- else
+  h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Add new Splash log monitoring
+
+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_log" method="POST"
+  label.uk-form-label for="label" Label
+  <input class="uk-form-width-large" id="label" type="text" placeholder="label" name="label" value="#{@data[:label].to_s}" required>
+  div &nbsp;
+  label.uk-form-label for="pattern" Pattern
+  <input class="uk-form-width-large" id="pattern" type="text" placeholder="pattern" name="pattern" value="#{@data[:pattern]}" required>
+    div &nbsp;
+  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;
+  - unless @data.empty?
+    input type="hidden" name="update" value="true"
+    input type="hidden" name="old_label" value="#{@data[:old_label].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/nav.slim

@@ -3,7 +3,7 @@ nav.uk-navbar.uk-navbar-attached(data-uk-sticky)
   ul.uk-navbar-nav.uk-hidden-small
     - for item in @menu
       li class=( (item == @current_item)? "uk-active" : "uk-inactive")
-        a href="/#{item.downcase}" title="Access to #{item.capitalize}" <i class="uk-icon-#{@menu_icons[item]}"></i> #{item.capitalize}
+        a.uk-navbar-nav-subtitle href="/#{item.downcase}" title="Access to #{item.capitalize}" <i class="uk-icon-#{@menu_icons[item]}"></i><div> #{item.capitalize}</div>
   a.uk-navbar-toggle.uk-visible-small(href="#offcanvas" data-uk-offcanvas)
   div.uk-navbar-brand.uk-navbar-left.uk-visible-small
     <i class="uk-icon-arrow-left"></i> Menu

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

@@ -1,3 +1,3 @@
-h2 404 : Page not found
+h2.uk-text-danger 404 : Page not found
 p Ressource or page #{@path} not found
 p Please click <a href='/'>here</a> to return home

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

@@ -1,4 +1,4 @@
-h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Processes configured in Splash
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Processes configured in Splash
 
 div.uk-width-medium-1-1
   div.uk-panel.uk-panel-box

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

@@ -1,7 +1,7 @@
 - if @proxy
-  h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Proxies for Prometheus components
+  h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Proxies for Prometheus components
 - else
-  h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Links for Prometheus components
+  h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Links for Prometheus components
 div.uk-width-medium-1-1
   div.uk-panel.uk-panel-box
     ul.uk-list

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

@@ -1,4 +1,4 @@
-h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;REST Client
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;REST Client
 
 div.uk-grid
   div.uk-width-1-1
@@ -7,7 +7,7 @@ div.uk-grid
         <i class="uk-icon-question-circle"></i> &nbsp;&nbsp;Request
       form.uk-form.uk-form-horizontal#query action="/restclient/query" method="POST"
         label.uk-form-label for="method" Method
-        select.uk-form-large#method name="method"
+        select#method name="method"
           option GET
           option POST
           option DELETE
@@ -15,8 +15,11 @@ div.uk-grid
         div &nbsp;
         label.uk-form-label for="url" Endpoint
         input.uk-form-width-large#url type="text" placeholder="url" name="url"
-        dev.uk-align-right
-          input.uk-button.uk-button-primary type="submit" value="Send"
+        div &nbsp;
+        label.uk-form-label for="body" Body
+        textarea.uk-form-large cols="50" name="body" rows="5" placeholder="body"
+        div.uk-align-right
+          input.uk-button.uk-button-small-primary type="submit" value="Send"
 
 div.uk-grid
   div.uk-width-1-1

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

@@ -1,28 +1,32 @@
-di  
+div  
 ul.uk-list
   li <b>HTTP Method</b> : #{@method}
   li <b>URL</b> : #{@url}
 h3 Result :
 - unless @result == false
-  table.uk_table
-    tr
-      td.uk-width-2-10
-        i.uk-icon-dollar
-        | &nbsp;<b>Return code :</b>
-      td.uk-width-8-10 #{@result.code}
-    tr
-      td.uk-width-2-10
-        i.uk-icon-file-o
-        | &nbsp;<b>Body :</b>
-      td.uk-width-8-10.uk-scrollable-text <pre><code>#{@result}</code></pre>
-    tr
-      td.uk-width-2-10
-        i.uk-icon-header
-        | &nbsp;<b>Headers :</b>
-      td.uk-width-8-10
-        ul
-          - @result.headers.each do |hkey,value|
-            li <i><b>#{hkey}:</b> &nbsp; &nbsp; #{value}</i>
+  div.uk-grid.uk-text-small
+    div.uk-width-1-2
+      table.uk-table
+        tr
+          td.uk-width-2-10
+            i.uk-icon-file-o
+            | &nbsp;<b>Body :</b>
+          td.uk-width-8-10.uk-scrollable-text <pre><code>#{@result}</code></pre>
+    div.uk-width-1-2
+      table.uk-table
+        tr
+          td.uk-width-2-10
+            i.uk-icon-dollar
+            | &nbsp;<b>Return code :</b>
+          td.uk-width-8-10 #{@result.code}
+        tr
+          td.uk-width-2-10
+            i.uk-icon-header
+            | &nbsp;<b>Headers :</b>
+          td.uk-width-8-10
+            ul
+              - @result.headers.each do |hkey,value|
+                li <i><b>#{hkey}:</b> &nbsp; &nbsp; #{value}</i>
 
 - else
   div.uk-alert.uk-alert-danger

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

@@ -1,4 +1,4 @@
-h2 <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Sequences configured in Splash
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Sequences configured in Splash
 
 div.uk-width-medium-1-1
   div.uk-panel.uk-panel-box

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Romain GEORGES
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -456,6 +456,7 @@ files:
 - lib/splash/webadmin/portal/controllers/sequences.rb
 - lib/splash/webadmin/portal/init.rb
 - lib/splash/webadmin/portal/public/css/ultragreen.css
+- lib/splash/webadmin/portal/public/favicon.ico
 - lib/splash/webadmin/portal/public/fonts/FontAwesome.otf
 - lib/splash/webadmin/portal/public/fonts/fontawesome-webfont.ttf
 - lib/splash/webadmin/portal/public/fonts/fontawesome-webfont.woff
@@ -468,6 +469,7 @@ files:
 - lib/splash/webadmin/portal/views/home.slim
 - lib/splash/webadmin/portal/views/layout.slim
 - lib/splash/webadmin/portal/views/logs.slim
+- lib/splash/webadmin/portal/views/logs_form.slim
 - lib/splash/webadmin/portal/views/nav.slim
 - lib/splash/webadmin/portal/views/not_found.slim
 - lib/splash/webadmin/portal/views/processes.slim
@@ -508,7 +510,7 @@ homepage: https://github.com/Ultragreen/prometheus-splash
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -523,8 +525,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Supervision with Prometheus of Logs and Asynchronous tasks orchestration
   for Services or Hosts