flapjack 0.6.53 → 0.6.54

data/tasks/events.rake

@@ -17,6 +17,7 @@ namespace :events do
 
     FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
     config_file = File.join('etc', 'flapjack_config.yaml')
+
     config = Flapjack::Configuration.new
     config.load( config_file )
 

data/tmp/create_event_ok.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'redis'
+require 'json'
+
+#id = "%.2d" % (1..10).to_a[rand(9)]
+
+events = []
+
+events << {
+  'entity' => "client1-localhost-test-1",
+  'check' => 'foo',
+  'type' => 'service',
+  'state' => 'ok',
+}.to_json
+
+redis = Redis.new(:db => 13)
+
+events.each {|event|
+  redis.rpush 'events', event
+}
+
+puts "#{Time.now} - finished loading up events"
+previous_events_size = redis.llen 'events'
+while previous_events_size > 0
+  sleep 1
+  events_size = redis.llen 'events'
+  throughput = previous_events_size - events_size
+  previous_events_size = events_size
+  puts "#{Time.now} - #{events_size} (#{throughput})"
+end

data/tmp/create_event_unknown.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'redis'
+require 'json'
+
+#id = "%.2d" % (1..10).to_a[rand(9)]
+
+events = []
+
+events << {
+  'entity' => "client1-localhost-test-1",
+  'check' => 'foo',
+  'type' => 'service',
+  'state' => 'unknown',
+}.to_json
+
+redis = Redis.new(:db => 13)
+
+events.each {|event|
+  redis.rpush 'events', event
+}
+
+puts "#{Time.now} - finished loading up events"
+previous_events_size = redis.llen 'events'
+while previous_events_size > 0
+  sleep 1
+  events_size = redis.llen 'events'
+  throughput = previous_events_size - events_size
+  previous_events_size = events_size
+  puts "#{Time.now} - #{events_size} (#{throughput})"
+end

data/tmp/create_events_ok.rb

@@ -14,7 +14,7 @@ events << {
   'state' => 'ok',
 }.to_json
 
