prometheus-splash 0.5.0 → 0.7.0

data/templates/ansible-splash/roles/splash/handlers/main.yml

@@ -0,0 +1,4 @@
+---
+- name: restart Splashd
+  service: name=splashd state=restarted
+  become: yes

data/templates/ansible-splash/roles/splash/tasks/main.yml

@@ -26,4 +26,27 @@
     owner: root
     group: root
     mode: 0644
-  #notify: restart Splash
+  notify: restart Splashd
+
+- name: SPLASH Check if Systemd service installed
+  stat:
+    path: /etc/systemd/system/splashd.service
+  register: stat_splash_result
+
+- name: SPLASH Install systemd service
+  shell: splash conf service
+  when: not stat_splash_result.stat.exists
+
+- name: SPLASH Splashd running
+  service:
+    name: splashd
+    state: started
+    enabled: yes
+
+- name:  SPLASH LogRotate template
+  template:
+    src: logrotate.splash.j2
+    dest: /etc/logrotate.d/splash
+    owner: root
+    group: root
+    mode: 0644

data/templates/ansible-splash/roles/splash/templates/logrotate.splash.j2

@@ -0,0 +1,11 @@
+/var/log/splash.log /var/run/splash/traces/stderr.txt /var/run/splash/traces/stdout.txt {
+
+  daily
+	rotate 7
+  size 100M
+	compress
+	delaycompress
+	missingok
+	notifempty
+	copytruncate
+}

data/templates/ansible-splash/roles/splash/templates/splash.yml.j2

@@ -30,7 +30,7 @@
       :user: {{ mq_splash_username }}
   :daemon:
     :logmon_scheduling:
-      :every: 20s
+      :every: 1m
     :process_name: "Splash : daemon."
     :paths:
       :pid_path: /var/run/splash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Romain GEORGES
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -136,6 +136,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.16.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.16.2
+- !ruby/object:Gem::Dependency
+  name: rack-reverse-proxy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -265,13 +349,22 @@ files:
 - lib/splash/cli/daemon.rb
 - lib/splash/cli/documentation.rb
 - lib/splash/cli/logs.rb
+- lib/splash/cli/process.rb
+- lib/splash/cli/sequences.rb
+- lib/splash/cli/webadmin.rb
 - lib/splash/commands.rb
 - lib/splash/config.rb
+- lib/splash/config/flush.rb
 - lib/splash/config/sanitycheck.rb
 - lib/splash/config/service.rb
 - lib/splash/config/setup.rb
 - lib/splash/constants.rb
-- lib/splash/controller.rb
+- lib/splash/daemon.rb
+- lib/splash/daemon/controller.rb
+- lib/splash/daemon/metrics.rb
+- lib/splash/daemon/orchestrator.rb
+- lib/splash/daemon/orchestrator/grammar.rb
+- lib/splash/daemon/orchestrator/hooks.rb
 - lib/splash/dependencies.rb
 - lib/splash/exiter.rb
 - lib/splash/helpers.rb
@@ -279,14 +372,53 @@ files:
 - lib/splash/loggers/cli.rb
 - lib/splash/loggers/daemon.rb
 - lib/splash/loggers/dual.rb
+- lib/splash/loggers/web.rb
 - lib/splash/logs.rb
-- lib/splash/orchestrator.rb
-- lib/splash/orchestrator/grammar.rb
-- lib/splash/orchestrator/hooks.rb
+- lib/splash/processes.rb
+- lib/splash/sequences.rb
 - lib/splash/templates.rb
 - lib/splash/transports.rb
 - lib/splash/transports/rabbitmq.rb
+- lib/splash/webadmin.rb
+- lib/splash/webadmin/api/routes/commands.rb
+- lib/splash/webadmin/api/routes/config.rb
+- lib/splash/webadmin/api/routes/init.rb
+- lib/splash/webadmin/api/routes/logs.rb
+- lib/splash/webadmin/api/routes/process.rb
+- lib/splash/webadmin/api/routes/sequences.rb
+- lib/splash/webadmin/main.rb
+- lib/splash/webadmin/portal/controllers/commands.rb
+- lib/splash/webadmin/portal/controllers/documentation.rb
+- lib/splash/webadmin/portal/controllers/home.rb
+- lib/splash/webadmin/portal/controllers/logs.rb
+- lib/splash/webadmin/portal/controllers/notfound.rb
+- lib/splash/webadmin/portal/controllers/processes.rb
+- lib/splash/webadmin/portal/controllers/proxy.rb
+- lib/splash/webadmin/portal/controllers/restclient.rb
+- lib/splash/webadmin/portal/controllers/sequences.rb
+- lib/splash/webadmin/portal/init.rb
+- lib/splash/webadmin/portal/public/css/ultragreen.css
+- lib/splash/webadmin/portal/public/fonts/FontAwesome.otf
+- lib/splash/webadmin/portal/public/fonts/fontawesome-webfont.ttf
+- lib/splash/webadmin/portal/public/fonts/fontawesome-webfont.woff
+- lib/splash/webadmin/portal/public/fonts/fontawesome-webfont.woff2
+- lib/splash/webadmin/portal/public/images/logo_splash.png
+- lib/splash/webadmin/portal/public/images/logo_splash_reduce.png
+- lib/splash/webadmin/portal/public/images/logo_splash_tiny.png
+- lib/splash/webadmin/portal/views/commands.slim
+- lib/splash/webadmin/portal/views/documentation.slim
+- lib/splash/webadmin/portal/views/home.slim
+- lib/splash/webadmin/portal/views/layout.slim
+- lib/splash/webadmin/portal/views/logs.slim
+- lib/splash/webadmin/portal/views/nav.slim
+- lib/splash/webadmin/portal/views/not_found.slim
+- lib/splash/webadmin/portal/views/processes.slim
+- lib/splash/webadmin/portal/views/proxy.slim
+- lib/splash/webadmin/portal/views/restclient.slim
+- lib/splash/webadmin/portal/views/restclient_result.slim
+- lib/splash/webadmin/portal/views/sequences.slim
 - prometheus-splash.gemspec
