prometheus-splash 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7065fa547ec467bcde47fcb52c57a05fa0abc5e902e3ce1f9ed3c1ac0f64b0d6
-  data.tar.gz: 73cb3e469d7c32adaeebf39987c8c767e2579889bcea5101cdf1492101ffffe6
+  metadata.gz: 6036da9aa1ce8abf1bc28d87c034152654cd75518d46b95bd683f9642b01186c
+  data.tar.gz: ac742574fd569bed467ac95fc33029339335beef8e596717444f6fe74c3bc446
 SHA512:
-  metadata.gz: c390147005809aa6d3fe5aa9975e4f8ca4787fb1a3c359c53e33d21cb50d9329aae48946fcbb8168ee5fbadeba05cf43ca4b2d761435a9b50e60098f30debd2a
-  data.tar.gz: e241c29c18a58c9dbd095323b2d2600fe9e30aacd20096e276d508920124b0419c5e7ee24a0bca5b6f34e5eb8424f79739f57443f980972d7e67e94a75e41b88
+  metadata.gz: af38c990376f81466c893c140946b22ad492cdda47cd0c9fb874ce90dcf543151cee2d8a7f8b285b537d1dd909551839efce6e988256fa5131fe52feac6e77db
+  data.tar.gz: 07742cabe62fa85017c35a1d29e1804060f43113313a071777db977b423ea7668f9bdbe5cd1b78b7af68fd9cd8401540f80a010e5f25803858bca18ef5c5992a

data/config/splash.yml

@@ -78,6 +78,16 @@
     :echo3:
       :desc: echo 'been'
       :command: echo been
+    :rand_sleep_5:
+      :desc: sleep on a rand 5
+      :command: ruby -e 'sleep rand(5)'
+      :schedule:
+        :every: "10s"
+    :test_remote_call:
+      :desc: remote call test
+      :delegate_to:
+        :host: omicron
+        :remote_command: :echo2
 
 
 ### configuration of monitored logs

data/lib/splash/cli/commands.rb

@@ -27,6 +27,7 @@ module CLISplash
     def execute(name)
       if is_root? then
         if options[:hostname] then
+          splash_exit({ :case => :options_incompatibility, :more => '--hostname forbidden with delagate commands'}) if get_config.commands[name.to_sym][:delegate_to]
           puts "Remote Splash configured commands on #{options[:hostname]}:"
           puts "ctrl+c for interrupt"
           begin
@@ -122,6 +123,10 @@ module CLISplash
           puts "   - command description : '#{list[command][:desc]}'"
           puts "   - command failure callback : '#{list[command.to_sym][:on_failure]}'" if list[command.to_sym][:on_failure]
           puts "   - command success callback : '#{list[command.to_sym][:on_success]}'" if list[command.to_sym][:on_success]
+          if list[command.to_sym][:schedule]
+            sched,val = list[command.to_sym][:schedule].flatten
+            puts "   - command scheduled : #{sched} #{val}."
+          end
         end
       end
       splash_exit case: :quiet_exit

data/lib/splash/cli/daemon.rb

@@ -8,13 +8,13 @@ module CLISplash
 
 
     option :foreground, :type => :boolean
-    option :purge, :type => :boolean
+    option :purge, :type => :boolean, default: true
     option :scheduling, :type => :boolean, default: true
     long_desc <<-LONGDESC
     Starting Splash Daemon\n
     With --foreground, run Splash in foreground\n
     With --no-scheduling, inhibit commands scheduling\n
-    With --purge, Purge Input Queue for Splash Daemon
+    With --no-purge, inhibit purge Input Queue for Splash Daemon
     LONGDESC
     desc "start", "Starting Splash Daemon"
     def start
@@ -26,7 +26,6 @@ module CLISplash
           queue = "splash.#{Socket.gethostname}.input"
           transport.purge queue: queue
           puts " * Queue : #{queue} purged"
-          splash_exit case: :quiet_exit
         end
       end
       acase = run_as_root :startdaemon, options

data/lib/splash/commands.rb

@@ -6,6 +6,7 @@ module Splash
     include Splash::Helpers
     include Splash::Backends
     include Splash::Exiter
