prometheus-splash 0.5.0 → 0.5.2

data/lib/splash/config.rb

@@ -21,6 +21,7 @@ module Splash
         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
         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
@@ -56,6 +57,10 @@ module Splash
         return self[:daemon_logmon_scheduling]
       end
 
+      def daemon_metrics_scheduling
+        return self[:daemon_metrics_scheduling]
+      end
+
       def execution_template_path
         return self[:execution_template_path]
       end

data/lib/splash/config/flush.rb

@@ -0,0 +1,22 @@
+module Splash
+  module ConfigUtilities
+    include Splash::Constants
+
+
+    def flush_backend(options ={})
+      config = get_config
+      self.extend Splash::Backends
+      self.extend Splash::Loggers
+      log = get_logger
+      log.info "Splash backend flushing"
+      name  = (options[:name])? options[:name] : :execution_trace
+      backend = get_backend name
+      if backend.flush then
+        return { :case => :quiet_exit, :more => "Splash backend #{name.to_s} flushed" }
+      else
+        return { :case => :configuration_error, :more => "Splash backend #{name.to_s} can't be flushed" }
+      end
+    end
+
+  end
+end

data/lib/splash/constants.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 module Splash
   module Constants
-    VERSION = "0.5.0"
+    VERSION = "0.5.2"
 
     # the path to th config file, not overridable by config
     CONFIG_FILE = "/etc/splash.yml"
@@ -11,6 +11,9 @@ module Splash
 
     # default scheduling criteria for log monitoring
     DAEMON_LOGMON_SCHEDULING={ :every => '20s'}
+    # default scheduling criteria for log metrics notifications
+    DAEMON_METRICS_SCHEDULING={ :every => '20s'}
+
     # the display name of daemon in proc info (ps/top)
     DAEMON_PROCESS_NAME="Splash : daemon."
     # the default pid file path

data/lib/splash/daemon.rb

@@ -0,0 +1,2 @@
+# coding: utf-8
+Dir[File.dirname(__FILE__) + '/daemon/*.rb'].each {|file| require file  }

data/lib/splash/{controller.rb → daemon/controller.rb}

@@ -1,13 +1,13 @@
 # coding: utf-8
 module Splash
-  module LogsMonitor
-    module DaemonController
+  module Daemon
+    module Controller
       include Splash::Constants
       include Splash::Helpers
       include Splash::Config
-      include Splash::Orchestrator
       include Splash::Exiter
       include Splash::Loggers
+      include Splash::Daemon::Orchestrator
 
       def startdaemon(options = {})
         config = get_config
@@ -43,7 +43,7 @@ module Splash
               :foreground => options[:foreground]
             }
 
-          ["int","term","hup"].each do |type| daemon_config["sig#{type}_handler".to_sym] = Proc::new {  ObjectSpace.each_object(Splash::Orchestrator::Scheduler).first.shutdown } end
+          ["int","term","hup"].each do |type| daemon_config["sig#{type}_handler".to_sym] = Proc::new {  ObjectSpace.each_object(Splash::Daemon::Orchestrator::Scheduler).first.shutdown } end
           res = daemonize daemon_config do
               Scheduler::new options
           end

data/lib/splash/daemon/metrics.rb

@@ -0,0 +1,78 @@
+module Splash
+  module Daemon
+    module Metrics
+      include Splash::Constants
+      include Splash::Helpers
+      include Splash::Config
+      include Splash::Loggers
+
+      @@manager=nil
+      # factory of Configuration Class instance
+      # @param [String] config_file the path of the YAML Config file
+      # @return [SPlash::Config::Configuration]
+      def get_metrics_manager
+        return @@manager ||= Manager::new
+      end
+
+
+      class Manager
+
+        attr_reader :execution_count
+        attr_reader :monitoring_count
+
+        def initialize
+          @config = get_config
+          @starttime = Time.now
+          @execution_count = 0
+          @monitoring_count = 0
+
+          @registry = Prometheus::Client::Registry::new
+          @metric_uptime = Prometheus::Client::Gauge.new(:splash_uptime, docstring: 'SPLASH self metric uptime')
+          @metric_execution = Prometheus::Client::Gauge.new(:splash_execution, docstring: 'SPLASH self metric total commands execution count')
+          @metric_monitoring = Prometheus::Client::Gauge.new(:splash_monitoring, docstring: 'SPLASH self metric total logs monitoring count')
+          @registry.register(@metric_uptime)
+          @registry.register(@metric_execution)
+          @registry.register(@metric_monitoring)
+        end
+
+
+        def uptime
+          return Time.now - @starttime
+        end
+
+        def inc_execution
+          @execution_count += 1
+        end
+
+
+        def inc_monitoring
+          @monitoring_count += 1
+        end
+
+
+        def notify
+          log = get_logger
+          session  = get_session
+          unless verify_service host: @config.prometheus_pushgateway_host ,port: @config.prometheus_pushgateway_port then
+            return  { :case => :service_dependence_missing, :more => "Prometheus Notification not send." }
+          end
+
+          log.debug "Sending Splash self metrics to PushGateway." , session
+          @metric_uptime.set uptime
+          @metric_execution.set execution_count
+          @metric_monitoring.set monitoring_count
+          hostname = Socket.gethostname
+          url = "http://#{@config.prometheus_pushgateway_host}:#{@config.prometheus_pushgateway_port}"
+          Prometheus::Client::Push.new('Splash',hostname, url).add(@registry)
+          log.debug "Sending to Prometheus PushGateway done.", session
+          return {:case => :quiet_exit }
+        end
+
+
+
+      end
+
+
+    end
+  end
+end

