prometheus-splash 0.4.5 → 0.6.1

data/templates/ansible-splash/Vagrantfile

@@ -17,7 +17,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", inline: <<-SHELL
      sudo apt-get update
      sudo apt-add-repository --yes --update ppa:ansible/ansible
-     apt-get install -y git ansible
+     apt-get install -y git ansible python-apt
      git clone https://github.com/Ultragreen/prometheus-splash.git
      cd prometheus-splash/templates/ansible-splash
      ansible-playbook -i inventory.dev deploy.yml

data/templates/ansible-splash/deploy.yml

@@ -1,6 +1,7 @@
 ---
-- name: PREPARE TESTING ocalhost entries for test
+- name: PREPARE TESTING localhost entries for test #only for testing with Vagrant, remove for real usages
   hosts: supervision_master
+  become: yes
   tasks:
   - lineinfile:
       path: /etc/hosts
@@ -10,7 +11,25 @@
       group: root
       mode: '0644'
     when: patch_etc_hosts
+  - lineinfile:
+      path: /etc/hosts
+      state: absent
+      regexp: '^127\.0\.1\.1'
+    when: patch_etc_hosts
 
+- name: PREPARE packages
+  hosts: supervision_master #for real usage => precise all
+  become: yes
+  tasks:
+  - apt:
+      update_cache: yes
+      force_apt_get: yes
+      cache_valid_time: 3600
+      pkg:
+      - python-apt
+      - screen
+      - emacs-nox
+      - htop
 
 
 
@@ -18,6 +37,7 @@
   become: yes
   hosts: mq
   tasks:
+  - apt: update_cache=yes force_apt_get=yes cache_valid_time=3600
   - include_role:
       name: mq
     when: install_mq
@@ -26,6 +46,7 @@
   become: yes
   hosts: backend
   tasks:
+  - apt: update_cache=yes force_apt_get=yes cache_valid_time=3600
   - include_role:
       name: backend
     when: install_backend
@@ -33,17 +54,23 @@
 - name: Deploy Supervision Master
   become: yes
   hosts: supervision_master
+  tasks:
+  - apt: update_cache=yes force_apt_get=yes cache_valid_time=3600
   roles:
     - supervision_master
 
 - name: Deploy Supervision Gateway
   become: yes
   hosts: supervision_gateway
+  tasks:
+  - apt: update_cache=yes force_apt_get=yes cache_valid_time=3600
   roles:
     - supervision_gateway
 
 - name: Deploy Splash
   become: yes
   hosts: splash_nodes
+  tasks:
+  - apt: update_cache=yes force_apt_get=yes cache_valid_time=3600
   roles:
     - splash

data/templates/ansible-splash/group_vars/DEV.yml

@@ -7,6 +7,8 @@ patch_etc_hosts: true
 mq_port: 5672
 mq_admin_username: admin
 mq_admin_password: adminmdppwd
+mq_ip: 127.0.0.1
+mq_nodename: rabbit
 
 mq_splash_username: splash
 mq_splash_password: mdptest

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

@@ -1,5 +1,5 @@
 
 ---
-- name: restart rabbitmq
+- name: restart Rabbitmq
   service: name=rabbitmq-server state=restarted
   become: yes

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

@@ -6,10 +6,23 @@
 
 - name: MQ enable rabbitmq plugins
   rabbitmq_plugin: names=rabbitmq_management,rabbitmq_tracing,rabbitmq_federation state=enabled
-  notify: restart rabbitmq
+  notify: restart Rabbitmq
 
+- name: MQ Configuration
+  template:
+    src: rabbitmq-env.conf.j2
+    dest: /etc/rabbitmq/rabbitmq-env.conf
+    owner: rabbitmq
+    group: rabbitmq
+    mode: 0644
+  notify: restart Rabbitmq
+
+- name: MQ Force restart RabbitMQ for conf update directly
+  meta: flush_handlers
+  
 - name: add Admin users
   rabbitmq_user:
+    node: "rabbit@{{ groups['mq'][0] }}"
     user: "{{ mq_admin_username }}"
     password: "{{ mq_admin_password }}"
     tags: administrator,"{{ mq_admin_username }}"
@@ -22,17 +35,20 @@
 
 - name: remove default guest user
   rabbitmq_user:
