prometheus-splash 0.1.0 → 0.1.1

data/lib/splash/config.rb

@@ -1,4 +1,4 @@
-require 'etc'
+# coding: utf-8
 module Splash
   module Config
     include Splash::Helpers
@@ -175,11 +175,10 @@ module Splash
       end
 
       if full_res > 0 then
-        $stderr.puts "Splash config done with #{full_res} errors"
-        return 25
+        $stderr.puts " => #{full_res} errors occured"
+        return { :case => :splash_setup_error}
       else
-        puts "Splash config successfully done."
-        return 0
+        return { :case => :splash_setup_success }
       end
 
     end
@@ -230,11 +229,10 @@ module Splash
       end
 
       if full_res > 0 then
-        $stderr.puts "Sanitycheck finished with #{full_res} errors"
-        return 20
+        $stderr.puts " => #{full_res} errors occured"
+        return { :case => :splash_sanitycheck_error }
       else
-        puts "Sanitycheck finished with no errors"
-        return 0
+        return { :case => :splash_sanitycheck_success}
       end
     end
 

data/lib/splash/constants.rb

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

data/lib/splash/controller.rb

@@ -1,4 +1,4 @@
-
+# coding: utf-8
 module Splash
   module LogsMonitor
     module DaemonController
@@ -10,9 +10,7 @@ module Splash
       def startdaemon(options = {})
         config = get_config
         unless verify_service host: config.prometheus_pushgateway_host ,port: config.prometheus_pushgateway_port then
-          $stderr.puts "Prometheus PushGateway Service is not running,"
-          $stderr.puts " please start before running Splash daemon."
-          exit 11
+          return {:case => :service_dependence_missing, :more => 'Prometheus Gateway'}
         end
 
         unless File::exist? config.full_pid_path then
@@ -25,36 +23,31 @@ module Splash
           if res == 0 then
             pid = `cat #{config.full_pid_path}`.to_i
             puts "Splash Daemon Started, with PID : #{pid}"
+            return {:case => :quiet_exit}
           else
-            $stderr.puts "Splash Daemon loading error"
+            return {:case => :unknown_error, :more => "Splash Daemon loading error"}
           end
-          return res
 
         else
-          $stderr.puts "Pid File already exist, please verify if Splash daemon is running."
-          return 14
+          return {:case => :already_exist, :more => "Pid File, please verify if Splash daemon is running."}
         end
       end
 
       def stopdaemon(options = {})
           config = get_config
-          errorcode = 0
           if File.exist?(config.full_pid_path) then
-
             begin
               pid = `cat #{config.full_pid_path}`.to_i
               Process.kill("TERM", pid)
-              puts 'Splash stopped succesfully'
+              acase = {:case => :quiet_exit, :more => 'Splash stopped succesfully'}
             rescue Errno::ESRCH
-              $stderr.puts "Process of PID : #{pid} not found"
-              errorcode = 12
+              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
           else
-            $stderr.puts "Splash is not running"
-            errorcode = 13
+            acase =  {:case => :not_found, :more => "Splash is not running"}
           end
-          return errorcode
+          return acase
       end
 
       def statusdaemon
@@ -75,16 +68,11 @@ module Splash
           puts "and PID file don't exist"
         end
         if pid == realpid then
-          puts 'Status OK'
-          return 0
+          return {:case => :status_ok }
         elsif pid.empty? then
-          $stderr.puts "PID File error, you have to kill process manualy, with : '(sudo )kill -TERM #{realpid}'"
-          $stderr.puts "Status KO"
-          return 16
+          return {:case => :status_ko, :more => "PID File error, you have to kill process manualy, with : '(sudo )kill -TERM #{realpid}'"}
         elsif realpid.empty? then
-          $stderr.puts "Process Splash Dameon missing, run 'splash daemon stop' to reload properly"
-          $stderr.puts "Status KO"
-          return 17
+          return {:case => :status_ko, :more => "Process Splash Dameon missing, run 'splash daemon stop' to reload properly"}
         end
       end
 

data/lib/splash/dependencies.rb