data/lib/splash/{orchestrator.rb → daemon/orchestrator.rb}

@@ -1,21 +1,25 @@
 # coding: utf-8
 Dir[File.dirname(__FILE__) + '/orchestrator/*.rb'].each {|file| require file  }
 
-
-
 module Splash
-  module Orchestrator
+  module Daemon
+    module Orchestrator
 
-    class Scheduler
+      class Scheduler
         include Splash::Constants
         include Splash::Helpers
         include Splash::Config
         include Splash::Transports
-        include Splash::Orchestrator::Grammar
+        include Splash::Daemon::Orchestrator::Grammar
         include Splash::Loggers
+        include Splash::Logs
+        include Splash::Commands
+
 
         def initialize(options = {})
           @log = get_logger
+          self.extend Splash::Daemon::Metrics
+          @metric_manager = get_metrics_manager
           $stdout.sync = true
           $stderr.sync = true
           @server  = Rufus::Scheduler::new
@@ -32,6 +36,7 @@ module Splash
           @server.send sched,value do
             begin
               session = get_session
+              @metric_manager.inc_monitoring
               @log.trigger "Logs monitoring for Scheduling : #{sched.to_s} #{value.to_s}", session
               @result.analyse
               @result.notify :session => session
@@ -39,6 +44,18 @@ module Splash
               @log.error "PushGateway seems to be done, please start it.", session
             end
           end
+
+          sched,value = @config.daemon_metrics_scheduling.flatten
+
+          @log.item "Initializing Splash metrics notifications."
+          @server.send sched,value do
+            begin
+              @metric_manager.notify
+            rescue Errno::ECONNREFUSED
+              @log.error "PushGateway seems to be done, please start it."
+            end
+          end
+
           hostname = Socket.gethostname
           transport = get_default_subscriber queue: "splash.#{hostname}.input"
           if transport.class == Hash and transport.include? :case then
@@ -69,32 +86,32 @@ module Splash
 
         private
         def init_commands_scheduling
-            config = get_config.commands
-            commands = config.select{|key,value| value.include? :schedule}.keys
-            commands.each do |command|
-              sched,value = config[command][:schedule].flatten
-              @log.arrow "Scheduling command #{command.to_s}"
-              @server.send sched,value do
-                session  = get_session
-                @log.trigger "Executing Scheduled command #{command.to_s} for Scheduling : #{sched.to_s} #{value.to_s}", session
-                execute command: command.to_s, session: session
-              end
+          config = get_config.commands
+          commands = config.select{|key,value| value.include? :schedule}.keys
+          commands.each do |command|
+            sched,value = config[command][:schedule].flatten
+            @log.arrow "Scheduling command #{command.to_s}"
+            @server.send sched,value do
+              session  = get_session
+              @log.trigger "Executing Scheduled command #{command.to_s} for Scheduling : #{sched.to_s} #{value.to_s}", session
+              execute command: command.to_s, session: session
             end
+          end
 
         end
 
         def execute(options)
-          command =  Splash::CommandWrapper::new(options[:command])
+          command =  CommandWrapper::new(options[:command])
           if options[:ack] then
             command.ack
           else
+            @metric_manager.inc_execution
             return command.call_and_notify trace: true, notify: true, callback: true, session: options[:session]
           end
         end
 
       end
 
-
     end
-
   end
+end

data/lib/splash/daemon/orchestrator/grammar.rb

