prometheus-splash 0.8.3 → 0.8.6

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

@@ -1,16 +1,86 @@
-WebAdminApp.get '/processes' do
+WebAdminApp.get '/processes/?:status?/?:process?' 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"
+  log.call "WEB : processes, verb : GET, controller : /processes/?:status?/?:process?"
+  url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/processes/list.yml"
   raw = RestClient::Request.execute(method: 'GET', url: url,timeout: 10)
   @data = YAML::load(raw)[:data]
-  url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/process/analyse.yml"
+  url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/processes/analyse.yml"
   raw = RestClient::Request.execute(method: 'POST', url: url,timeout: 10)
   prov = YAML::load(raw)[:data]
   @result = {}
+  @process_failed = params[:process] if params[:status] == 'failure'
+  @process_saved = params[:process] if params[:status] == 'success'
   prov.each {|item|
     @result[item[:process]] = item
   }
   slim :processes, :format => :html
 end
+
+WebAdminApp.get '/add_modify_process/?:process?' do
+  get_menu 1
+  log = get_logger
+  log.call "WEB : processes, verb : GET, controller : /add_modify_process/?:process?"
+  @data = {}
+  if params[:process] then
+    url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/processes/show/#{params[:process].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[:patterns].class == Array then
+      prov = @data[:patterns].join('|')
+      @data[:patterns] = prov
+    end
+    @data[:old_process] = params[:process].to_s
+  end
+  slim :process_form, :format => :html
+end
+
+
+WebAdminApp.get '/get_process_history/:process' do
+  get_menu 1
+  log = get_logger
+  log.call "WEB : processes, verb : GET, controller : /get_process_history/:process"
+  @data = {}
+  url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/processes/history/#{params[:process].to_s}.yml"
+  raw = RestClient::Request.execute(method: 'GET', url: url,timeout: 10)
+  res = YAML::load(raw)
+  @data = res[:data] if res[:status] == :success
+  @process = params[:process].to_s
+  slim :process_history, :format => :html
+end
+
+WebAdminApp.post '/save_process' do
+  get_menu 1
+  log = get_logger
+  log.call "WEB : processes, verb : POST, controller : /save_process"
+  data = {}
+  data[:patterns] = params[:patterns].split('|')
+  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)
+  end
+  url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/config/addprocess.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 "/processes/success/#{params[:process].to_s}"
+  else
+    redirect "/processes/failure/#{params[:process].to_s}"
+  end
+end

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/{logs_form.slim → 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

@@ -0,0 +1,24 @@
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;History for log #{@label} 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 Date
+          th File
+          th Status
+          th Nb Errors
+          th Full Nb of lines
+      tbody
+        - @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]}
+            td  #{key[key.keys.first][:errors]}
+            td  #{key[key.keys.first][:lines]}

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

@@ -36,6 +36,30 @@ javascript:
     });
   });
 
