prometheus-splash 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54e538fd7e22b4dc38c1253db96c6e842bf81d1378db0434295c0a827e23bfb7
-  data.tar.gz: c951aaf9aacd398d0944594185fc8d4986de4268162a62cedd69ff0c96d26f9d
+  metadata.gz: 3048edcf69c8bac285eab790a497fddbb9a4420a5cee8738ee1397c0a7c39587
+  data.tar.gz: adb8f52b4e3b2d808728e092960e648768a45d8fbb66876ca7c585f492516c86
 SHA512:
-  metadata.gz: 110950f5ac22753830d8b6f1fd74eaf86d77c78eb18728613215fc671279aa8c6da577ba3d54250640c747c76f35c66cd35ffd2ccb38cfc47d65a7c47e408b2b
-  data.tar.gz: 18aecf0d1f4f080ec1863ec79e17cc6d0582b5cd7f9efac442162c0095d92658372fa2bad1b3c502dd0e44a731a4fd9fe9710bae3e6a4d00be5759610ad08c1c
+  metadata.gz: fd9ed4dc543ea0a81cd163c73988424a87b76a5e094f548900e30ff71db7e8525798d9c824113ecf8972d2e26b6a616d2393a1afb3a1e3caaa8f62ebb331f3dc
+  data.tar.gz: 23635fa7711d83e15f8b859d47bdcea3fa4dadc268cb899b46282555b73a2f998bf38614a48ec54997e9fe9986a78098fc2a9c818183be37e7dbd913bc7cfe8a

data/config/splash.yml

@@ -47,11 +47,8 @@
       :stderr_trace: stderr.txt
       :pid_file: splash.pid
   :prometheus:
-    :pushgateway:
-      :host: "localhost"
-      :port: 9091
-      :path: ''
-    :url: "http://localhost:9090/"
+    :pushgateway: 'http://localhost:9091/'
+    :url: 'http://localhost:9090/'
   :webadmin:
     :port: 9234
     :ip: 127.0.0.1
@@ -63,7 +60,7 @@
       :pid_file: splash_webadmin.pid
 
 
-### configuration of commands and scheduling
+### Sample configuration of commands and scheduling
   :commands:
     :id_root:
       :desc: run id command on root
@@ -115,7 +112,7 @@
       :on_success: :echo3
 
 
-### configuration of monitored logs
+### Sample configuration of monitored logs
   :logs:
     - :label: :log_app_1
       :log: /tmp/test
@@ -124,9 +121,58 @@
       :log: /tmp/test2
       :pattern: ERROR
 
-
 ### configuration of monitored processes
   :processes:
     - :process: cron
       :patterns:
         - cron
+
+
+###
+## Sample configuration of executions sequences
+  :sequences:
+    :sample_remote_sequence:
+      :definition:
+        - :step: execute echo2 on omicron
+          :command: :echo2
+          :on_host: omicron
+        - :step: run locally echo3
+          :command: :echo3
+          :trace: false
+    :sample_local_sequence:
+      :definition:
+        - :step: run locally pwd without callback
+          :command: :pwd
+          :callback: false
+        - :step: run locally echo3 without Prometheus notifications
+          :command: :echo3
+          :notify: false
+    :sample_local_failed_sequence:
+      :options:
+        :continue: false
+      :definition:
+        - :step: run false_test locally without callback
+          :command: :false_test
+          :callback: false
+        - :step: considere this as inefective
+          :command: :echo3
+    :sample_local_full_sequence:
+      :options:
+        :continue: true
+      :definition:
+        - :step: run false_test locally without callback
+          :command: :false_test
+          :callback: false
+          :trace: false
+        - :step: considere this as inefective
+          :command: :pwd
+    :sample_scheduled_sequence:
+      :schedule:
+        :every: 1m
+      :options:
+        :continue: true
+      :definition:
+        - :step: exec echo3
+          :command: :echo3
+
+###

data/lib/splash/cli.rb

