prometheus-splash 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d55ef029657bc02603c1c3723df64d3a296bf3956d55ba4a9309402ce468aedc
-  data.tar.gz: ba6cb4911ea6b5c4f6f2d8d5f4cb083f37111a768ce2978cadb5b701fdb4e186
+  metadata.gz: 8a4460d32852ffefae8779559dda23549d1897b4a9426ad5d79d5f7d5fa439f9
+  data.tar.gz: b5feaa825627a05bfce7809730e5ebd728d0555320e7a8aeebce7dc24ad1df62
 SHA512:
-  metadata.gz: f85b863c72f11a4fe2716258c647ce28e2691462a1bf74bb84c8c5fa1cd17e8ec0edd0ac4cd0e816b61fc2d4f9ef536b492aaac6658c8e1567e4f6409d959df3
-  data.tar.gz: 45b4f6c99ae525033585a059d34e6c1f363f2f2ffdf4637b41aa2ec19ca5f042c436ee9c439fecc99ad937e73e32c7a430f4a74d2340e6486d9e46861f5af67e
+  metadata.gz: da96fbe45265e982b74e741b4472bd3a61064c09f05b600cce13acf3340cb76bcf8b49843b169be6097b5e9422e32a5d942581e20cc3c03a5a413ccdffd93948
+  data.tar.gz: f86edff60f5ab1851fd25255055e16ee6244006a2e010f431a2107f35e50eb81ed6e13e3aa4695e9f9cedf309414977022d4d708ff0ab3e54f39b942a2bf3485

data/lib/splash/cli/webadmin.rb

@@ -35,9 +35,10 @@ module CLISplash
     long_desc <<-LONGDESC
     Starting Splash Daemon\n
     LONGDESC
+    option :foreground, :type => :boolean,  :aliases => "-F"
     desc "start", "Splash WebAdmin Daemon status"
     def start
-      acase = run_as_root :startweb
+      acase = run_as_root :startweb, options
       splash_exit acase
     end
 

data/lib/splash/constants.rb

@@ -7,7 +7,7 @@ module Splash
   module Constants
 
     # Current splash version
-    VERSION = "0.8.5"
+    VERSION = "0.8.6"
     # the path to th config file, not overridable by config
     CONFIG_FILE = "/etc/splash.yml"
     # the default execution trace_path if backend file

data/lib/splash/webadmin.rb

@@ -20,6 +20,7 @@ module Splash
       # Start the Splash Daemon
       # @param [Hash] options
       # @option options [Symbol] :quiet activate quiet mode for log (limit to :fatal)
+      # @option options [Symbol] :foreground run webadmin in foreground
       # @return [Hash] Exiter Case (:quiet_exit, :already_exist, :unknown_error or other)
       def startweb(options = {})
         require 'splash/webadmin/main'
@@ -37,7 +38,8 @@ module Splash
           daemon_config = {:description => config.webadmin_process_name,
               :pid_file => config.webadmin_full_pid_path,
               :stdout_trace => config.webadmin_full_stdout_trace_path,
-              :stderr_trace => config.webadmin_full_stderr_trace_path
+              :stderr_trace => config.webadmin_full_stderr_trace_path,
+              :foreground => options[:foreground]
             }
 
           ["int","term","hup"].each do |type| daemon_config["sig#{type}_handler".to_sym] = Proc::new {  WebAdminApp.quit! } end

data/templates/Dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:latest
+RUN gem install prometheus-splash
+RUN splash conf set
+EXPOSE 9234
+CMD ["splash","web", "start" ,"-F"]

data/templates/docker-compose.yml

@@ -0,0 +1,14 @@
+version: "3"
+
+services:
+  redis:
+    image: redis:latest
+
+  splash:
+    build: .
+    env_file: .env
+    ports:
+      - 9234:9234
+    depends_on:
+      - redis
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2022-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -486,6 +486,8 @@ files:
 - prometheus-splash.gemspec
 - spec/helpers_spec.rb
 - spec/templates_spec.rb
+- templates/.env
+- templates/Dockerfile
 - templates/ansible-splash/Vagrantfile
 - templates/ansible-splash/deploy.yml
 - templates/ansible-splash/group_vars/DEV.yml
@@ -508,6 +510,7 @@ files:
 - templates/ansible-splash/roles/supervision_master/tasks/main.yml
 - templates/ansible-splash/roles/supervision_master/templates/alertmanager.yml.j2
 - templates/ansible-splash/roles/supervision_master/templates/prometheus.yml.j2
+- templates/docker-compose.yml
 - templates/report.txt
 - templates/splashd.service
 - test.sh
@@ -531,7 +534,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Supervision with Prometheus of Logs and Asynchronous tasks orchestration