@@ -0,0 +1,56 @@
+# coding: utf-8
+module Splash
+  module Daemon
+    module Orchestrator
+      module Grammar
+
+        include Splash::Config
+        include Splash::Loggers
+
+
+        VERBS=[:ping,:list_commands,:execute_command,:ack_command, :shutdown]
+
+
+        def shutdown
+          terminate
+        end
+
+        def ping(content)
+          return "Pong : #{content[:payload][:hostname]} !"
+        end
+
+
+        def list_commands(content)
+          return get_config.commands
+        end
+
+        def ack_command(content)
+          return execute command: content[:payload][:name], ack: true
+        end
+
+
+        def execute_command(content)
+          payload = content[:payload]
+          unless get_config.commands.include? payload[:name].to_sym
+            @log.item "Command not found", content[:session]
+            return { :case => :not_found }
+          end
+          if payload.include? :schedule then
+            sched,value = payload[:schedule].flatten
+            @log.schedule "remote call command #{payload[:name]}, scheduling : #{sched.to_s} #{value}", content[:session]
+            @server.send sched,value do
+              @log.trigger "Executing Scheduled command #{payload[:name]} for Scheduling : #{sched.to_s} #{value}", content[:session]
+              execute command: payload[:name], session: content[:session]
+            end
+            return { :case => :quiet_exit }
+          else
+            @log.info "Execute direct command",  content[:session]
+            res = execute command: payload[:name], session: content[:session]
+            return res
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/splash/daemon/orchestrator/hooks.rb

@@ -0,0 +1,18 @@
+# coding: utf-8
+module Splash
+  module Daemon
+    module Orchestrator
+
+      module SchedulerHooks
+        def on_pre_trigger(job, trigger_time)
+
+        end
+
+        def on_post_trigger(job, trigger_time)
+
+        end
+
+      end
+    end
+  end
+end

data/lib/splash/dependencies.rb

@@ -48,8 +48,8 @@ module Splash
 
     require 'splash/commands'
     require 'splash/logs'
-    require 'splash/orchestrator'
-    require 'splash/controller'
+    require 'splash/daemon'
+
 
   end
 end

data/lib/splash/helpers.rb

@@ -159,9 +159,7 @@ module Splash
       if options[:foreground]
         change_logger logger: :dual
         Process.setproctitle options[:description] if options[:description]
-        p $0
         return yield
-        p 'titi'
       end
       fork do
         change_logger logger: :daemon

data/lib/splash/loggers.rb

@@ -10,12 +10,12 @@ module Splash
     def get_logger(options = {})
       logger = (get_config.loggers[:list].include? options[:logger])? options[:logger].to_s : get_config.loggers[:default].to_s
       aclass = "Splash::Loggers::#{logger.capitalize}"
-#      begin
+      begin
         return @@logger = Kernel.const_get(aclass)::new if options[:force]
         return @@logger ||= Kernel.const_get(aclass)::new
-#      rescue
-#        splash_exit case: :configuration_error, more: "Logger specified inexistant : #{logger}"
-#      end
+      rescue
+        splash_exit case: :configuration_error, more: "Logger specified inexistant : #{logger}"
+      end
     end
 
     def get_session
@@ -24,19 +24,20 @@ module Splash
 
 
     def change_logger(options = {})
+      level = get_logger.level
       options[:force] = true
-      get_logger(options)
+      get_logger(options).level = level
     end
 
-
+    LEVELS = [:debug, :warn, :info, :result, :fatal, :unknown]
+    ALIAS = {:flat => :info, :item => :info, :ok => :info, :ko => :info, :trigger => :info,
+      :schedule => :info, :arrow => :info, :send => :info,
+      :receive => :info, :error => :result, :success => :result }
 
     class LoggerTemplate
       include Splash::Config
 
-      LEVELS = [:debug, :warn, :info, :result, :fatal, :unknown]
-      ALIAS = {:flat => :info, :item => :info, :ok => :info, :ko => :info, :trigger => :info,
-        :schedule => :info, :arrow => :info, :send => :info,
-        :receive => :info, :error => :result, :success => :result }
+
       LEVELS.each do |method|
         define_method(method) do |message,session = ''|
             self.log({ :level => method, :message => message, :session => session})

data/lib/splash/loggers/dual.rb

@@ -1,10 +1,22 @@
 module Splash
   module Loggers
 
-    class Dual < Splash::Loggers::LoggerTemplate
+    class Dual #< Splash::Loggers::LoggerTemplate
+
+
       include Splash::Config
 
 
+      LEVELS.each do |method|
+        define_method(method) do |message,session = ''|
+            self.log({ :level => method, :message => message, :session => session})
+        end
+      end
+      ALIAS.keys.each do |method|
+        define_method(method) do |message,session = ''|
+            self.log({ :level => method, :message => message, :session => session})
+        end
+      end
 
       def initialize
         super
@@ -16,7 +28,15 @@ module Splash
         @log1.log options
         @log2.log options
       end
+      def level
+        @level
+      end
 
+      def level=(level)
+        @level = level
+        @log1.level=level
+        @log2.level=level
+      end
     end
   end
 end