@@ -29,6 +29,8 @@ class CLI < Thor
   include CLISplash
   desc "commands SUBCOMMAND ...ARGS", "Managing commands/batchs supervision & orchestration"
   subcommand "commands", Commands
+  desc "sequences SUBCOMMAND ...ARGS", "Managing Sequences of commands"
+  subcommand "sequences", Sequences
   desc "logs SUBCOMMAND ...ARGS", "Managing Files/Logs supervision"
   subcommand "logs", Logs
   desc "processes SUBCOMMAND ...ARGS", "Managing processes supervision"

data/lib/splash/cli/commands.rb

@@ -133,7 +133,7 @@ module CLISplash
       log  = get_logger
       if options[:hostname] then
         options[:hostname] = Socket.gethostname if options[:hostname] == 'hostname'
-        log.info "Remote Splash scheduling command on #{options[:hostname]}:"
+        log.info "Remote Splash treeview command on #{options[:hostname]}:"
         log.info "ctrl+c for interrupt"
         begin
           transport = get_default_client
@@ -169,7 +169,7 @@ module CLISplash
     end
 
 
-    # Thor method : getting the list of avaible commands in splash config
+    # Thor method : getting the list of available commands in splash config
     desc "list", "Show configured commands"
     long_desc <<-LONGDESC
     Show configured commands\n

data/lib/splash/cli/sequences.rb

@@ -0,0 +1,112 @@
+# coding: utf-8
+
+# module for all Thor subcommands
+module CLISplash
+
+  # Thor inherited class for sequences management
+  class Sequences < Thor
+    include Splash::Sequences
+    include Splash::Transports
+    include Splash::Exiter
+    include Splash::Loggers
+
+
+    # Thor method : execute sequence
+    option :continue, :type => :boolean, default: true
+    long_desc <<-LONGDESC
+    Execute a commands Sequence\n
+    With --no-continue, stop execution on failure
+    LONGDESC
+    desc "execute", "Execute a sequence"
+    def execute(sequence)
+      options[:name] = sequence
+      acase = run_as_root :run_seq, options
+      splash_exit acase
+    end
+
+
+    # Thor method : show sequence
+    long_desc <<-LONGDESC
+    Show a commands Sequence\n
+    LONGDESC
+    desc "show", "Show a sequence"
+    def show(sequence)
+      options = {}
+      log = get_logger
+      options[:name] = sequence
+      acase = run_as_root :show_seq, options
+      unless acase[:data].nil? then
+        dseq = acase[:data]
+        log.item sequence
+        unless dseq[:options].nil? then
+          log.arrow "Options : "
+          log.flat  "    * continue on failure : #{dseq[:options][:continue]}" unless dseq[:options][:continue].nil?
+        end
+        log.arrow "Definition :"
+        dseq[:definition].each do |step|
+          log.flat "    * Step name : #{step[:step]}"
+          log.flat "      => Splash Command to execute : #{step[:command]}"
+          log.flat "      => Execute remote on host : #{step[:on_host]}" unless step[:on_host].nil?
+          log.flat "      => Follow Callback : #{step[:callback]}" unless step[:callback].nil?
+          log.flat "      => Prometheus notification : #{step[:notification]}" unless step[:notification].nil?
+        end
+      end
+      splash_exit acase
+    end
+
+
+    # Thor method : getting the list of available sequences in splash config
+    desc "list", "Show configured sequences"
+    long_desc <<-LONGDESC
+    Show configured sequences\n
+    with --detail, show command details\n
+    LONGDESC
+    option :detail, :type => :boolean,  :aliases => "-D"
+    def list
+      acase = run_as_root :list_seq, options
+      log = get_logger
+      unless acase[:data].nil?
+        log.info "Splash configured sequences"
+        acase[:data].keys.each do |seq|
+          log.item seq
+          if options[:detail] then
+            dseq = acase[:data][seq]
+            unless dseq[:options].nil? then
+              log.arrow "Options : "
+              log.flat  "    * continue on failure : #{dseq[:options][:continue]}" unless dseq[:options][:continue].nil?
+            end
+            log.arrow "Definition :"
+            dseq[:definition].each do |step|
+              log.flat "    * Step name : #{step[:step]}"
+              log.flat "      => Splash Command to execute : #{step[:command]}"
+              log.flat "      => Execute remote on host : #{step[:on_host]}" unless step[:on_host].nil?
+              log.flat "      => Follow Callback : #{step[:callback]}" unless step[:callback].nil?
+              log.flat "      => Prometheus notification : #{step[:notification]}" unless step[:notification].nil?
+            end
+          end
+        end
+      end
+      splash_exit acase
+    end
+
+
+    # Thor method : scheduling execution of a commands sequences in splash daemon
+    desc "schedule", "Schedule a configured sequences execution"
+    long_desc <<-LONGDESC
+    Schedule excution of command sequence on Splash daemon\n
+    with --at TIME/DATE, Schedule at specified date/time, like 2030/12/12 23:30:00 or 12:00 \n
+    with --in TIMING, Schedule in specified timing, like 12s, 1m, 2h, 3m10s, 10d\n
+    --in and --at are imcompatibles.\n
+    WARNING : scheduling by CLI are not percisted, so use it only for specifics cases.\n
+    LONGDESC
+    option :at, :type => :string
+    option :in, :type => :string
+    def schedule(sequence)
+      options[:sequence] = sequence
+      acase = run_as_root :schedule_seq, options
+      splash_exit acase
+    end
+
+  end
+
+end

