prometheus-splash 0.4.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66529d2675de97b1938780ea84806295f26a826dd7e05fbe3132c6e125fa6934
-  data.tar.gz: a137a6c2a50f06dc6ce9c03e23ab62e3268fdfc2d166ddcc494d30b33609e3db
+  metadata.gz: 54e538fd7e22b4dc38c1253db96c6e842bf81d1378db0434295c0a827e23bfb7
+  data.tar.gz: c951aaf9aacd398d0944594185fc8d4986de4268162a62cedd69ff0c96d26f9d
 SHA512:
-  metadata.gz: a91247f76572495354be94bb57a9d1c4d26f58eec91b5c28a0e244c3e3a66df2e987dc39031a6323c8e9eb16739f7f382614312cb89473da98f9e04a96e04f00
-  data.tar.gz: 1472ea5a558e52ca43e8d893037a4b7f540920ac28e5fd9df156bad66540374cb8e61ef6166d37856ab59b4fa21c0e592ade34ef56013a15f48a920f43429add
+  metadata.gz: 110950f5ac22753830d8b6f1fd74eaf86d77c78eb18728613215fc671279aa8c6da577ba3d54250640c747c76f35c66cd35ffd2ccb38cfc47d65a7c47e408b2b
+  data.tar.gz: 18aecf0d1f4f080ec1863ec79e17cc6d0582b5cd7f9efac442162c0095d92658372fa2bad1b3c502dd0e44a731a4fd9fe9710bae3e6a4d00be5759610ad08c1c

data/CHANGELOG.md

@@ -12,14 +12,14 @@
 * adding \n for LONGDESC Thor #14
 * Doc for command name format in YAML #2
 
-### CHANGE :
+### CHANGES :
 
 * RabbitMQ Credentials and vhosts support #16
 * backend hardening #18
 * remote show with --hostname #12
 
 
-### FEATURE :
+### FEATURES :
 
 * CLI colors and logger CLI /dual #8
 * Log for splash daemon #6
@@ -55,4 +55,73 @@
 
 ### DOC :
 
-* prepare Vagrantfile and Ansible playbook 
+* prepare Vagrantfile and Ansible playbook
+
+
+## V 0.4.5 2020/04/17
+
+### FIX :
+
+* RabbitMQ Exception catching + refacto connection #31  
+
+
+## V 0.5.0 2020/04/17
+
+### FIX
+
+* auto setup root check without /etc/splash.yml #34
+* empty hostname with --hostname #27
+* foreground execution control #24
+* root required for file backend with command last and get #36
+
+### FEATURES
+
+* command treeview with --hostname #28
+* log horodating with PID #35
+* quiet mode + no-colors and no-emoji #5
+* correlation id in log for daemon #15
+* systemd Splashd service installation #32
+
+
+## V 0.5.1 2020/04/17
+
+### CHANGES
+
+* short Alias for commands without --no-[xxxx] #38
+* REFACTO : namespaces
+ * Splash::Commands
+ * Splash::Log
+ * Splash::Daemon
+ * Splash::Daemon::Orchestrator
+
+
+### FEATURES
+
+* flush backend arg in config #41
+* adding global --debug flag
+* adding splash Daemon metrics #25
+
+### DOC
+
+* default value of mon scheduling 20s => 1m in ansible splash.yml
+
+
+### FIX
+
+* Ansible Splash role handler error
+* Ansible Splash role logrotate copytruncate for splash logs
+* Prometheus Registry mismatch=> cumulative metrics on each groups #42
+* logger Dual level conservation #43
+
+## V 0.5.2 2020/04/18
+
+### FIX
+
+* dual logger daemon shutdown foreground error
+
+## V 0.5.3 2020/04/18
+
+### FEATURE
+
+* processes monitoring #23
+ 

data/README.md

@@ -9,7 +9,7 @@ SPLASH is **Supervision with Prometheus of Logs and Asynchronous tasks orchestra
 * Web : http://www.ultragreen.net
 * Github : https://github.com/Ultragreen/prometheus-splash
 * Rubygems : https://rubygems.org/gems/prometheus-splash
-* DOC yardoc : https://www.rubydoc.info/gems/prometheus-splash/0.3.0
+* DOC yardoc : https://www.rubydoc.info/gems/prometheus-splash/0.6.0
 
 Prometheus Logs and Batchs supervision over PushGateway
 
@@ -65,10 +65,12 @@ As root or with rvmsudo, if you use RVM.
     # splash config setup              
     Splash -> setup :
     * Installing Configuration file : /etc/splash.yml : [OK]