+    include Splash::Transports
 
 
     @@registry = Prometheus::Client.registry
@@ -42,58 +43,78 @@ module Splash
 
 
     def call_and_notify(options)
-      puts "Executing command : '#{@name}' "
       acase = { :case => :quiet_exit }
-      start = Time.now
-      start_date = DateTime.now.to_s
-      unless options[:trace] then
-        puts " * Traceless execution"
-        if @config.commands[@name.to_sym][:user] then
-          puts " * Execute with user : #{@config.commands[@name.to_sym][:user]}."
-          system("sudo -u #{@config.commands[@name.to_sym][:user]} #{@config.commands[@name.to_sym][:command]} > /dev/null 2>&1")
-        else
-          system("#{@config.commands[@name.to_sym][:command]} > /dev/null 2>&1")
+      exit_code = 0
+      if @config.commands[@name.to_sym][:delegate_to] then
+        return { :case => :options_incompatibility, :more => '--hostname forbidden with delagate commands'} if options[:hostname]
+        puts "Remote command : #{@name} execution delegate to : #{@config.commands[@name.to_sym][:delegate_to][:host]} as : #{@config.commands[@name.to_sym][:delegate_to][:remote_command]}"
+        begin
+          transport = get_default_client
+          if transport.class == Hash  and transport.include? :case then
+            return transport
+          else
+            res = transport.execute({ :verb => :execute_command,
+              payload: {:name => @config.commands[@name.to_sym][:delegate_to][:remote_command].to_s},
+              :return_to => "splash.#{Socket.gethostname}.return",
+              :queue => "splash.#{@config.commands[@name.to_sym][:delegate_to][:host]}.input" })
+            exit_code = res[:exit_code]
+            puts "  => exitcode #{exit_code}"
+
+          end
         end
-        time = Time.now - start
-        exit_code = $?.exitstatus
       else
-        puts " * Tracefull execution"
-        if @config.commands[@name.to_sym][:user] then
-          puts " * Execute with user : #{@config.commands[@name.to_sym][:user]}."
-          stdout, stderr, status = Open3.capture3("sudo -u #{@config.commands[@name.to_sym][:user]} #{@config.commands[@name.to_sym][:command]}")
+        puts "Executing command : '#{@name}' "
+        start = Time.now
+        start_date = DateTime.now.to_s
+        unless options[:trace] then
+          puts " * Traceless execution"
+          if @config.commands[@name.to_sym][:user] then
+            puts " * Execute with user : #{@config.commands[@name.to_sym][:user]}."
+            system("sudo -u #{@config.commands[@name.to_sym][:user]} #{@config.commands[@name.to_sym][:command]} > /dev/null 2>&1")
+          else
+            system("#{@config.commands[@name.to_sym][:command]} > /dev/null 2>&1")
+          end
+          time = Time.now - start
+          exit_code = $?.exitstatus
         else