data/lib/splash/commands.rb

@@ -26,7 +26,7 @@ module Splash
       # @param [String] name the name of the command
       def initialize(name)
         @config  = get_config
-        @url = "http://#{@config.prometheus_pushgateway_host}:#{@config.prometheus_pushgateway_port}/#{@config.prometheus_pushgateway_path}"
+        @url = @config.prometheus_pushgateway_url
         @name = name
         unless @config.commands.keys.include? @name.to_sym then
           splash_exit case: :not_found, more: "command #{@name} is not defined in configuration"
@@ -44,7 +44,7 @@ module Splash
       # @param [String] time execution time numeric.to_s
       # @return [Hash] Exiter case :quiet_exit
       def notify(value,time)
-        unless verify_service host: @config.prometheus_pushgateway_host ,port: @config.prometheus_pushgateway_port then
+        unless verify_service url: @config.prometheus_pushgateway_url then
           return { :case => :service_dependence_missing, :more => "Prometheus Notification not send."}
         end
         @@metric_exitcode.set(value)
@@ -84,6 +84,8 @@ module Splash
               log.receive "return with exitcode #{exit_code}", session
 
             end
+          rescue Interrupt
+            splash_exit case: :interrupt, more: "Remote command exection"
           end
         else
           log.info "Executing command : '#{@name}' ", session
@@ -136,7 +138,6 @@ module Splash
             log.item "Without Prometheus notification", session
           end
         end
-
         if options[:callback] then
           on_failure = (@config.commands[@name.to_sym][:on_failure])? @config.commands[@name.to_sym][:on_failure] : false
           on_success = (@config.commands[@name.to_sym][:on_success])? @config.commands[@name.to_sym][:on_success] : false

data/lib/splash/config.rb

@@ -23,10 +23,8 @@ module Splash
         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_pushgateway_path] = (config_from_file[:prometheus][:pushgateway][:path])? config_from_file[:prometheus][:pushgateway][:path] : PROMETHEUS_PUSHGATEWAY_PATH
-        self[:prometheus_pushgateway_host] = (config_from_file[:prometheus][:pushgateway][:host])? config_from_file[:prometheus][:pushgateway][:host] : PROMETHEUS_PUSHGATEWAY_HOST
-        self[:prometheus_pushgateway_port] = (config_from_file[:prometheus][:pushgateway][:port])? config_from_file[:prometheus][:pushgateway][:port] : PROMETHEUS_PUSHGATEWAY_PORT
         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
@@ -42,10 +40,12 @@ module Splash
         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[:daemon][:paths][:pid_path])? config_from_file[:daemon][:paths][:pid_path] : PID_PATH