-    * Installing template file : /etc/splash_execution_report.tpl : [OK]
-    * Creating/Checking pid file path : /var/lib/splash : [OK]
-    * Creating/Checking trace file path : /var/lib/splash : [OK]
-    Splash config successfully done.
+    👍 Splash Initialisation
+    👍 Installing template file : /etc/splash_execution_report.tpl
+    👍 Creating/Checking pid file path : /var/run/splash
+    👍 Creating/Checking trace file path : /var/run/spla
+
+*NOTE : you can just type 'splash' withou any arguments, for the first setup because, Splash come with an automatic recovery mode, when configuration file is missing, run at the very beginnning of his the execution*     
 
 *WARNING : if you have already configured Splash, running this command without --preserve flag, RESET the Splash Configuration.*
 
@@ -121,7 +123,7 @@ For file/folders if problems is detected, it could be such as :
 run :
 
     $ splash config version
-    Splash version : 0.0.3, Author : Romain GEORGES <gems@ultragreen.net>
+    Splash version : 0.6.0, Author : Romain GEORGES <gems@ultragreen.net>
     Ultragreen (c) 2020 BSD-2-Clause
 
 
@@ -652,74 +654,70 @@ TODO
 
  defined in the lib/splash/constants.rb
 
-```ruby
 
-# the only one non-overridable by the configuration
-CONFIG_FILE = "/etc/splash.yml"
+
+    # the only one non-overridable by the configuration
+    CONFIG_FILE = "/etc/splash.yml"
 
 
-TRACE_PATH="/var/run/splash"
+    TRACE_PATH="/var/run/splash"
 
-DAEMON_LOGMON_SCHEDULING={ :every => '20s'}
-DAEMON_PROCESS_NAME="Splash : daemon."
-DAEMON_PID_PATH="/var/run"
-DAEMON_PID_FILE="splash.pid"
-DAEMON_STDOUT_TRACE="stdout.txt"
-DAEMON_STDERR_TRACE="stderr.txt"
+    DAEMON_LOGMON_SCHEDULING={ :every => '20s'}
+    DAEMON_PROCESS_NAME="Splash : daemon."
+    DAEMON_PID_PATH="/var/run"
+    DAEMON_PID_FILE="splash.pid"
+    DAEMON_STDOUT_TRACE="stdout.txt"
+    DAEMON_STDERR_TRACE="stderr.txt"
 
-AUTHOR="Romain GEORGES"
-EMAIL = "gems@ultragreen.net"
-COPYRIGHT="Ultragreen (c) 2020"
-LICENSE="BSD-2-Clause"
+    AUTHOR="Romain GEORGES"
+    EMAIL = "gems@ultragreen.net"
+    COPYRIGHT="Ultragreen (c) 2020"
+    LICENSE="BSD-2-Clause"
 
-PROMETHEUS_PUSHGATEWAY_HOST = "localhost"
-PROMETHEUS_PUSHGATEWAY_PORT = "9091"
+    PROMETHEUS_PUSHGATEWAY_HOST = "localhost"
+    PROMETHEUS_PUSHGATEWAY_PORT = "9091"
 
-EXECUTION_TEMPLATE="/etc/splash_execution_report.tpl"
-EXECUTION_TEMPLATE_TOKENS_LIST = [:end_date,:start_date,:cmd_name,:cmd_line,:stdout,:stderr,:desc,:status,:exec_time]
+    EXECUTION_TEMPLATE="/etc/splash_execution_report.tpl"
+    EXECUTION_TEMPLATE_TOKENS_LIST = [:end_date,:start_date,:cmd_name,:cmd_line,:stdout,:stderr,:desc,:status,:exec_time]
 
-BACKENDS_STRUCT = { :list => [:file,:redis],
+    BACKENDS_STRUCT = { :list => [:file,:redis],
                     :stores => { :execution_trace => { :type => :file, :path => "/var/run/splash" }}}
-TRANSPORTS_STRUCT = { :list => [:rabbitmq],
+    TRANSPORTS_STRUCT = { :list => [:rabbitmq],
                     :active => :rabbitmq,
                     :rabbitmq => { :url => 'amqp://localhost/'} }
 
-```
-
 
 #### Splash CLI return code significations
-```ruby
-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}
-```
-}
+
+
+    # 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}
+
 
 ### In the Futur ?
 

data/bin/splash

@@ -1,6 +1,7 @@
-#!/usr/bin/env ruby 
+#!/usr/bin/env ruby
 # coding: utf-8
 
+# major include
 require 'splash/dependencies'
 require 'splash/cli'
 
@@ -13,12 +14,19 @@ include Splash::Exiter
 include Splash::Loggers
 include Splash::Config
 