+    node: "rabbit@{{ groups['mq'][0] }}"
     user: guest
     state: absent
 
 
 - name: MQ Configure Splash vhost
   rabbitmq_vhost:
+    node: "rabbit@{{ groups['mq'][0] }}"
     name: "{{ mq_splash_vhost }}"
     state: present
 
 - name: MQ Add Splash service user
   rabbitmq_user:
+    node: "rabbit@{{ groups['mq'][0] }}"
     user: "{{ mq_splash_username }}"
     password: "{{ mq_splash_password }}"
     vhost: "{{ mq_splash_vhost}}"

data/templates/ansible-splash/roles/mq/templates/rabbitmq-env.conf.j2

@@ -0,0 +1,13 @@
+# Defaults to rabbit. This can be useful if you want to run more than one node
+# per machine - RABBITMQ_NODENAME should be unique per erlang-node-and-machine
+# combination. See the clustering on a single machine guide for details:
+# http://www.rabbitmq.com/clustering.html#single-machine
+NODENAME={{ mq_nodename }}@{{ groups['mq'][0]}}
+
+# By default RabbitMQ will bind to all interfaces, on IPv4 and IPv6 if
+# available. Set this if you only want to bind to one network interface or#
+# address family.
+NODE_IP_ADDRESS={{ mq_ip }}
+
+# Defaults to 5672.
+NODE_PORT={{ mq_port }}

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

@@ -8,6 +8,7 @@
   gem:
     name: prometheus-splash
     state: present
+    user_install: no
 
 - name: SPLASH Check if setup done
   stat:
@@ -25,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

data/templates/splashd.service

@@ -15,7 +15,7 @@ ExecStop=/usr/local/bin/splash daemon stop
 Restart=on-failure
 
 # Configures the time to wait before service is stopped forcefully.
-TimeoutStopSec=300
+TimeoutStopSec=30
 
 [Install]
 WantedBy=multi-user.target

data/test.sh

@@ -0,0 +1,42 @@
+rvmsudo splash config set 
+rvmsudo splash config san 
+
+
+splash conf version
+
+splash conf version --no-colors
+splash conf version --no-emoji
+
+splash logs an
+splash log mon 
+splash logs show /tmp/test
+splash logs show /tmtp/toto
+splash logs list
+splash logs list --detail  
+
+
+
+splash com list --detail 
+splash com list 
+splash com treeview pwd
+splash com show echo1
+rvmsudo splash com exe true_test
+rvmsudo splash com exe false_test
+splash com lastrun true_test
+splash com get 
+
+rvmsudo splash dae start 
+rvmsudo splash dae ping 
+
+rvmsudo splash com exe test_remote_call
+
+rvmsudo splash com sched echo2 --in '2s'
+rvmsudo splash com sched echo2 --in '2s' --hostname
+rvmsudo splash com exe echo1 --hostname
+
+
+splash com list --hostname
+splash com get --all
+splash com get --hostname 
+splash com tree echo1 --hostname
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.6.1
 platform: ruby
 authors:
 - Romain GEORGES
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.15.0
+- !ruby/object:Gem::Dependency
+  name: ps-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: tty-markdown
   requirement: !ruby/object:Gem::Requirement
@@ -122,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
@@ -251,12 +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
@@ -264,14 +372,50 @@ 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/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/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
 - prometheus-splash.gemspec
+- spec/helpers_spec.rb
 - spec/templates_spec.rb
 - templates/ansible-splash/Vagrantfile
 - templates/ansible-splash/deploy.yml
@@ -279,13 +423,15 @@ files:
 - templates/ansible-splash/group_vars/PROD.yml
 - templates/ansible-splash/group_vars/all.yml
 - templates/ansible-splash/inventory.dev
-- templates/ansible-splash/inventory.prod
 - templates/ansible-splash/roles/backend/handlers/main.yml
 - templates/ansible-splash/roles/backend/tasks/main.yml
 - templates/ansible-splash/roles/backend/templates/redis.conf.j2
 - 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
@@ -295,12 +441,13 @@ files:
 - templates/ansible-splash/roles/supervision_master/templates/prometheus.yml.j2
 - templates/report.txt
 - 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
@@ -316,9 +463,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