-redis = Redis.new
+redis = Redis.new(:db => 13)
 
 4000.times do
   events.each {|event|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.53
+  version: 0.6.54
   prerelease: 
 platform: ruby
 authors:
@@ -11,10 +11,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: daemons
+  name: dante
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -308,11 +308,9 @@ email: lindsay@holmwood.id.au
 executables:
 - flapjack
 - flapjack-nagios-receiver
-- flapjack-nagios-receiver-control
 - flapjack-netsaint-parser
 - flapjack-populator
 - flapper
-- flapper-control
 extensions: []
 extra_rdoc_files: []
 files:
@@ -328,11 +326,9 @@ files:
 - Rakefile
 - bin/flapjack
 - bin/flapjack-nagios-receiver
-- bin/flapjack-nagios-receiver-control
 - bin/flapjack-netsaint-parser
 - bin/flapjack-populator
 - bin/flapper
-- bin/flapper-control
 - config.ru
 - dist/etc/default/flapjack-notifier
 - dist/etc/default/flapjack-workers
@@ -366,7 +362,6 @@ files:
 - lib/flapjack/checks/ping
 - lib/flapjack/configuration.rb
 - lib/flapjack/coordinator.rb
-- lib/flapjack/daemonizing.rb
 - lib/flapjack/data/contact.rb
 - lib/flapjack/data/entity.rb
 - lib/flapjack/data/entity_check.rb
@@ -386,7 +381,6 @@ files:
 - lib/flapjack/gateways/api.rb
 - lib/flapjack/gateways/api/entity_check_presenter.rb
 - lib/flapjack/gateways/api/entity_presenter.rb
-- lib/flapjack/gateways/base.rb
 - lib/flapjack/gateways/email.rb
 - lib/flapjack/gateways/email/alert.html.haml
 - lib/flapjack/gateways/email/alert.text.erb
@@ -402,6 +396,7 @@ files:
 - lib/flapjack/gateways/web/views/contacts.haml
 - lib/flapjack/gateways/web/views/index.haml
 - lib/flapjack/gateways/web/views/self_stats.haml
+- lib/flapjack/logger.rb
 - lib/flapjack/patches.rb
 - lib/flapjack/pikelet.rb
 - lib/flapjack/rack_logger.rb
@@ -436,6 +431,7 @@ files:
 - spec/lib/flapjack/gateways/web/views/contact.haml_spec.rb
 - spec/lib/flapjack/gateways/web/views/index.haml_spec.rb
 - spec/lib/flapjack/gateways/web_spec.rb
+- spec/lib/flapjack/logger_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb
 - spec/lib/flapjack/utility_spec.rb
@@ -447,6 +443,8 @@ files:
 - tasks/profile.rake
 - tmp/acknowledge.rb
 - tmp/create_config_yaml.rb
+- tmp/create_event_ok.rb
+- tmp/create_event_unknown.rb
 - tmp/create_events_failure.rb
 - tmp/create_events_ok.rb
 - tmp/create_events_ok_fail_ack_ok.rb
@@ -471,7 +469,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1088091798367271549
+      hash: -3074875956567986285
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -480,7 +478,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1088091798367271549
+      hash: -3074875956567986285
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -526,6 +524,7 @@ test_files:
 - spec/lib/flapjack/gateways/web/views/contact.haml_spec.rb
 - spec/lib/flapjack/gateways/web/views/index.haml_spec.rb
 - spec/lib/flapjack/gateways/web_spec.rb
+- spec/lib/flapjack/logger_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb
 - spec/lib/flapjack/utility_spec.rb

data/bin/flapjack-nagios-receiver-control

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'daemons'
-opts = {
-  :app_name   => 'flapjack-nagios-receiver',
-  :dir_mode   => :normal,
-  :dir        => '/var/run/flapjack',
-  :multiple   => false,
-  :backtrace  => true,
-  :monitor    => false,
-  :log_dir    => '/var/log/flapjack',
-  :log_output => true,
-}
-Daemons.run(File.join(File.dirname(__FILE__) ,'flapjack-nagios-receiver'), opts)
-

data/bin/flapper-control

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'daemons'
-opts = {
-  :app_name   => 'flapper',
-  :dir_mode   => :normal,
-  :dir        => '/var/run/flapjack',
-  :multiple   => false,
-  :backtrace  => true,
-  :monitor    => false,
-  :log_dir    => '/var/log/flapjack',
-  :log_output => true,
-}
-Daemons.run(File.join(File.dirname(__FILE__) ,'flapper'), opts)
-

data/lib/flapjack/daemonizing.rb

@@ -1,186 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copied from thin.
-
-require 'etc'
-require 'daemons' unless RUBY_PLATFORM =~ /mswin/
-
-module Process
-  # Returns +true+ the process identified by +pid+ is running.
-  def running?(pid)
-    Process.getpgid(pid) != -1
-  rescue Errno::EPERM
-    true
-  rescue Errno::ESRCH
-    false
-  end
-  module_function :running?
-end
-
-module Flapjack
-  # Raised when the pid file already exist starting as a daemon.
-  class PidFileExist < RuntimeError; end
-  
-  # Module included in classes that can be turned into a daemon.
-  # Handle stuff like:
-  # * storing the PID in a file
-  # * redirecting output to the log file
-  # * changing process privileges
-  # * killing the process gracefully
-  module Daemonizable
-    attr_accessor :pid_file, :log_file
-    
-    def self.included(base)
-      base.extend ClassMethods
-    end
-    
-    def pid
-      File.exist?(pid_file) ? open(pid_file).read.to_i : nil
-    end
-    
-    # Turns the current script into a daemon process that detaches from the console.
-    def daemonize
-      raise PlatformNotSupported, 'Daemonizing is not supported on Windows'  if RUBY_PLATFORM =~ /mswin/
-      raise ArgumentError,        'You must specify a pid_file to daemonize' unless @pid_file
-      
-      remove_stale_pid_file
-      
-      pwd = Dir.pwd # Current directory is changed during daemonization, so store it
-      
-      # HACK we need to create the directory before daemonization to prevent a bug under 1.9
-      #      ignoring all signals when the directory is created after daemonization.
-      FileUtils.mkdir_p File.dirname(@pid_file)
-      FileUtils.mkdir_p File.dirname(@log_file)
-      
-      Daemonize.daemonize(File.expand_path(@log_file), 'flapjack server')
-      
-      Dir.chdir(pwd)
-      
-      write_pid_file
-
-      self.after_daemonize if self.respond_to? :after_daemonize
-            
-      at_exit do
-        puts ">> Exiting!"
-        remove_pid_file
-      end
-    end
-
-    # Change privileges of the process
-    # to the specified user and group.
-    def change_privilege(user, group=user)
-      puts ">> Changing process privilege to #{user}:#{group}"
-      
-      uid, gid = Process.euid, Process.egid
-      target_uid = Etc.getpwnam(user).uid
-      target_gid = Etc.getgrnam(group).gid
-
-      if uid != target_uid || gid != target_gid
-        # Change process ownership
-        Process.initgroups(user, target_gid)
-        Process::GID.change_privilege(target_gid)
-        Process::UID.change_privilege(target_uid)
-      end
-    rescue Errno::EPERM => e
-      puts "Couldn't change user and group to #{user}:#{group}: #{e}"
-    end
-    
-    # Register a proc to be called to restart the server.
-    def on_restart(&block)
-      @on_restart = block
-    end
-    
-    # Restart the server.
-    def restart
-      if @on_restart
-        puts '>> Restarting ...'
-        stop
-        remove_pid_file
-        @on_restart.call
-        exit!
-      end
-    end
-    
-    module ClassMethods
-      # Send a QUIT or INT (if timeout is +0+) signal the process which
-      # PID is stored in +pid_file+.
-      # If the process is still running after +timeout+, KILL signal is
-      # sent.
-      def kill(pid_file, timeout=60)
-        if timeout == 0
-          send_signal('INT', pid_file, timeout)
-        else
-          send_signal('QUIT', pid_file, timeout)
-        end
-      end
-      
-      # Restart the server by sending HUP signal.
-      def restart(pid_file)
-        send_signal('HUP', pid_file)
-      end
-      
-      # Send a +signal+ to the process which PID is stored in +pid_file+.
-      def send_signal(signal, pid_file, timeout=60)
-        if pid = read_pid_file(pid_file)
-          puts "Sending #{signal} signal to process #{pid} ... "
-          Process.kill(signal, pid)
-          Timeout.timeout(timeout) do
-            sleep 0.1 while Process.running?(pid)
-          end
-        else
-          puts "Can't stop process, no PID found in #{pid_file}"
-        end
-      rescue Timeout::Error
-        puts "Timeout!"
-        force_kill pid_file
-      rescue Interrupt
-        force_kill pid_file
-      rescue Errno::ESRCH # No such process
-        puts "process not found!"
-        force_kill pid_file
-      end
-      
-      def force_kill(pid_file)
-        if pid = read_pid_file(pid_file)
-          puts "Sending KILL signal to process #{pid} ... "
-          Process.kill("KILL", pid)
-          File.delete(pid_file) if File.exist?(pid_file)
-        else
-          puts "Can't stop process, no PID found in #{pid_file}"
-        end
-      end
-      
-      def read_pid_file(file)
-        if File.file?(file) && pid = File.read(file)
-          pid.to_i
-        else
-          nil
-        end
-      end
-    end
-    
-    protected
-      def remove_pid_file
-        File.delete(@pid_file) if @pid_file && File.exists?(@pid_file)
-      end
-    
-      def write_pid_file
-        puts ">> Writing PID to #{@pid_file}"
-        open(@pid_file,"w") { |f| f.write(Process.pid) }
-        File.chmod(0644, @pid_file)
-      end
-      
-      # If PID file is stale, remove it.
-      def remove_stale_pid_file
-        if File.exist?(@pid_file)
-          if pid && Process.running?(pid)
-            raise PidFileExist, "#{@pid_file} already exists, seems like it's already running (process ID: #{pid}). " +
-                                "Stop the process or delete #{@pid_file}."
-          else
-            puts ">> Deleting stale PID file #{@pid_file}"
-            remove_pid_file
-          end
-        end
-      end
-  end
-end

data/lib/flapjack/gateways/base.rb

@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'flapjack/pikelet'
-
-module Flapjack
-  module Gateways
-
-    module Generic
-      include Flapjack::GenericPikelet
-    end
-
-    module Resque
-      include Flapjack::Pikelet
-    end
-
-    module Thin
-      include Flapjack::Pikelet
-
-      attr_accessor :port
-
-      alias_method :orig_bootstrap, :bootstrap
-
-      def bootstrap(opts = {})
-        return if @bootstrapped
-
-        if config = opts[:config]
-          @port = config['port'] ? config['port'].to_i : nil
-          @port = 3001 if (@port.nil? || @port <= 0 || @port > 65535)
-        end
-
-        orig_bootstrap(opts)
-      end
-
-    end
-
-  end
-
-end