+        self[:trace_path] = (config_from_file[:daemon][:paths][:trace_path])? config_from_file[:daemon][: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[:pid_path] = (config_from_file[:daemon][:paths][:pid_path])? config_from_file[:daemon][:paths][:pid_path] : DAEMON_PID_PATH
-        self[:trace_path] = (config_from_file[:daemon][:paths][:trace_path])? config_from_file[:daemon][:paths][:trace_path] : TRACE_PATH
         self[:pid_file] = (config_from_file[:daemon][:files][:pid_file])? config_from_file[:daemon][:files][:pid_file] : DAEMON_PID_FILE
         self[:stdout_trace] = (config_from_file[:daemon][:files][:stdout_trace])? config_from_file[:daemon][:files][:stdout_trace] : DAEMON_STDOUT_TRACE
         self[:stderr_trace] = (config_from_file[:daemon][:files][:stderr_trace])? config_from_file[:daemon][:files][:stderr_trace] : DAEMON_STDERR_TRACE
@@ -57,6 +57,7 @@ module Splash
         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] : {}
 
       end
 
@@ -180,6 +181,11 @@ module Splash
         return self[:processes]
       end
 
+      # getter for sequences Hash Config sample
+      # @return [Hash]
+      def sequences
+        return self[:sequences]
+      end
 
       # getter for author Config sample
       # @return [String]
@@ -202,51 +208,42 @@ module Splash
 
 
 
-      # getter for daemon_process_name Config sample
-      # @return [String]
-      def daemon_process_name
-        return self[:daemon_process_name]
-      end
 
-      # getter for prometheus_pushgateway_host Config sample
+      # getter for prometheus_pushgateway_url Config sample
       # @return [String]
-      def prometheus_pushgateway_host
-        return self[:prometheus_pushgateway_host]
+      def prometheus_pushgateway_url
+        return self[:prometheus_pushgateway_url]
       end
 
-      # getter for prometheus_pushgateway_port Config sample
+      # getter for prometheus_url Config sample
       # @return [String]
-      def prometheus_pushgateway_port
-        return self[:prometheus_pushgateway_port]
+      def prometheus_url
+        return self[:prometheus_url]
       end
 
-      # getter for prometheus_pushgateway_path Config sample
-      # @return [String]
-      def prometheus_pushgateway_path
-        return self[:prometheus_pushgateway_path]
-      end
 
-      # getter for prometheus_url Config sample
+      # getter for daemon_process_name Config sample
       # @return [String]
-      def prometheus_url
-        return self[:prometheus_url]
+      def daemon_process_name
+        return self[:daemon_process_name]
       end
 
-      # getter for full_pid_path Config sample
+
+      # getter for daemon_full_pid_path Config sample
       # @return [String]
-      def full_pid_path
+      def daemon_full_pid_path
         return "#{self[:pid_path]}/#{self[:pid_file]}"
       end
 
-      # getter for full_stdout_trace_path Config sample
+      # getter for daemon_full_stdout_trace_path Config sample
       # @return [String]
-      def full_stdout_trace_path
+      def daemon_full_stdout_trace_path
         return "#{self[:trace_path]}/#{self[:stdout_trace]}"
       end
 
-      # getter for full_stderr_trace_path Config sample
+      # getter for daemon_full_stderr_trace_path Config sample
       # @return [String]
-      def full_stderr_trace_path
+      def daemon_full_stderr_trace_path
         return "#{self[:trace_path]}/#{self[:stderr_trace]}"
       end
 

data/lib/splash/config/sanitycheck.rb

@@ -50,7 +50,7 @@ module Splash
       end
 
       target = "Prometheus PushGateway Service running"
-      if verify_service host: config.prometheus_pushgateway_host ,port: config.prometheus_pushgateway_port then
+      if verify_service url: config.prometheus_pushgateway_url then
         log.ok target
       else
         log.ko target

data/lib/splash/constants.rb

