prometheus-splash 0.7.0 → 0.8.0

data/lib/splash/webadmin.rb

@@ -21,7 +21,7 @@ module Splash
       # @param [Hash] options
       # @option options [Symbol] :quiet activate quiet mode for log (limit to :fatal)
       # @return [Hash] Exiter Case (:quiet_exit, :already_exist, :unknown_error or other)
-      def startdaemon(options = {})
+      def startweb(options = {})
         require 'splash/webadmin/main'
         config = get_config
         log = get_logger
@@ -64,7 +64,7 @@ module Splash
       # @param [Hash] options
       # @option options [Symbol] :quiet activate quiet mode for log (limit to :fatal)
       # @return [Hash] Exiter Case (:quiet_exit, :not_found, other)
-      def stopdaemon(options = {})
+      def stopweb(options = {})
           config = get_config
           log = get_logger
           log.level = :fatal if options[:quiet]
@@ -86,7 +86,7 @@ module Splash
       # Status of the Splash WebAdmin, display status
       # @param [Hash] options ignored
       # @return [Hash] Exiter Case (:status_ko, :status_ok)
-      def statusdaemon(options = {})
+      def statusweb(options = {})
         log = get_logger
         config = get_config
         pid = realpid = ''

data/lib/splash/webadmin/main.rb

@@ -6,6 +6,7 @@ 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

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

@@ -3,6 +3,7 @@ WebAdminApp.get '/' do
   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
 
@@ -10,3 +11,21 @@ WebAdminApp.get '/home' do
   get_menu 0
   slim :home, :format => :html
 end
+
+WebAdminApp.get '/daemon/:action' do
+  content_type :text
+
+  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/proxy.rb

@@ -1,13 +1,19 @@
 
 
 WebAdminApp.use Rack::ReverseProxy do
-  reverse_proxy /^\/pushgateway\/?(.*)$/, get_config.prometheus_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.use Rack::ReverseProxy do
+  reverse_proxy /^\/alertmanager\/?(.*)$/, get_config.prometheus_alertmanager_url + '/'
   reverse_proxy_options preserve_host: true
 end
 
@@ -19,9 +25,11 @@ WebAdminApp.get '/proxy/links' do
     @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 = "#{config.prometheus_pushgateway_url}"
+    @alertmanager_url = "#{config.prometheus_alertmanager_url}"
     @prometheus_url = "#{config.prometheus_url}"
   end
   slim :proxy, :format => :html

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

@@ -1,5 +1,53 @@
-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-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 :
+            - 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
@@ -7,7 +55,6 @@ div.uk-grid
     div.uk-panel.uk-panel-box
       span.uk-text-large.uk-text-bold Global Configuration
       br
-      br
       span.uk-text-bold <i>Logger and display</i> :
       ul
         li <b>Level:</b> #{@data[:loggers][:level]}
@@ -23,7 +70,6 @@ div.uk-grid
     div.uk-panel.uk-panel-box
       span.uk-text-large.uk-text-bold Transport and Backend
       br
-      br
       span.uk-text-bold <i>Backend</i> :
       ul
         li <b>Backend type:</b> #{@data[:backends][:stores][:execution_trace][:type]}
@@ -66,7 +112,6 @@ div.uk-grid
     div.uk-panel.uk-panel-box
       span.uk-text-large.uk-text-bold Web UI
       br
-      br
       span.uk-text-bold <i>Webadmin</i> :
       ul
         li <b>IP:</b> #{@data[:webadmin_ip]}

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

@@ -11,3 +11,6 @@ div.uk-width-medium-1-1
       li
         i.uk-icon-hand-o-right
         a href="#{@pushgateway_url}"  Prometheus PushGateway
+      li
+        i.uk-icon-hand-o-right
+        a href="#{@alertmanager_url}"  Prometheus Alertmanager

data/prometheus-splash.gemspec

@@ -26,7 +26,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'bunny','~> 2.15.0'
   spec.add_runtime_dependency 'ps-ruby','~> 0.0.4'
   spec.add_runtime_dependency 'tty-markdown','~> 0.6.0'
-  spec.add_runtime_dependency 'tty-pager','~> 0.12.1'
+  spec.add_runtime_dependency 'tty-pager','~> 0.12.0'
+  spec.add_runtime_dependency 'tty-table','~> 0.11.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'
   spec.add_runtime_dependency 'sinatra','~> 2.1.0'
   spec.add_runtime_dependency 'thin','~> 1.7.2'
@@ -41,6 +44,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'roodi', '~> 5.0.0'
   spec.add_development_dependency 'code_statistics', '~> 0.2.13'
   spec.add_development_dependency 'yard-rspec', '~> 0.1'
-
+  spec.add_development_dependency 'bundler', '~> 2.1.4'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -114,14 +114,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: tty-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +360,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.4
 description: Prometheus Logs and Batchs supervision over PushGateway and commands
   orchestration
 email:
@@ -351,6 +407,7 @@ files:
 - lib/splash/cli/logs.rb
 - lib/splash/cli/process.rb
 - lib/splash/cli/sequences.rb
+- lib/splash/cli/transfers.rb
 - lib/splash/cli/webadmin.rb
 - lib/splash/commands.rb
 - lib/splash/config.rb
@@ -377,6 +434,7 @@ files:
 - lib/splash/processes.rb
 - lib/splash/sequences.rb
 - lib/splash/templates.rb
+- lib/splash/transfers.rb
 - lib/splash/transports.rb
 - lib/splash/transports/rabbitmq.rb
 - lib/splash/webadmin.rb