@@ -0,0 +1,51 @@
+# coding: utf-8
+module Splash
+  module Dependencies
+
+
+    # Internal Ruby
+    require 'open3'
+    require 'date'
+    require 'socket'
+    require 'yaml'
+    require 'thread'
+    require 'fileutils'
+    require 'etc'
+    require 'forwardable'
+
+
+
+    # Rubygems
+    begin
+      require 'prometheus/client'
+      require 'prometheus/client/push'
+      require 'thor'
+      require 'bunny'
+      require 'rufus-scheduler'
+      require 'tty-markdown'
+      require 'tty-pager'
+      require "redis"
+
+    rescue Gem::GemNotFoundException
+      $stderr.puts "Loadind error, it's like you try to run Splash, with a lake of dependencies."
+      $stderr.puts "If you run on RVM, please run with rvmsudo and not with sudo."
+      $stderr.puts "If problem is percistant, please, proceed to new install and Setup."
+    end
+
+
+    # Splash
+    require 'splash/constants'
+    require 'splash/helpers'
+    require 'splash/config'
+    require 'splash/exiter'
+    require 'splash/templates'
+    require 'splash/backends'
+    require 'splash/transports'
+
+    require 'splash/commands'
+    require 'splash/logs'
+    require 'splash/orchestrator'
+    require 'splash/controller'
+
+  end
+end

data/lib/splash/exiter.rb

@@ -0,0 +1,52 @@
+module Splash
+  module Exiter
+    EXIT_MAP= {
+
+       # context execution
+       :not_root => {:message => "This operation need to be run as root (use sudo or rvmsudo)", :code => 10},
+       :options_incompatibility => {:message => "Options incompatibility", :code => 40},
+       :service_dependence_missing => {:message => "Splash Service dependence missing", :code => 60},
+
+       # config
+       :specific_config_required => {:message => "Specific configuration required", :code => 30},
+       :splash_setup_error => {:message => "Splash Setup terminated unsuccessfully", :code => 25},
+       :splash_setup_success => {:message => "Splash Setup terminated successfully", :code => 0},
+       :splash_sanitycheck_error => {:message => "Splash Sanitycheck terminated unsuccessfully", :code => 20},
+       :splash_sanitycheck_success => {:message => "Splash Sanitycheck terminated successfully", :code => 0},
+       :configuration_error => {:message => "Splash Configuration Error", :code => 50},
+
+
+       # global
+       :quiet_exit => {:code => 0},
+
+       # events
+       :interrupt => {:message => "Splash user operation interrupted", :code => 33},
+
+       # request
+       :not_found => {:message => "Object not found", :code => 44},
+       :already_exist => {:message => "Object already exist", :code => 48},
+
+       # daemon
+       :status_ok => {:message => "Status OK", :code => 0},
+       :status_ko => {:message => "Status KO", :code => 31}
+
+    }
+
+    def splash_exit(options = {})
+      mess = ""
+      mess = EXIT_MAP[options[:case]][:message] if EXIT_MAP[options[:case]].include? :message
+      mess << " : " unless mess.empty? or not options[:more]
+      mess << "#{options[:more]}" if options[:more]
+      if  EXIT_MAP[options[:case]][:code] == 0 then
+        puts mess unless mess.empty?
+        exit 0
+      else
+        $stderr.puts mess unless mess.empty?
+        exit EXIT_MAP[options[:case]][:code]
+      end
+    end
+
+
+
+  end
+end

data/lib/splash/helpers.rb

@@ -1,7 +1,3 @@
-# coding: utf-8
-require 'fileutils'
-require 'etc'
-
 # coding: utf-8
 module Splash
   module Helpers
@@ -35,11 +31,9 @@ module Splash
     # facilité pour s'assurer qu'on execute une méthode avec les droits root
     # @param [Symbol] method a method name th wrap
     # @return [void] le retour de la méthode wrappée
-    def run_as_root(method)
+    def run_as_root(method, options = {})
       unless is_root?
-        $stderr.puts "You need to be root to execute this subcommands : #{method.to_s}"
-        $stderr.puts "Please execute with sudo, or rvmsudo."
-        exit 10
+        return {:case => :not_root, :more => "subcommands : #{method.to_s}"}
       else
         return self.send method
       end

