prometheus-splash 0.5.0 → 0.5.2

data/lib/splash/logs.rb

@@ -1,68 +1,70 @@
 # coding: utf-8
 module Splash
-  class LogScanner
-    include Splash::Constants
-    include Splash::Config
+  module Logs
+    class LogScanner
+      include Splash::Constants
+      include Splash::Config
 
 
-    # LogScanner Constructor
-    # return [LogScanner]
-    def initialize
-      @logs_target = get_config.logs
-      @config = get_config
-      @registry = Prometheus::Client.registry
-      @metric_count = Prometheus::Client::Gauge.new(:logerrors, docstring: 'SPLASH metric log error', labels: [:log ])
-      @metric_missing = Prometheus::Client::Gauge.new(:logmissing, docstring: 'SPLASH metric log missing', labels: [:log ])
-      @metric_lines = Prometheus::Client::Gauge.new(:loglines, docstring: 'SPLASH metric log lines numbers', labels: [:log ])
-      @registry.register(@metric_count)
-      @registry.register(@metric_missing)
-      @registry.register(@metric_lines)
-    end
+      # LogScanner Constructor
+      # return [LogScanner]
+      def initialize
+        @logs_target = get_config.logs
+        @config = get_config
+        @registry = Prometheus::Client::Registry::new
+        @metric_count = Prometheus::Client::Gauge.new(:logerrors, docstring: 'SPLASH metric log error', labels: [:log ])
+        @metric_missing = Prometheus::Client::Gauge.new(:logmissing, docstring: 'SPLASH metric log missing', labels: [:log ])
+        @metric_lines = Prometheus::Client::Gauge.new(:loglines, docstring: 'SPLASH metric log lines numbers', labels: [:log ])
+        @registry.register(@metric_count)
+        @registry.register(@metric_missing)
+        @registry.register(@metric_lines)
+      end
 
 
-    # start log analyse for log target in config
-    def analyse
-      @logs_target.each do |record|
-        record[:count]=0 if record[:count].nil?
-        record[:status] = :clean if record[:status].nil?
-        if File.exist?(record[:log]) then
-          record[:count] = File.readlines(record[:log]).grep(/#{record[:pattern]}/).size
-          record[:status] = :matched if record[:count] > 0
-          record[:lines] = `wc -l "#{record[:log]}"`.strip.split(/\s+/)[0].to_i unless record[:status] == :missing
-        else
-          record[:status] = :missing
+      # start log analyse for log target in config
+      def analyse
+        @logs_target.each do |record|
+          record[:count]=0 if record[:count].nil?
+          record[:status] = :clean if record[:status].nil?
+          if File.exist?(record[:log]) then
+            record[:count] = File.readlines(record[:log]).grep(/#{record[:pattern]}/).size
+            record[:status] = :matched if record[:count] > 0
+            record[:lines] = `wc -l "#{record[:log]}"`.strip.split(/\s+/)[0].to_i unless record[:status] == :missing
+          else
+            record[:status] = :missing
+          end
         end
+        return {:case => :quiet_exit }
       end
-      return {:case => :quiet_exit }
-    end
-
-    # pseudo-accessor on @logs_target
-    def output
-      return @logs_target
-    end
 
-    # start notification on prometheus for metric logerrors, logmissing; loglines
-    def notify(options = {})
-      log = get_logger
-      unless verify_service host: @config.prometheus_pushgateway_host ,port: @config.prometheus_pushgateway_port then
-        return  { :case => :service_dependence_missing, :more => "Prometheus Notification not send." }
+      # pseudo-accessor on @logs_target
+      def output
+        return @logs_target
       end
-      session = (options[:session]) ? options[:session] : log.get_session
-      log.info "Sending metrics to Prometheus Pushgateway", session
-      @logs_target.each do |item|
-        missing = (item[:status] == :missing)? 1 : 0
-        log.item "Sending metrics for #{item[:log]}", session
-        @metric_count.set(item[:count], labels: { log: item[:log] })
-        @metric_missing.set(missing, labels: { log: item[:log] })
-        lines = (item[:lines])? item[:lines] : 0
-        @metric_lines.set(lines, labels: { log: item[:log] })
+
+      # start notification on prometheus for metric logerrors, logmissing; loglines
+      def notify(options = {})
+        log = get_logger
+        unless verify_service host: @config.prometheus_pushgateway_host ,port: @config.prometheus_pushgateway_port then
+          return  { :case => :service_dependence_missing, :more => "Prometheus Notification not send." }
+        end
+        session = (options[:session]) ? options[:session] : log.get_session
+        log.info "Sending metrics to Prometheus Pushgateway", session
+        @logs_target.each do |item|
+          missing = (item[:status] == :missing)? 1 : 0
+          log.item "Sending metrics for #{item[:log]}", session
+          @metric_count.set(item[:count], labels: { log: item[:log] })
+          @metric_missing.set(missing, labels: { log: item[:log] })
+          lines = (item[:lines])? item[:lines] : 0
+          @metric_lines.set(lines, labels: { log: item[:log] })
+        end
+        hostname = Socket.gethostname
+        url = "http://#{@config.prometheus_pushgateway_host}:#{@config.prometheus_pushgateway_port}"
+        Prometheus::Client::Push.new('Splash',hostname, url).add(@registry)
+        log.ok "Sending to Prometheus PushGateway done.", session
+        return {:case => :quiet_exit }
       end
-      hostname = Socket.gethostname
-      url = "http://#{@config.prometheus_pushgateway_host}:#{@config.prometheus_pushgateway_port}"
-      Prometheus::Client::Push.new('Splash',hostname, url).add(@registry)
-      log.ok "Sending to Prometheus PushGateway done.", session
-      return {:case => :quiet_exit }
-    end
 
+    end
   end
 end

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Romain GEORGES
@@ -267,11 +267,17 @@ files:
 - lib/splash/cli/logs.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
@@ -280,9 +286,6 @@ files:
 - lib/splash/loggers/daemon.rb
 - lib/splash/loggers/dual.rb
 - lib/splash/logs.rb
-- lib/splash/orchestrator.rb
-- lib/splash/orchestrator/grammar.rb
-- lib/splash/orchestrator/hooks.rb
 - lib/splash/templates.rb
 - lib/splash/transports.rb
 - lib/splash/transports/rabbitmq.rb
@@ -300,7 +303,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

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