@@ -7,12 +7,14 @@ module Splash
   module Constants
 
     # Current splash version
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
 
     # the path to th config file, not overridable by config
     CONFIG_FILE = "/etc/splash.yml"
     # the default execution trace_path if backend file
     TRACE_PATH="/var/run/splash"
+    # the default pid file path
+    PID_PATH="/var/run"
 
 
     # default scheduling criteria for log monitoring
@@ -24,8 +26,6 @@ module Splash
 
     # the display name of daemon in proc info (ps/top)
     DAEMON_PROCESS_NAME="Splash : daemon."
-    # the default pid file path
-    DAEMON_PID_PATH="/var/run"
     # the default pid file name
     DAEMON_PID_FILE="splash.pid"
     # the default sdtout trace file
@@ -42,15 +42,11 @@ module Splash
     # type of licence
     LICENSE="BSD-2-Clause"
 
-    # the default prometheus pushgateway host
-    PROMETHEUS_PUSHGATEWAY_HOST = "localhost"
-    # the default prometheus pushgateway port
-    PROMETHEUS_PUSHGATEWAY_PORT = "9091"
-    # the default prometheus pushgateway port
-    PROMETHEUS_PUSHGATEWAY_PATH = ''
+    # the default prometheus pushgateway URL
+    PROMETHEUS_PUSHGATEWAY_URL = 'http://localhost:9090/'
 
     # the default prometheus URL
-    PROMETHEUS_URL = "http://localhost:9090"
+    PROMETHEUS_URL = "http://localhost:9090/"
 
     # the default path fo execution report template
     EXECUTION_TEMPLATE="/etc/splash_execution_report.tpl"

data/lib/splash/daemon/controller.rb

@@ -26,7 +26,7 @@ module Splash
         config = get_config
         log = get_logger
         log.level = :fatal if options[:quiet]
-        unless verify_service host: config.prometheus_pushgateway_host ,port: config.prometheus_pushgateway_port then
+        unless verify_service url: config.prometheus_pushgateway_url then
           return {:case => :service_dependence_missing, :more => 'Prometheus Gateway'}
         end
         realpid = get_processes pattern: get_config.daemon_process_name
@@ -35,7 +35,7 @@ module Splash
           return {:case => :already_exist, :more => "Splash Process already launched on foreground "}
         end
 
-        unless File::exist? config.full_pid_path then
+        unless File::exist? config.daemon_full_pid_path then
           unless realpid.empty? then
             return {:case => :already_exist, :more => "Splash Process already launched "}
           end
@@ -50,9 +50,9 @@ module Splash
             end
           end
           daemon_config = {:description => config.daemon_process_name,
-              :pid_file => config.full_pid_path,
-              :stdout_trace => config.full_stdout_trace_path,
-              :stderr_trace => config.full_stderr_trace_path,
+              :pid_file => config.daemon_full_pid_path,
+              :stdout_trace => config.daemon_full_stdout_trace_path,
+              :stderr_trace => config.daemon_full_stderr_trace_path,
               :foreground => options[:foreground]
             }
 
@@ -62,7 +62,7 @@ module Splash
           end
           sleep 1
           if res == 0 then
-            pid = `cat #{config.full_pid_path}`.to_i
+            pid = `cat #{config.daemon_full_pid_path}`.to_i
             log.ok "Splash Daemon Started, with PID : #{pid}"
             return {:case => :quiet_exit, :more => "Splash Daemon successfully loaded."}
           else
@@ -82,15 +82,15 @@ module Splash
           config = get_config
           log = get_logger
           log.level = :fatal if options[:quiet]
-          if File.exist?(config.full_pid_path) then
+          if File.exist?(config.daemon_full_pid_path) then
             begin
-              pid = `cat #{config.full_pid_path}`.to_i
+              pid = `cat #{config.daemon_full_pid_path}`.to_i
               Process.kill("TERM", pid)
               acase = {:case => :quiet_exit, :more => 'Splash stopped succesfully'}
             rescue Errno::ESRCH
               acase =  {:case => :not_found, :more => "Process of PID : #{pid} not found"}
             end
-            FileUtils::rm config.full_pid_path if File::exist? config.full_pid_path
+            FileUtils::rm config.daemon_full_pid_path if File::exist? config.daemon_full_pid_path
           else
             acase =  {:case => :not_found, :more => "Splash is not running"}
           end
@@ -104,7 +104,7 @@ module Splash
         log = get_logger
         config = get_config
         pid = realpid = ''
-        pid = `cat #{config.full_pid_path}`.to_s if File.exist?(config.full_pid_path)
+        pid = `cat #{config.daemon_full_pid_path}`.to_s if File.exist?(config.daemon_full_pid_path)
         listpid = get_processes({ :pattern => get_config.daemon_process_name})
         pid.chomp!
         if listpid.empty? then

data/lib/splash/daemon/metrics.rb

@@ -76,7 +76,7 @@ module Splash
         def notify
           log = get_logger
           session  = get_session
-          unless verify_service host: @config.prometheus_pushgateway_host ,port: @config.prometheus_pushgateway_port then
+          unless verify_service url: @config.prometheus_pushgateway_url then
             return  { :case => :service_dependence_missing, :more => "Prometheus Notification not send." }
           end
 
@@ -87,7 +87,7 @@ module Splash
           @metric_processes_monitoring.set monitoring_processes_count
 
           hostname = Socket.gethostname
-          url = "http://#{@config.prometheus_pushgateway_host}:#{@config.prometheus_pushgateway_port}/#{@config.prometheus_pushgateway_path}"
+          url = @config.prometheus_pushgateway_url
           Prometheus::Client::Push.new('Splash',hostname, url).add(@registry)
           log.debug "Sending to Prometheus PushGateway done.", session
           return {:case => :quiet_exit }

data/lib/splash/daemon/orchestrator.rb

@@ -21,6 +21,7 @@ module Splash
         include Splash::Logs
         include Splash::Processes
         include Splash::Commands
+        include Splash::Sequences
 
         # Constructor prepare the Scheduler
         # commands Schedules
@@ -42,6 +43,7 @@ module Splash
           if options[:scheduling] then
             @log.item "Initializing commands Scheduling."
             init_commands_scheduling
+            init_sequences_scheduling
           end
 
           if @config.logs.empty? then
@@ -140,6 +142,25 @@ module Splash
 
         end
 
+
+        # prepare sequences Scheduling
+        def init_sequences_scheduling
+          config = get_config.sequences
+          sequences = config.select{|key,value| value.include? :schedule}.keys
+          sequences.each do |sequence|
+            sched,value = config[sequence][:schedule].flatten
+            @log.arrow "Scheduling sequence #{sequence.to_s}"
+            @server.send sched,value do
+              session  = get_session
+              @log.trigger "Executing Scheduled sequence #{sequence.to_s} for Scheduling : #{sched.to_s} #{value.to_s}", session
+              run_seq name: sequence.to_s, session: session
+            end
+          end
+
+        end
+
+
+
         # execute_command verb : execute command specified in payload
         # @param [Hash] options
         # @option options [Symbol] :command the name of the command
@@ -147,7 +168,7 @@ module Splash
         # @return [Hash] Exiter case
         def execute(options)
           command =  CommandWrapper::new(options[:command])
-          if options[:ack] then 
+          if options[:ack] then
           else
             @metric_manager.inc_execution
             return command.call_and_notify trace: true, notify: true, callback: true, session: options[:session]

data/lib/splash/dependencies.rb

@@ -13,6 +13,7 @@ module Splash
     require 'etc'
     require 'forwardable'
     require 'json'
+    require 'uri'
 
 
 
@@ -55,6 +56,8 @@ module Splash
 
 
     require 'splash/commands'
+    require 'splash/sequences'
+
     require 'splash/logs'
     require 'splash/processes'
 

data/lib/splash/helpers.rb

@@ -310,11 +310,20 @@ module Splash
     # @param [Hash] options
     # @option options [String] :host hostname
     # @option options [String] :port TCP port
+    # @option options [String] :url full URL, priority on :host and :port
     def verify_service(options ={})
       begin
+        if options[:url] then
+          uri = URI.parse(options[:url])
+          host = uri.host
+          port = uri.port
+        else
+          host = options[:host]
+          port = options[:port]
+        end
         Timeout::timeout(1) do
           begin
-            s = TCPSocket.new(options[:host], options[:port])
+            s = TCPSocket.new(host, port)
             s.close
             return true
           rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH

data/lib/splash/logs.rb

@@ -56,7 +56,7 @@ module Splash
       # @return [Hash] Exiter case :quiet_exit
       def notify(options = {})
         log = get_logger
-        unless verify_service host: @config.prometheus_pushgateway_host ,port: @config.prometheus_pushgateway_port then
+        unless verify_service url: @config.prometheus_pushgateway_url then
           return  { :case => :service_dependence_missing, :more => "Prometheus Notification not send." }
         end
         session = (options[:session]) ? options[:session] : log.get_session
@@ -70,7 +70,7 @@ module Splash
           @metric_lines.set(lines, labels: { log: item[:log] })
         end
         hostname = Socket.gethostname
-        url = "http://#{@config.prometheus_pushgateway_host}:#{@config.prometheus_pushgateway_port}/#{@config.prometheus_pushgateway_path}"
+        url = @config.prometheus_pushgateway_url
         Prometheus::Client::Push.new('Splash',hostname, url).add(@registry)
         log.ok "Sending to Prometheus PushGateway done.", session
         return {:case => :quiet_exit }

data/lib/splash/processes.rb

@@ -58,7 +58,7 @@ module Splash
       # @return [Hash] Exiter case :quiet_exit
       def notify(options = {})
         log = get_logger
-        unless verify_service host: @config.prometheus_pushgateway_host ,port: @config.prometheus_pushgateway_port then
+        unless verify_service url: @config.prometheus_pushgateway_url then
           return  { :case => :service_dependence_missing, :more => "Prometheus Notification not send." }
         end
         session = (options[:session]) ? options[:session] : log.get_session
@@ -72,7 +72,7 @@ module Splash
           @metric_mem_percent.set(item[:mem], labels: { process: item[:process] })
         end
         hostname = Socket.gethostname
-        url = "http://#{@config.prometheus_pushgateway_host}:#{@config.prometheus_pushgateway_port}/#{@config.prometheus_pushgateway_path}"
+        url = @config.prometheus_pushgateway_url
         Prometheus::Client::Push.new('Splash',hostname, url).add(@registry)
         log.ok "Sending to Prometheus PushGateway done.", session
         return {:case => :quiet_exit }

data/lib/splash/sequences.rb