data/lib/splash/logs.rb

@@ -1,5 +1,4 @@
-require 'socket'
-
+# coding: utf-8
 module Splash
   class LogScanner
     include Splash::Constants
@@ -34,6 +33,7 @@ module Splash
           record[:status] = :missing
         end
       end
+      return {:case => :quiet_exit }
     end
 
     # pseudo-accessor on @logs_target
@@ -44,9 +44,7 @@ module Splash
     # start notification on prometheus for metric logerrors, logmissing; loglines
     def notify
       unless verify_service host: @config.prometheus_pushgateway_host ,port: @config.prometheus_pushgateway_port then
-        $stderr.puts "Prometheus PushGateway Service IS NOT running"
-        $stderr.puts "Exit without notification."
-        exit 30
+        return  { :case => :service_dependence_missing, :more => "Prometheus Notification not send." }
       end
       puts "Sending metrics to Prometheus Pushgateway"
       @logs_target.each do |item|
@@ -61,6 +59,7 @@ module Splash
       url = "http://#{@config.prometheus_pushgateway_host}:#{@config.prometheus_pushgateway_port}"
       Prometheus::Client::Push.new('Splash',hostname, url).add(@registry)
       puts "Sending done."
+      return {:case => :quiet_exit }
     end
 
   end

data/lib/splash/orchestrator.rb

@@ -1,6 +1,4 @@
-require 'socket'
-require 'yaml'
-
+# coding: utf-8
 module Splash
   module Orchestrator
 
@@ -35,7 +33,6 @@ module Splash
       end
     end
 
-
     class Scheduler
         include Splash::Constants
         include Splash::Helpers
@@ -46,8 +43,10 @@ module Splash
           @server  = Rufus::Scheduler::new
           @server.extend SchedulerHooks
           @server.init_log
+          @config = get_config
           @result = LogScanner::new
-          @server.every '20s' do
+          sched,value = @config.daemon_logmon_scheduling.flatten
+          @server.send sched,value do
             begin
               puts "Notify"
               @result.analyse

data/lib/splash/templates.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module Splash
   module Templates
 

data/lib/splash/transports.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 Dir[File.dirname(__FILE__) + '/transports/*.rb'].each {|file| require file  }
 
 module Splash

data/lib/splash/transports/rabbitmq.rb

@@ -1,7 +1,4 @@
-require 'bunny'
-require 'yaml'
-require 'forwardable'
-
+# coding: utf-8
 module Splash
   module Transports
     module Rabbitmq

data/prometheus-splash.gemspec

@@ -23,7 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'prometheus-client','~> 2.0.0'
   spec.add_runtime_dependency 'rufus-scheduler','~> 3.6.0'
   spec.add_runtime_dependency 'redis','~> 4.1.3'
-  spec.add_runtime_dependency 'bunny','~> 2.15.0' 
+  spec.add_runtime_dependency 'bunny','~> 2.15.0'
+  spec.add_runtime_dependency 'tty-markdown','~> 0.6.0'
+  spec.add_runtime_dependency 'tty-pager','~> 0.12.1' 
   spec.add_development_dependency 'rake', '~> 13.0.1'
   spec.add_development_dependency 'rspec', '~> 3.9.0'
   spec.add_development_dependency 'yard', '~> 0.9.24'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.15.0
+- !ruby/object:Gem::Dependency
+  name: tty-markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: tty-pager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -200,10 +228,18 @@ files:
 - lib/splash/backends.rb
 - lib/splash/backends/file.rb
 - lib/splash/backends/redis.rb
+- lib/splash/cli.rb
+- lib/splash/cli/commands.rb
+- lib/splash/cli/config.rb
+- lib/splash/cli/daemon.rb
+- lib/splash/cli/documentation.rb
+- lib/splash/cli/logs.rb
 - lib/splash/commands.rb
 - lib/splash/config.rb
 - lib/splash/constants.rb
 - lib/splash/controller.rb
+- lib/splash/dependencies.rb
+- lib/splash/exiter.rb
 - lib/splash/helpers.rb
 - lib/splash/logs.rb
 - lib/splash/orchestrator.rb