prometheus-splash 0.8.3 → 0.8.4

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

@@ -2,10 +2,10 @@
 
 
 
-WebAdminApp.get '/api/process/list.?:format?' do
+WebAdminApp.get '/api/processes/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 : processes, verb : GET, route : list, format : #{format}"
   process_recordset = get_config.processes
   obj =  splash_return case: :quiet_exit, :more => "Processes list"
   obj[:data] = process_recordset
@@ -13,11 +13,11 @@ WebAdminApp.get '/api/process/list.?:format?' do
   format_response(obj, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
   end
 
-WebAdminApp.get '/api/process/show/:name.?:format?' do
+WebAdminApp.get '/api/processes/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}"
-  process_recordset = get_config.processes.select{|item| item[:process] == params[:name] }
+  log.call "API : processes, verb : GET, route : show, item : #{params[:name]} , format : #{format}"
+  process_recordset = get_config.processes.select{|item| item[:process] == params[:name].to_sym }
   unless process_recordset.empty? then
     record = process_recordset.first
     obj = splash_return case: :quiet_exit
@@ -29,10 +29,10 @@ WebAdminApp.get '/api/process/show/:name.?:format?' do
   format_response(obj, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
 end
 
-WebAdminApp.post '/api/process/analyse.?:format?' do
+WebAdminApp.post '/api/processes/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 : processes, verb : POST, route : analyse, format : #{format}"
   results = Splash::Processes::ProcessScanner::new
   results.analyse
   res = results.output
@@ -43,10 +43,10 @@ WebAdminApp.post '/api/process/analyse.?:format?' do
   format_response(obj, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
 end
 
-WebAdminApp.post '/api/process/monitor.?:format?' do
+WebAdminApp.post '/api/processes/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 : processes, verb : POST, route : monitor, format : #{format}"
   results = Splash::Processes::ProcessScanner::new
   results.analyse
   res = splash_return results.notify
@@ -58,3 +58,15 @@ WebAdminApp.post '/api/process/monitor.?:format?' do
   content_type format
   format_response(res, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
 end
+
+WebAdminApp.get '/api/processes/history/:process.?:format?' do
+  log = get_logger
+  format = (params[:format])? format_by_extensions(params[:format]) : format_by_extensions('json')
+  log.call "API : processes, verb : GET, route : history, format : #{format}"
+  record = Splash::Processes::ProcessRecords::new(params[:process]).get_all_records
+  history =  splash_return case: :quiet_exit, :more => "Proces 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/main.rb

@@ -7,6 +7,8 @@ class WebAdminApp < Sinatra::Base
   include Splash::Exiter
   include Splash::Loggers
   include Splash::Daemon::Controller
+  include Splash::Logs
+  include Splash::Processes
 
   set :server, 'thin'
   set :port, get_config.webadmin_port

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

@@ -21,7 +21,7 @@ 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?"
+  log.call "WEB : logs, verb : GET, 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"
@@ -30,10 +30,23 @@ WebAdminApp.get '/add_modify_log/?:label?' do
     @data = res[:data] if res[:status] == :success
     @data[:old_label] = params[:label].to_s
   end
-  slim :logs_form, :format => :html
+  slim :log_form, :format => :html
 end
 
 
+WebAdminApp.get '/get_log_history/:label' do
+  get_menu 0
+  log = get_logger
+  log.call "WEB : logs, verb : GET, controller : /get_log_history/:label"
+  @data = {}
+  url = "http://#{get_config.webadmin_ip}:#{get_config.webadmin_port}/api/logs/history/#{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
+  @label = params[:label].to_s
+  slim :log_history, :format => :html
+end
+
 WebAdminApp.post '/save_log' do
   get_menu 0
   log = get_logger

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

@@ -1,16 +1,72 @@
-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[: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/?:process?"
+  data = {}
+  data[:patterns] = params[:patterns].split('|')
+  data[:process] = params[:process].to_sym
+  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/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.each do |key|
+          tr
+            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
@@ -72,8 +96,9 @@ div.uk-width-medium-1-1
               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  
+      input.monitor-log.uk-button value="Force monitoring" 
       input.add-log.uk-button type="submit" value="Add new log"

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

@@ -0,0 +1,21 @@
+- 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
+  <input class="uk-form-width-large" id="patterns" type="text" placeholder="patterns" name="patterns" value="#{@data[:patterns]}" required>
+    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.each do |key|
+          tr
+            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]}

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,7 +71,7 @@ div.uk-width-medium-1-1
           th Status
         tbody
           - @data.each do |process|
-            tr
+            tr id="#{process[:process].to_s}"
               td <b>Process</b> : #{process[:process]}
               td
                 span.uk-text-bold Patterns
@@ -27,3 +86,14 @@ div.uk-width-medium-1-1
                   ul
                     li <b>CPU usage</b> : #{@result[process[:process]][:cpu]}
                     li <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/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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Romain GEORGES
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -468,10 +468,13 @@ files:
 - lib/splash/webadmin/portal/views/documentation.slim
 - lib/splash/webadmin/portal/views/home.slim
 - lib/splash/webadmin/portal/views/layout.slim
+- lib/splash/webadmin/portal/views/log_form.slim
+- lib/splash/webadmin/portal/views/log_history.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/process_form.slim
+- lib/splash/webadmin/portal/views/process_history.slim
 - lib/splash/webadmin/portal/views/processes.slim
 - lib/splash/webadmin/portal/views/proxy.slim
 - lib/splash/webadmin/portal/views/restclient.slim
@@ -510,7 +513,7 @@ homepage: https://github.com/Ultragreen/prometheus-splash
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -525,8 +528,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