+# auto setup
 unless verify_file(name: CONFIG_FILE, mode: "644", owner: user_root, group: group_root).empty? then
-  puts 'ERROR: Splash need reconfiguration : execution abort, '
-  puts ' => Restart after rebuild (recheck for homemade templates) :'
+  puts 'Splash need reconfiguration : Auto setup launch'
 
-  acase = run_as_root :setupsplash
-  splash_exit acase
+  if is_root? then
+    acase = setupsplash
+    splash_exit acase
+  else
+    puts 'ERROR : auto setup not start, because your not root, please run as root :'
+    puts '(sudo or rvmsudo) splash [conf setup]'
+    exit 50
+  end
 end
 
+# running Thor
 CLI.start(ARGV)

data/config/splash.yml

@@ -34,6 +34,10 @@
   :daemon:
     :logmon_scheduling:
       :every: 20s
+    :metrics_scheduling:
+      :every: 15s
+    :procmon_scheduling:
+      :every: 20s
     :process_name: "Splash : daemon."
     :paths:
       :pid_path: /var/run/splash
@@ -46,6 +50,17 @@
     :pushgateway:
       :host: "localhost"
       :port: 9091
+      :path: ''
+    :url: "http://localhost:9090/"
+  :webadmin:
+    :port: 9234
+    :ip: 127.0.0.1
+    :proxy: false
+    :process_name: "Splash : WebAdmin."
+    :files:
+      :stdout_trace: stdout_webadmin.txt
+      :stderr_trace: stderr_webadmin.txt
+      :pid_file: splash_webadmin.pid
 
 
 ### configuration of commands and scheduling
@@ -102,7 +117,16 @@
 
 ### configuration of monitored logs
   :logs:
-    - :log: /tmp/test
+    - :label: :log_app_1
+      :log: /tmp/test
       :pattern: ERROR
-    - :log: /tmp/test2
+    - :label: :log_app_2
+      :log: /tmp/test2
       :pattern: ERROR
+
+
+### configuration of monitored processes
+  :processes:
+    - :process: cron
+      :patterns:
+        - cron

data/lib/splash/backends.rb

@@ -1,11 +1,17 @@
 # coding: utf-8
 Dir[File.dirname(__FILE__) + '/backends/*.rb'].each {|file| require file  }
 
+# base Splash Module
 module Splash
+
+  # generic backends module
   module Backends
     include Splash::Config
     include Splash::Constants
 
+    # factory for backend
+    # @param [Symbol] store the name of the store actually in [:execution_trace]
+    # @return [Splash::Backends::<Type>|Hash] with type in [:redis,:file] or Exiter case :configuration_error 
     def get_backend(store)
       backend = get_config[:backends][:stores][store][:type].to_s
       aclass = "Splash::Backends::#{backend.capitalize}"

data/lib/splash/backends/file.rb

@@ -1,46 +1,86 @@
 # coding: utf-8
+
+# base Splash Module
 module Splash
+  # generic backends module
   module Backends
+
+    # File backend definition
     class File
       include Splash::Config
       include Splash::Exiter
       include Splash::Helpers
       include Splash::Loggers
 
+      # Constructor
+      # @param [Symbol] store name in [:execution_trace] actually (see config and constants )
+      # @return [Splash::Backends::File] a File backend
       def initialize(store)
         @config = get_config[:backends][:stores][store]
         @path = @config[:path]
         ensure_backend
       end
 
+      # return the list of find records in backend for a specific pattern
+      # @param [String] pattern shell regexp
+      # @return [Array] list of record
       def list(pattern='*')
         pattern = suffix_trace(pattern)
         return Dir.glob("#{@path}/#{pattern}").map{|item| ::File.basename(item,".trace") }
       end
 
+
+      # return value of queried record
+      # @param [Hash] options
+      # @option options [Symbol] :key the name of the record
+      # @return [String] content value of record
       def get(options)
         return ::File.readlines("#{@path}/#{suffix_trace(options[:key])}").join
       end
 
+      # defined and store value for specified key
+      # @param [Hash] options
+      # @option options [Symbol] :key the name of the record
+      # @option options [Symbol] :value the content value of the record
+      # @return [String] content value of record
       def put(options)
         ::File.open("#{@path}/#{suffix_trace(options[:key])}", 'w') { |file|
           file.write options[:value]
         }
       end
 
+      # delete a specific record
+      # @param [Hash] options
+      # @option options [Symbol] :key the name of the record
+      # @return [Boolean] status of the operation
       def del(options)
         ::File.unlink("#{@path}/#{suffix_trace(options[:key])}") if File.exist?("#{@path}/#{suffix_trace(options[:key])}")
       end
 
+      # verifiy a specific record existance
+      # @param [Hash] options
+      # @option options [Symbol] :key the name of the record
+      # @return [Boolean] presence of the record
       def exist?(options)
         return ::File.exist?("#{@path}/#{suffix_trace(options[:key])}")
       end
 
+      # flush all records in backend
+      def flush
+        Dir.glob("#{@path}/*.trace").each { |file| ::File.delete(file)}
+      end
+
       private
+
+      # File backend specific method for suffixing record name with .trace for filename
+      # @param [String] astring
+      # @return [String] suffixed string
       def suffix_trace(astring)
         return "#{astring}.trace"
       end
 
+      # File backend specific method to test backend, correcting if requiered, spool path checking
+      # @return [True|Hash] Exiter case :configuration_error if failing to correct backend
       def ensure_backend
         unless verify_folder(name: @config[:path], mode: "644", owner: get_config.user_root, group: get_config.group_root).empty? then
           get_logger.warn "File Backend folder : #{@config[:path]} is missing"

data/lib/splash/backends/redis.rb

@@ -1,57 +1,100 @@
 # coding: utf-8
+
+# base Splash Module
 module Splash
+
+  # generic backends module
   module Backends
+
+    # Redis backend definition
     class Redis
       include Splash::Config
+
+      # Constructor
+      # @param [Symbol] store name in [:execution_trace] actually (see config and constants )
+      # @return [Splash::Backends::Redis] a Redis backend
       def initialize(store)
         @hostname = Socket.gethostname
         @config = get_config[:backends][:stores][store]
         conf = { :host => @config[:host], :port => @config[:port], :db => @config[:base].to_i}
         conf[:password] = @config[:auth] if @config[:auth]
         @store = ::Redis.new conf
-        @redis_cli_cmd = `which redis-cli`
+        #@redis_cli_cmd = `which redis-cli`
         @store.auth(@config[:auth]) if @config[:auth]
       end
 
+      # return the list of find records in backend for a specific pattern
+      # @param [String] hostname optionnal (default : local hostname)
+      # @param [String] pattern shell regexp
+      # @return [Array] list of record (for all hostname if hostname is specified)
       def list(pattern='*', hostname = @hostname)
          return @store.keys("#{hostname}##{pattern}").map{|item| item = remove_hostname(item)}
       end
 
+      # return the list of find records in backend for a specific pattern, without hostname Checking
+      # Redis Backend specific method
+      # @param [String] pattern shell regexp
+      # @return [Array] list of record (for all hostname if hostname is specified)
       def listall(pattern='*')
          return @store.keys(pattern)
       end
 
+      # return value of queried record
+      # @param [Hash] options
+      # @option options [Symbol] :key the name of the record
+      # @return [String] content value of record
       def get(options)
         hostname = (options[:hostname])? options[:hostname] : @hostname
         return @store.get(prefix_hostname(options[:key],hostname))
       end
 
+      # defined and store value for specified key
+      # @param [Hash] options
+      # @option options [Symbol] :key the name of the record
+      # @option options [Symbol] :value the content value of the record
+      # @return [String] content value of record
       def put(options)
         hostname = (options[:hostname])? options[:hostname] : @hostname
         @store.set prefix_hostname(options[:key],hostname), options[:value]
       end
 
+      # delete a specific record
+      # @param [Hash] options
+      # @option options [Symbol] :key the name of the record
+      # @return [Boolean] status of the operation
       def del(options)
         hostname = (options[:hostname])? options[:hostname] : @hostname
         @store.del prefix_hostname(options[:key],hostname)
       end
 
+      # flush all records in backend
       def flush
-        `#{@redis_cli_cmd} -n 3 flushdb`
-        # @@store.flushdb
+        #`#{@redis_cli_cmd} -n #{@config[:base]} flushdb`
+        @store.flushdb
       end
 
+      # verifiy a specific record existance
+      # @param [Hash] options
+      # @option options [Symbol] :key the name of the record
+      # @return [Boolean] presence of the record
       def exist?(options)
         hostname = (options[:hostname])? options[:hostname] : @hostname
         return ( not @store.get(prefix_hostname(options[:key],hostname)).nil?)
       end
 
       private
+
+      # Redis backend specific method for prefix record name with hostname
+      # @param [String] key
+      # @param [String] hostname
+      # @return [String] prefixed string
       def prefix_hostname(key,hostname)
         return "#{hostname}##{key}"
       end
 
-
+      # Redis backend specific method for removing hostname of record
+      # @param [String] astring
+      # @return [String] cleaned string
       def remove_hostname(astring)
         result = astring.split("#")
         result.shift