+- spec/helpers_spec.rb
 - spec/templates_spec.rb
 - templates/ansible-splash/Vagrantfile
 - templates/ansible-splash/deploy.yml
@@ -300,7 +432,9 @@ files:
 - templates/ansible-splash/roles/mq/handlers/main.yml
 - templates/ansible-splash/roles/mq/tasks/main.yml
 - templates/ansible-splash/roles/mq/templates/rabbitmq-env.conf.j2
+- templates/ansible-splash/roles/splash/handlers/main.yml
 - templates/ansible-splash/roles/splash/tasks/main.yml
+- templates/ansible-splash/roles/splash/templates/logrotate.splash.j2
 - templates/ansible-splash/roles/splash/templates/splash.yml.j2
 - templates/ansible-splash/roles/supervision_gateway/handlers/main.yml
 - templates/ansible-splash/roles/supervision_gateway/tasks/main.yml
@@ -312,11 +446,11 @@ files:
 - templates/splashd.service
 - test.sh
 - ultragreen_roodi_coding_convention.yml
-homepage: http://www.ultragreen.net
+homepage: https://github.com/Ultragreen/prometheus-splash
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -332,9 +466,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Supervision with Prometheus of Logs and Asynchronous tasks orchestration
   for Services or Hosts
 test_files:
+- spec/helpers_spec.rb
 - spec/templates_spec.rb

data/lib/splash/orchestrator.rb

@@ -1,100 +0,0 @@
-# coding: utf-8
-Dir[File.dirname(__FILE__) + '/orchestrator/*.rb'].each {|file| require file  }
-
-
-
-module Splash
-  module Orchestrator
-
-    class Scheduler
-        include Splash::Constants
-        include Splash::Helpers
-        include Splash::Config
-        include Splash::Transports
-        include Splash::Orchestrator::Grammar
-        include Splash::Loggers
-
-        def initialize(options = {})
-          @log = get_logger
-          $stdout.sync = true
-          $stderr.sync = true
-          @server  = Rufus::Scheduler::new
-          @server.extend SchedulerHooks
-          @config = get_config
-          @result = LogScanner::new
-          @log.info "Splash Orchestrator starting :"
-          if options[:scheduling] then
-            @log.item "Initializing commands Scheduling."
-            init_commands_scheduling
-          end
-          sched,value = @config.daemon_logmon_scheduling.flatten
-          @log.item "Initializing logs monitorings & notifications."
-          @server.send sched,value do
-            begin
-              session = get_session
-              @log.trigger "Logs monitoring for Scheduling : #{sched.to_s} #{value.to_s}", session
-              @result.analyse
-              @result.notify :session => session
-            rescue Errno::ECONNREFUSED
-              @log.error "PushGateway seems to be done, please start it.", session
-            end
-          end
-          hostname = Socket.gethostname
-          transport = get_default_subscriber queue: "splash.#{hostname}.input"
-          if transport.class == Hash and transport.include? :case then
-            splash_exit transport
-          end
-          transport.subscribe(:block => true) do |delivery_info, properties, body|
-            content = YAML::load(body)
-            session = get_session
-            content[:session] = session
-            if VERBS.include? content[:verb]
-              @log.receive "Valid remote order, verb : #{content[:verb].to_s}", session
-              res = self.send content[:verb], content
-              get_default_client.publish queue: content[:return_to], message: res.to_yaml
-              @log.send "Result to #{content[:return_to]}.", session
-            else
-              @log.receive "INVALID remote order, verb : #{content[:verb].to_s}", session
-              get_default_client.publish queue: content[:return_to], message: "Unkown verb #{content[:verb]}".to_yaml
-            end
-          end
-        end
-
-        def terminate
-          @log.info "Splash daemon shutdown"
-          @server.shutdown
-          change_logger logger: :cli
-          splash_exit case: :quiet_exit
-        end
-
-        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
-            end
-
-        end
-
-        def execute(options)
-          command =  Splash::CommandWrapper::new(options[:command])
-          if options[:ack] then
-            command.ack
-          else
-            return command.call_and_notify trace: true, notify: true, callback: true, session: options[:session]
-          end
-        end
-
-      end
-
-
-    end
-
-  end

data/lib/splash/orchestrator/grammar.rb

@@ -1,54 +0,0 @@
-# coding: utf-8
-module Splash
-  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

data/lib/splash/orchestrator/hooks.rb

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