-          stdout, stderr, status = Open3.capture3(@config.commands[@name.to_sym][:command])
-        end
-        time = Time.now - start
-        tp = Template::new(
+          puts " * Tracefull execution"
+          if @config.commands[@name.to_sym][:user] then
+            puts " * Execute with user : #{@config.commands[@name.to_sym][:user]}."
+            stdout, stderr, status = Open3.capture3("sudo -u #{@config.commands[@name.to_sym][:user]} #{@config.commands[@name.to_sym][:command]}")
+          else
+            stdout, stderr, status = Open3.capture3(@config.commands[@name.to_sym][:command])
+          end
+          time = Time.now - start
+          tp = Template::new(
             list_token: @config.execution_template_tokens,
             template_file: @config.execution_template_path)
-        data = Hash::new
-        data[:start_date] = start_date
-        data[:end_date] = DateTime.now.to_s
-        data[:cmd_name] = @name
-        data[:cmd_line] = @config.commands[@name.to_sym][:command]
-        data[:desc] = @config.commands[@name.to_sym][:desc]
-        data[:status] = status.to_s
-        data[:stdout] = stdout
-        data[:stderr] = stderr
-        data[:exec_time] = time.to_s
-        backend = get_backend :execution_trace
-        key = @name
-        backend.put key: key, value: data.to_yaml
-        exit_code = status.exitstatus
-      end
+          data = Hash::new
+          data[:start_date] = start_date
+          data[:end_date] = DateTime.now.to_s
+          data[:cmd_name] = @name
+          data[:cmd_line] = @config.commands[@name.to_sym][:command]
+          data[:desc] = @config.commands[@name.to_sym][:desc]
+          data[:status] = status.to_s
+          data[:stdout] = stdout
+          data[:stderr] = stderr
+          data[:exec_time] = time.to_s
+          backend = get_backend :execution_trace
+          key = @name
+          backend.put key: key, value: data.to_yaml
+          exit_code = status.exitstatus
+        end
 
-      puts "  => exitcode #{exit_code}"
-      if options[:notify] then
-        acase = notify(exit_code,time.to_i)
-      else
-        puts " * Without Prometheus notification"
+        puts "  => exitcode #{exit_code}"
+        if options[:notify] then
+          acase = notify(exit_code,time.to_i)
+        else
+          puts " * Without Prometheus notification"
+        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
-
         if on_failure and exit_code > 0 then
           puts " * On failure callback : #{on_failure}"
           if @config.commands.keys.include?  on_failure then
@@ -115,6 +136,7 @@ module Splash
       else
         puts " * Without callbacks sequences"
       end
+      acase[:exit_code] = exit_code
       return acase
     end
   end

data/lib/splash/config/setup.rb

@@ -8,7 +8,7 @@ module Splash
     include Splash::Helpers
     # Setup action method for installing Splash
     # @return [Integer] an errorcode value
-    def setupsplash
+    def setupsplash(options = {})
       conf_in_path = search_file_in_gem "prometheus-splash", "config/splash.yml"
       full_res = 0
       puts "Splash -> setup : "

data/lib/splash/constants.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 module Splash
   module Constants
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
 
     # the path to th config file, not overridable by config
     CONFIG_FILE = "/etc/splash.yml"

data/lib/splash/orchestrator.rb

@@ -1,6 +1,8 @@
 # coding: utf-8
 Dir[File.dirname(__FILE__) + '/orchestrator/*.rb'].each {|file| require file  }
 
+
+
 module Splash
   module Orchestrator
 
@@ -77,7 +79,7 @@ module Splash
           if options[:ack] then
             command.ack
           else
-            command.call_and_notify trace: true, notify: true, callback: true
+            return command.call_and_notify trace: true, notify: true, callback: true
           end
         end
 

data/lib/splash/orchestrator/grammar.rb

@@ -15,7 +15,7 @@ module Splash
         return get_config.commands
       end
 
-      def ack_command
+      def ack_command(payload)
         return self.execute command: payload[:name], ack: true
       end
 
@@ -27,15 +27,18 @@ module Splash
         end
         if payload.include? :schedule then
           sched,value = payload[:schedule].flatten
+          puts " * Schedule remote call command #{payload[:name]}, scheduling : #{sched.to_s} #{value}"
+          @server.send sched,value do
+            self.execute command: payload[:name]
+          end
+          return { :case => :quiet_exit }
         else
-          sched = :in
-          value = '1s'
+          puts " * Execute direct command"
+          puts payload[:name]
+          res = self.execute command: payload[:name]
+          puts res.inspect
+          return res
         end
-        puts " * Schedule remote call command #{payload[:name]}, scheduling : #{sched.to_s} #{value}"
-        @server.send sched,value do
-          self.execute command: payload[:name]
-        end
-        return { :case => :quiet_exit }
       end
 
     end

data/lib/splash/transports/rabbitmq.rb

@@ -64,8 +64,9 @@ module Splash
           lock = Mutex.new
           res = nil
           condition = ConditionVariable.new
-          get_default_subscriber(queue: queue).subscribe(timeout: 5) do |delivery_info, properties, payload|
+          get_default_subscriber(queue: queue).subscribe do |delivery_info, properties, payload|
             res = YAML::load(payload)
+
             lock.synchronize { condition.signal }
           end
           get_default_client.publish queue: order[:queue], message: order.to_yaml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Romain GEORGES