+  $(document).on( 'click','input.monitor-log',function(){
+    var url = "/api/logs/monitor.json";
+    UIkit.modal.confirm('Are you sure?', function(){
+      console.debug(url)
+      $.ajax({
+        url: url,
+        type: 'POST',
+        success: function( data ) {
+          console.debug(data)
+          if (data['status'] == 'success') {
+            UIkit.notify("Forced monitoring done", {status:'success'});
+          }
+          else
+          {
+            UIkit.notify("Forced monitoring failed !", {status:'danger'});
+          }
+        },
+        error: function(e) {
+          UIkit.notify("Forced monitoring 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
@@ -50,30 +74,33 @@ 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
               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}';"
+              input.history-log.uk-button.uk-button-mini.uk-button-primary id="#{log[:label].to_s}" value="History" onclick="location.href='/get_log_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.monitor-log.uk-button value="Force monitoring"&nbsp;
       input.add-log.uk-button type="submit" value="Add new log"

data/lib/splash/webadmin/portal/views/process_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 process monitoring : #{@data[:process]}
+- else
+  h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Add new Splash process 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_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 (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}"
+  div.uk-align-right
+    input.uk-button.uk-button-small-primary type="submit" value="Submit"
+javascript:
+  $("#query").validate();

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

@@ -0,0 +1,24 @@
+h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;History for process #{@process} 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 Date
+          th Process
+          th Status
+          th % CPU
+          th % MEM
+      tbody
+        - @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_percent]}
+            td  #{key[key.keys.first][:mem_percent]}

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

@@ -1,10 +1,69 @@
 h2.uk-text-success <i class="uk-icon-#{@menu_icons[@current_item]} uk-icon-medium "></i>&nbsp;&nbsp;Processes configured in Splash
 
+- unless @process_saved.nil?
+  javascript:
+    UIkit.notify("Process record #{@process_saved} saved", {status:'success'});
+- unless @process_failed.nil?
+  javascript:
+    UIkit.notify("Process record #{@process_saved} not saved", {status:'danger'});
+
+
+javascript:
+  $(document).on( 'click','input.delete-process',function(){
+    var id = this.id;
+    var url = "/api/config/deleteprocess/" +  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#processrecords tr#' + id).remove();
+            UIkit.notify("Deleting process for " + id + " done", {status:'success'});
+          }
+          else
+          {
+            UIkit.notify("Deleting process for " + id + " failed !", {status:'danger'});
+          }
+        },
+        error: function(e) {
+          UIkit.notify("Deleting process for " + id + " failed !", {status:'danger'});
+        }
+      });
+    });
+  });
+
+  $(document).on( 'click','input.monitor-process',function(){
+    var url = "/api/processes/monitor.json";
+    UIkit.modal.confirm('Are you sure?', function(){
+      console.debug(url)
+      $.ajax({
+        url: url,
+        type: 'POST',
+        success: function( data ) {
+          console.debug(data)
+          if (data['status'] == 'success') {
+            UIkit.notify("Forced monitoring done", {status:'success'});
+          }
+          else
+          {
+            UIkit.notify("Forced monitoring failed !", {status:'danger'});
+          }
+        },
+        error: function(e) {
+          UIkit.notify("Forced monitoring failed !", {status:'danger'});
+        }
+      });
+    });
+  });
+
 div.uk-width-medium-1-1
   div.uk-panel.uk-panel-box
     span.uk-text-large.uk-text-bold List of processes monitored
     br
-    table.uk-table.uk-table-hover.uk-table-striped
+    table#processrecords.uk-table.uk-table-hover.uk-table-striped
       thead
         tr
           th Process record
@@ -12,18 +71,32 @@ div.uk-width-medium-1-1
           th Status
         tbody
           - @data.each do |process|
-            tr
-              td <b>Process</b> : #{process[:process]}
+            tr id="#{process[:process].to_s}"
+              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
+                input.modify-process.uk-button.uk-button-mini.uk-button-primary id="#{process[:process].to_s}" value="Modify" onclick="location.href='/add_modify_process/#{process[:process].to_s}';"
+                br
+                input.history-process.uk-button.uk-button-mini.uk-button-primary id="#{process[:process].to_s}" value="History" onclick="location.href='/get_process_history/#{process[:process].to_s}';"
+  div.uk-align-right
+    form.uk-form.uk-form-horizontal#query action="/add_modify_process" method="GET"
+      div &nbsp;
+      input.monitor-process.uk-button value="Force monitoring"&nbsp;
+      input.add-process.uk-button type="submit" value="Add new process"

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/prometheus-splash.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'ps-ruby','~> 0.0.4'
   spec.add_runtime_dependency 'tty-markdown','~> 0.7.0'
   spec.add_runtime_dependency 'tty-pager','~> 0.14.0'
-  spec.add_runtime_dependency 'tty-table','~> 0.11.0'
+  spec.add_runtime_dependency 'tty-table','~> 0.12.0'
   spec.add_runtime_dependency 'net-ssh','~> 6.1.0'
   spec.add_runtime_dependency 'net-scp','~> 3.0.0'
   spec.add_runtime_dependency 'colorize','~> 0.8.1'

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
+