nephelae 0.0.4 → 0.0.5

data/bin/nephelae

@@ -5,6 +5,8 @@ require 'nephelae'
 require 'optparse'
 
 settings = {}
+logfile = ""
+loglevel = nil
 
 OptionParser.new do |o|
   o.banner << " command"
@@ -18,8 +20,38 @@ OptionParser.new do |o|
   o.on("-r", "--region REGION", "The region to use for cloudwatch") do |v|
     settings[:region] = v
   end
+
+  o.on("-lf", "--logfile [FILEPATH]", "The filepath to log to") do |v|
+    logfile = v || STDOUT
+  end
+
+  o.on("-ll", "--loglevel [LOGLEVEL]", "The level to log to") do |v|
+    unless v.nil?
+      DEBUG < INFO < WARN < ERROR < FATAL
+      case v
+      when "debug"
+        loglevel = Logger::DEBUG
+      when "info"
+        loglevel = Logger::INFO
+      when "warn"
+        loglevel = Logger::WARN
+      when "error"
+        loglevel = Logger::ERROR
+      when "fatal"
+        loglevel = Logger::FATAL
+      else
+        loglevel = Logger::WARN
+      end
+    else
+      loglevel = Logger::WARN
+    end
+  end
 end.parse!
 
+log = Logger.new(logfile)
+log.level = loglevel
+Nephelae::Logging.logger = log
+
 new_argv = [ARGV.first]
 Daemons.run_proc('nephelae', {ARGV: new_argv}) do
   r = Nephelae::Runner.new(settings)

data/lib/nephelae.rb

@@ -1,4 +1,5 @@
 require "nephelae/version"
+require "nephelae/logging"
 require "nephelae/cloud_watch/simple_aws"
 require "nephelae/cloud_watch/cloud_watch"
 require "nephelae/cloud_watch/metrics"
@@ -7,6 +8,7 @@ require "nephelae/plugins/disk_space"
 require "nephelae/plugins/mem_usage"
 require "nephelae/plugins/nephelae_process"
 require "nephelae/plugins/passenger_status"
+require "nephelae/plugins/redis"
 
 require "nephelae/runner"
 

data/lib/nephelae/cloud_watch/cloud_watch.rb

@@ -1,5 +1,6 @@
 module Nephelae
   class CloudWatch
+    include Logging
 
     attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_session_token, :aws_credentials_expire_at, :url
 
@@ -43,7 +44,11 @@ module Nephelae
 
     def put_metric(metric)
       params = metric.params
-      request(metric.params) unless params.nil?
+      unless params.nil?
+        cw_output = request(metric.params) unless params.nil?
+        log.info(cw_output)
+        cw_output
+      end
     end
 
   end

data/lib/nephelae/cloud_watch/simple_aws.rb

@@ -49,6 +49,7 @@ module Nephelae
 
     def self.get_instance_id
       Excon.get('http://169.254.169.254/latest/meta-data/instance-id').body
+      #"i-f746ec92"
     end
 
   end

data/lib/nephelae/plugins/mem_usage.rb

@@ -47,12 +47,12 @@ module Nephelae
 
     private
       def parse_status(body)
-        { :mem_total => body.match(/MemTotal:\s+(\d+)\s/)[1],
-          :mem_free => body.match(/MemFree:\s+(\d+)\s/)[1],
-          :buffers => body.match(/Buffers:\s+(\d+)\s/)[1],
-          :cached => body.match(/Cached:\s+(\d+)\s/)[1],
-          :swap_total => body.match(/SwapTotal:\s+(\d+)\s/)[1],
-          :swap_free => body.match(/SwapFree:\s+(\d+)\s/)[1]
+        { :mem_total => body.match(/MemTotal:\s+(\d+)\s/)[1].to_i,
+          :mem_free => body.match(/MemFree:\s+(\d+)\s/)[1].to_i,
+          :buffers => body.match(/Buffers:\s+(\d+)\s/)[1].to_i,
+          :cached => body.match(/Cached:\s+(\d+)\s/)[1].to_i,
+          :swap_total => body.match(/SwapTotal:\s+(\d+)\s/)[1].to_i,
+          :swap_free => body.match(/SwapFree:\s+(\d+)\s/)[1].to_i
         }
       end
 

data/lib/nephelae/plugins/nephelae_process.rb

@@ -6,7 +6,7 @@ module Nephelae
     end
 
     def get_metrics
-      metrics = Metrics.new('Process/Nephelae')
+      metrics = Metrics.new('Application/Nephelae')
 
       #if we are doing this we are up
       metrics.append_metric('Up', 1)

data/lib/nephelae/plugins/passenger_status.rb

@@ -6,20 +6,20 @@ module Nephelae
     end
 
     def command
-      "passenger-status 2>&1"
+      "passenger-status"
     end
 
     def get_metrics
-      metrics = Metrics.new('Linux/Passenger')
+      metrics = Metrics.new('Application/Passenger')
       output = `#{command}`
 
       if $?.success?
         stats = parse_status(output)
-        metrics.append_metric('MaxInstances', stats[:max])
-        metrics.append_metric('CountInstances', stats[:count])
-        metrics.append_metric('ActiveInstances', stats[:active])
-        metrics.append_metric('InactiveInstances', stats[:inactive])
-        metrics.append_metric('WaitingOnGlobalQueue', stats[:waiting_on_global_queue])
+        metrics.append_metric('MaxInstances', stats[:max], {unit: 'Count'})
+        metrics.append_metric('CountInstances', stats[:count], {unit: 'Count'})
+        metrics.append_metric('ActiveInstances', stats[:active], {unit: 'Count'})
+        metrics.append_metric('InactiveInstances', stats[:inactive], {unit: 'Count'})
+        metrics.append_metric('WaitingOnGlobalQueue', stats[:waiting_on_global_queue], {unit: 'Count'})
 
       end
 

data/lib/nephelae/runner.rb

@@ -2,6 +2,7 @@ require 'eventmachine'
 require 'rufus/scheduler'
 module Nephelae
   class Runner
+    include Logging
 
     attr_accessor :aws_access_key_id, :aws_secret_access_key, :region
 
@@ -12,18 +13,25 @@ module Nephelae
     end
     
     def run
-
+      log.warn "starting nephelae"
       EM.run {
           cloud = CloudWatch.new({aws_access_key_id: @aws_access_key_id, aws_secret_access_key: @aws_secret_access_key, region: @region})
 
           #make one request to put a cloud watch metric for nephelae being up. hopefully this can make it bork early if anything is wrong
           cloud.put_metric(NephelaeProcess.new.get_metrics)
 
-          plugins = [DiskSpace.new, MemUsage.new, NephelaeProcess.new, PassengerStatus.new]
+          plugins = [DiskSpace.new, MemUsage.new, NephelaeProcess.new, PassengerStatus.new, RedisStatus.new]
           scheduler = Rufus::Scheduler::EmScheduler.start_new
 
           scheduler.every '5m' do
-            plugins.each {|p| cloud.put_metric(p.get_metrics) }
+            plugins.each do |p| 
+              begin
+                cloud.put_metric(p.get_metrics)
+              rescue StandardError => e
+                log.error("nephelae plugin #{p.class} failed #{e.message}")
+                log.error(e.backtrace.join("\n"))
+              end
+            end
           end
       }
     end

data/lib/nephelae/version.rb

@@ -1,3 +1,3 @@
 module Nephelae
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephelae
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon