prometheus-splash 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d510e4761e365c1ee36881fb1a3a4a99a7dbe7965958841497cdcaaadfb0c1b3
-  data.tar.gz: 4f01f486135696ef0142d42362379e59868b1265ce367b3e3aac9853fcc48336
+  metadata.gz: 4e97bc4cce28c28f041ef5699bf6d3236001e84517bdefe8449cc572952997d2
+  data.tar.gz: c8e67cdc8089ff1db9e19ea4b86b84b52a64515d167b11df4f70e0e85e42f9f8
 SHA512:
-  metadata.gz: 8b5c84b54b2098f9b027408ab8419fb19964feb1056607d090802acc793c2ccd6a9b98c1c8c2ca91334ccc8a36de88c1bf6cd674b6f5ef9df33a40debbfe84f5
-  data.tar.gz: 1d93b819d8a9592495271a24bdc3e69e63a15489f5885faa729a8e42428a68dada73748ea8440c1338625a36c89d84a260e3bc9cdafa8fb869747864edc001f4
+  metadata.gz: 6642f9127b2f422e839d0b19c10c4625eb8b86bb1feeb7cd8ff2ba00369905fc1bb8a3f078a896cf3cf5e661273fc355c6194dde625673e9a17dc4bba14c3bc9
+  data.tar.gz: 10d052291ebe57a916f4079c23934fda5dac4e44d3ec45856982ba2b827c2764a57dd3990bd4819847278d7f6a5b22996f7e24dd5a4bcfc3936091b71d599645

data/CHANGELOG.md

@@ -81,3 +81,47 @@
 * 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
 # coding: utf-8
 
+# major include
 require 'splash/dependencies'
 require 'splash/cli'
 
@@ -13,6 +14,7 @@ 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 'Splash need reconfiguration : Auto setup launch'
 
@@ -26,4 +28,5 @@ unless verify_file(name: CONFIG_FILE, mode: "644", owner: user_root, group: grou
   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
@@ -43,12 +47,20 @@
       :stderr_trace: stderr.txt
       :pid_file: splash.pid
   :prometheus:
-    :pushgateway:
-      :host: "localhost"
-      :port: 9091
+    :pushgateway: 'http://localhost:9091/'
+    :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
+### Sample configuration of commands and scheduling
   :commands:
     :id_root:
       :desc: run id command on root
@@ -100,9 +112,67 @@
       :on_success: :echo3
 
 
-### configuration of monitored logs
+### Sample 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
+
+
+###
+## 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/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"