prometheus-splash 0.6.0 → 0.8.2

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

@@ -0,0 +1,28 @@
+
+
+
+
+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}"
+  obj =  splash_return case: :quiet_exit, :more => "Sequences list"
+  obj[:data] = get_config.sequences
+  content_type format
+  format_response(obj, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+  end
+
+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}"
+  sequences_recordset = get_config.sequences[params[:name].to_sym]
+  unless sequences_recordset.nil? then
+    obj = splash_return case: :quiet_exit
+    obj[:data] = sequences_recordset
+  else
+    obj = splash_return case: :not_found, :more => "Sequence not configured"
+  end
+  content_type format
+  format_response(obj, (params[:format])? format_by_extensions(params[:format]): request.accept.first)
+end

data/lib/splash/webadmin/main.rb

@@ -6,13 +6,14 @@ class WebAdminApp < Sinatra::Base
   include Splash::Helpers
   include Splash::Exiter
   include Splash::Loggers
+  include Splash::Daemon::Controller
 
   set :server, 'thin'
   set :port, get_config.webadmin_port
   set :bind, get_config.webadmin_ip
   set :static, :enable
-  set :public_folder, 'lib/splash/webadmin/portal/public'
-  set :views, "lib/splash/webadmin/portal/views"
+  set :public_folder, search_file_in_gem("prometheus-splash", 'lib/splash/webadmin/portal/public')
+  set :views, search_file_in_gem("prometheus-splash", "lib/splash/webadmin/portal/views")
 
   before do
     rehash_config

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 5
+  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,12 +1,36 @@
 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)
   @data = YAML::load(@raw)[:data]
+  @status = get_processes({ :pattern => get_config.daemon_process_name}).empty?
   slim :home, :format => :html
 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
+    return 'start'
+  when 'stop'
+    stopdaemon
+    return 'stop'
+  when 'restart'
+    stopdaemon
+    startdaemon scheduling: true, purge: false
+    return 'start'
+  else
+  end
+end

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

@@ -1,30 +1,37 @@
 
 
 WebAdminApp.use Rack::ReverseProxy do
-  config = get_config
-  url = "http://#{config.prometheus_pushgateway_host}:#{config.prometheus_pushgateway_port}/#{config.prometheus_pushgateway_path}"
-  reverse_proxy /^\/pushgateway\/?(.*)$/, url
+  reverse_proxy /^\/pushgateway\/?(.*)$/, get_config.prometheus_pushgateway_url + '/'
   reverse_proxy_options preserve_host: true
 end
 
 
 WebAdminApp.use Rack::ReverseProxy do
-  reverse_proxy /^\/prometheus\/?(.*)$/, get_config.prometheus_url
+  reverse_proxy /^\/prometheus\/?(.*)$/, get_config.prometheus_url + '/'
   reverse_proxy_options preserve_host: true
 end
 
-WebAdminApp.get '/proxy/links' do
-  get_menu 4
 
+WebAdminApp.use Rack::ReverseProxy do
+  reverse_proxy /^\/alertmanager\/?(.*)$/, get_config.prometheus_alertmanager_url + '/'
+  reverse_proxy_options preserve_host: true
+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
     @pushgateway_url = "http://#{config.webadmin_ip}:#{config.webadmin_port}/pushgateway"
     @prometheus_url = "http://#{config.webadmin_ip}:#{config.webadmin_port}/prometheus"
+    @alertmanager_url = "http://#{config.webadmin_ip}:#{config.webadmin_port}/prometheus"
   else
     @proxy = false
-    @pushgateway_url = "http://#{config.prometheus_pushgateway_host}:#{config.prometheus_pushgateway_port}/#{config.prometheus_pushgateway_path}"
-    @prometheus_url = "http://#{config.prometheus_url}"
+    @pushgateway_url = "#{config.prometheus_pushgateway_url}"
+    @alertmanager_url = "#{config.prometheus_alertmanager_url}"
+    @prometheus_url = "#{config.prometheus_url}"
   end
   slim :proxy, :format => :html
 end

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

@@ -1,14 +1,19 @@
 WebAdminApp.get '/restclient' do
-  get_menu 3
+  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

@@ -0,0 +1,9 @@
+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]
+  slim :sequences, :format => :html
+end

data/lib/splash/webadmin/portal/init.rb

@@ -4,8 +4,8 @@ Dir[File.dirname(__FILE__) + '/helpers/*.rb'].each {|file| require file  unless
 Slim::Engine.set_options pretty: true
 
 def get_menu(current)
-  @menu = ['Logs','Processes','Commands','RestCLIENT','Proxy/Links','Documentation']
-  @menu_icons = {'Logs' => "file-text",'Processes' => "cogs",'Commands' => 'play-circle-o','RestCLIENT' => "server",'Proxy/Links' => 'random','Documetation' => 'medkit'}
+  @menu = ['Logs','Processes','Commands','Sequences','RestCLIENT','Proxy/Links','Documentation']
+  @menu_icons = {'Logs' => "file-text",'Processes' => "cogs",'Commands' => 'play-circle-o','Sequences' => "cubes",'RestCLIENT' => "server",'Proxy/Links' => 'random','Documetation' => 'medkit'}
   @current_item = nil
   @current_item = @menu[current] unless current == -1
 end

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

@@ -1,12 +1,58 @@
-h2 This is Splash
-p Choose a activity in the main menu
+javascript:
+
+
+
+  $('body').on( 'click','button', function(){
+    var tmp = this.id
+    $("#stop").prop('disabled', true);
+    $("#start").prop('disabled', true);
+    var url = "/daemon/" + tmp;
+    $("#stop").prop('disabled', true);
+    $("#start").prop('disabled', true);
+    $.get(url, function( data ) {
+
+      console.log(data);
+      if (data == 'stop') {
+        $("#stop").prop('disabled', true);
+        $("#start").prop('disabled', false);
+        $("#daemon").removeClass('uk-badge-success').addClass('uk-badge-danger');
+  	    $("#daemon").text('OFF');
+      }
+      if (data == 'start') {
+        $("#stop").prop('disabled', false);
+        $("#start").prop('disabled', true);
+        $("#daemon").removeClass('uk-badge-danger').addClass('uk-badge-success');
+	      $("#daemon").text('ON');
+      }
+    });
+  });
+
+div.uk-grid
+  div.uk-width-medium-1-1
+    div.uk-panel.uk-panel-box
+      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
+              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
+        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
-      br
+      span.uk-text-large.uk-text-bold.uk-text-success Global Configuration
       br
       span.uk-text-bold <i>Logger and display</i> :
       ul
@@ -21,8 +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
-      br
+      span.uk-text-large.uk-text-bold.uk-text-success Transport and Backend
       br
       span.uk-text-bold <i>Backend</i> :
       ul
@@ -48,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]}
@@ -64,8 +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
-      br
+      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"