@@ -0,0 +1,105 @@
+# coding: utf-8
+
+# base Splash module
+module Splash
+
+  # Splash Commands module/namespace
+  module Sequences
+
+    include Splash::Commands
+    include Splash::Config
+    include Splash::Loggers
+    include Splash::Exiter
+    include Splash::Transports
+
+    def run_seq(params = {})
+      list = get_config.sequences
+      name = params[:name].to_sym
+      acase = {}
+      seq_res = []
+      log = get_logger
+      log.info "beginnning Sequence execution : #{name}"
+      session = (params[:session])? params[:session] : get_session
+      if list.include? name then
+        seq_options = (list[name][:options].nil?)? {} : list[name][:options]
+        list[name][:definition].each do |step|
+          log.info "STEP : #{step[:step]}",session
+          if step[:on_host].nil? then
+            command =  CommandWrapper::new(step[:command].to_s)
+              step[:callback] = true if step[:callback].nil?
+              step[:trace] = true if step[:trace].nil?
+              step[:notify] = true if step[:notify].nil?
+              step[:session] = session
+              acase = command.call_and_notify step
+          else
+            log.info "Remote execution of #{step[:command]} on #{step[:on_host]}", session
+            begin
+              transport = get_default_client
+              if transport.class == Hash  and transport.include? :case then
+                return transport
+              else
+                acase = transport.execute({ :verb => :execute_command,
+                                          payload: {:name => step[:command].to_s},
+                                         :return_to => "splash.#{Socket.gethostname}.return",
+                                         :queue => "splash.#{step[:on_host]}.input" })
+                log.receive "return with exitcode #{acase[:exit_code]}", session
+              end
+            rescue Interrupt
+              acase = { case: :interrupt, more: "Remote command exection", exit_code: 33}
+            end
+
+           end
+           seq_res.push acase[:exit_code]
+           continue = (seq_options[:continue].nil?)? true : seq_options[:continue]
+           if acase[:exit_code] > 0 and continue == false then
+             acase[:more] = "Break execution on error, continue = false"
+             break
+           end
+        end
+      else
+        return  { :case => :not_found, :more => "Sequence #{name} not configured" }
+      end
+
+      if seq_res.select {|res| res > 0}.count == seq_res.count then
+        acase =  { case: :status_ko, more: "all execution failed" }
+      elsif seq_res.select {|res| res > 0}.count > 0 then
+        acase =  { case: :status_ko, more: "some execution failed" }
+      else
+        acase =  { case: :status_ok, more: "all execution successed" }
+      end
+      acase[:more] << " with remote call interrupt" if seq_res.include?(33)
+      return acase
+    end
+
+
+    def list_seq(options = {})
+      list = get_config.sequences
+      unless list.empty?
+        acase = { :case =>  :quiet_exit , :more => "List configured sequences"}
+        acase[:data] = list
+        return acase
+      else
+        return { :case => :not_found, :more => 'No sequences configured' }
+      end
+    end
+
+    def show_seq(options = {})
+      list = get_config.sequences
+      name = options[:name].to_sym
+      if list.include? name then
+        acase = { :case => :quiet_exit, :more => "Show specific sequence : #{name}"}
+        acase[:data] = list[name]
+      else
+        return { :case => :not_found, :more => "Sequence #{name} not configured" }
+      end
+      return acase
+    end
+
+    def schedule_seq(options = {})
+      acase = { :case => :quiet_exit,  :more => "schedule" }
+      return acase
+
+    end
+
+  end
+end

data/lib/splash/transports/rabbitmq.rb

@@ -100,7 +100,6 @@ module Splash
           condition = ConditionVariable.new
           get_default_subscriber(queue: queue).subscribe do |delivery_info, properties, payload|
             res = YAML::load(payload)
-
             lock.synchronize { condition.signal }
           end
           get_logger.send "Verb : #{order[:verb].to_s} to queue : #{order[:queue]}."

data/lib/splash/webadmin.rb

@@ -29,7 +29,7 @@ module Splash
         realpid = get_processes pattern: get_config.webadmin_process_name
 
 
-        unless File::exist? config.full_pid_path then
+        unless File::exist? config.webadmin_full_pid_path then
           unless realpid.empty? then
             return {:case => :already_exist, :more => "Splash WebAdmin Process already launched "}
           end

data/lib/splash/webadmin/main.rb

@@ -11,8 +11,8 @@ class WebAdminApp < Sinatra::Base
   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/proxy.rb

@@ -1,9 +1,7 @@
 
 
 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
 
@@ -23,8 +21,8 @@ WebAdminApp.get '/proxy/links' do
     @prometheus_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}"
+    @prometheus_url = "#{config.prometheus_url}"
   end
   slim :proxy, :format => :html
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -350,6 +350,7 @@ files:
 - lib/splash/cli/documentation.rb
 - lib/splash/cli/logs.rb
 - lib/splash/cli/process.rb
+- lib/splash/cli/sequences.rb
 - lib/splash/cli/webadmin.rb
 - lib/splash/commands.rb
 - lib/splash/config.rb
@@ -374,6 +375,7 @@ files:
 - lib/splash/loggers/web.rb
 - lib/splash/logs.rb
 - lib/splash/processes.rb
+- lib/splash/sequences.rb
 - lib/splash/templates.rb
 - lib/splash/transports.rb
 - lib/splash/transports/rabbitmq.rb