nephelae 0.0.9 → 0.1.0

data/.gitignore

@@ -2,10 +2,8 @@
 *.rbc
 .bundle
 .config
-.yardoc
 Gemfile.lock
 InstalledFiles
-_yardoc
 coverage
 doc/
 lib/bundler/man
@@ -15,3 +13,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+# YARD artifacts
+.yardoc
+_yardoc

data/bin/nephelae

@@ -3,57 +3,60 @@ require 'rubygems'
 require 'daemons'
 require 'nephelae'
 require 'optparse'
+require 'yaml'
 
 settings = {}
 logfile = ""
 loglevel = nil
 
+cmd = ARGV.first
+
+file = '/etc/nephelae.yml'
+logfile = STDOUT
+loglevel = Logger::WARN
+logdir = '/var/log'
+piddir = '/var/run'
+
 OptionParser.new do |o|
   o.banner << " command"
-  o.on("-k", "--aws-access-key-id ACCESSKEY", "AWS Access Key to use for cloudwatch") do |v|
-    settings[:aws_access_key_id] = v
-  end
-  o.on("-s", "--aws-secret-access-key SECRETKEY", "AWS Secret Access Key to use for cloudwatch") do |v|
-    settings[:aws_secret_access_key] = v
+
+  o.on("--config CONFIGFILE", "The config file to use for plugins (and aws settin3yygs)") do |v|
+    file = v
   end
 
-  o.on("-r", "--region REGION", "The region to use for cloudwatch") do |v|
-    settings[:region] = v
+  o.on("--logdir LOGDIR", "The directory to put log files") do |v|
+    logdir = v
   end
 
-  o.on("-lf", "--logfile [FILEPATH]", "The filepath to log to") do |v|
-    logfile = v || STDOUT
+  o.on("--piddir PIDDIR", "The directory to put pid files") do |v|
+    piddir = v
   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
+  o.on("--loglevel LOGLEVEL", "The level to log to") do |v|
+    case v.downcase
+    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
+    end unless v.nil?
   end
 end.parse!
 
 log = Logger.new(logfile)
 log.level = loglevel
 Nephelae::Logging.logger = log
+File.open( file ) { |yf| settings = YAML::load( yf ) }
 
-new_argv = [ARGV.first]
-Daemons.run_proc('nephelae', {ARGV: new_argv}) do
+new_argv = [cmd]
+Daemons.run_proc('nephelae', {ARGV: new_argv, log_dir: logdir, dir_mode: :normal, dir: piddir, log_output: true}) do
   r = Nephelae::Runner.new(settings)
   r.run
 end

data/lib/nephelae.rb

@@ -4,6 +4,7 @@ require "nephelae/cloud_watch/simple_aws"
 require "nephelae/cloud_watch/cloud_watch"
 require "nephelae/cloud_watch/metrics"
 
+require "nephelae/plugins/plugin"
 require "nephelae/plugins/disk_space"
 require "nephelae/plugins/mem_usage"
 require "nephelae/plugins/nephelae_process"

data/lib/nephelae/plugins/disk_space.rb

@@ -1,18 +1,9 @@
 module Nephelae
 
-  class DiskSpace
-    attr_accessor :path
-
-    def initialize(params = {})
-      @path = params[:path] || '/'
-    end
-
-    def command
-      "/bin/df -k -l -P #{@path}"
-    end
+  class DiskSpace < Plugin
 
     def get_metrics
-      metrics = Metrics.new('Nephelae/Linux')
+      metrics = Metrics.new(namespace)
       output = `#{command}`
       stats = output.split(/\n/).last.split(/\s+/)
 
@@ -25,6 +16,17 @@ module Nephelae
 
     end
 
+    private
+
+      def default_namespace
+        'Nephelae/Linux'
+      end
+
+      def command
+        path = config[:path] || '/'
+        "/bin/df -k -l -P #{path}"
+      end
+
   end
 
 end

data/lib/nephelae/plugins/mem_usage.rb

@@ -1,16 +1,9 @@
 module Nephelae
 
-  class MemUsage
-
-    def initialize(params = {})
-    end
-
-    def command
-      "cat /proc/meminfo"
-    end
+  class MemUsage < Plugin
 
     def get_metrics
-      metrics = Metrics.new('Nephelae/Linux')
+      metrics = Metrics.new(namespace)
       output = `#{command}`
 
       if $?.success?
@@ -58,6 +51,14 @@ module Nephelae
         }
       end
 
+      def default_namespace
+        'Nephelae/Linux'
+      end
+
+      def command
+        "cat /proc/meminfo"
+      end
+
   end
 
 end

data/lib/nephelae/plugins/nephelae_process.rb

@@ -1,12 +1,9 @@
 module Nephelae
 
-  class NephelaeProcess
-
-    def initialize(params = {})
-    end
+  class NephelaeProcess < Plugin
 
     def get_metrics
-      metrics = Metrics.new('Nephelae/Process')
+      metrics = Metrics.new(namespace)
 
       #if we are doing this we are up
       metrics.append_metric('Up', 1)
@@ -15,6 +12,12 @@ module Nephelae
 
     end
 
+    private
+
+      def default_namespace
+        'Nephelae/Linux'
+      end
+
   end
 
 end

data/lib/nephelae/plugins/passenger_status.rb

@@ -1,16 +1,9 @@
 module Nephelae
 
-  class PassengerStatus
-
-    def initialize(params = {})
-    end
-
-    def command
-      "passenger-status"
-    end
+  class PassengerStatus < Plugin
 
     def get_metrics
-      metrics = Metrics.new('Nephelae/Passenger')
+      metrics = Metrics.new(namespace)
       output = `#{command}`
 
       if $?.success?
@@ -37,6 +30,15 @@ module Nephelae
         }
       end
 
+      def default_namespace
+        'Nephelae/Passenger'
+      end
+
+      def command
+        "passenger-status"
+      end
+
+
   end
 
 end

data/lib/nephelae/plugins/plugin.rb

@@ -0,0 +1,26 @@
+module Nephelae
+
+  class Plugin
+    attr_accessor :config
+
+    def initialize(config = {})
+      @config = config
+    end
+
+    def get_metrics
+      metrics = Metrics.new(namespace)
+      return metrics
+    end
+
+    def namespace
+      namespace = config[:namespace] || default_namespace
+    end
+
+    private
+      def default_namespace
+        "Nephelae/Plugin"
+      end
+
+  end
+
+end

data/lib/nephelae/plugins/redis.rb

@@ -1,16 +1,9 @@
 module Nephelae
 
-  class RedisStatus
-
-    def initialize(params = {})
-    end
-
-    def command
-      "/usr/local/bin/redis-cli info"
-    end
+  class RedisStatus < Plugin
 
     def get_metrics
-      metrics = Metrics.new('Nephelae/Redis')
+      metrics = Metrics.new(namespace)
       output = `#{command}`
 
       if $?.success?
@@ -47,6 +40,16 @@ module Nephelae
         })
       end
 
+      def command
+        port = config[:port].nil? ? "" : " -p #{config[:port]}"
+        password = config[:password].nil? ? "" : " -a #{config[:password]}"
+        "/usr/local/bin/redis-cli#{port}#{password} info"
+      end
+
+      def default_namespace
+        "Nephelae/Redis"
+      end
+
   end
 
 end

data/lib/nephelae/runner.rb

@@ -4,12 +4,13 @@ module Nephelae
   class Runner
     include Logging
 
-    attr_accessor :aws_access_key_id, :aws_secret_access_key, :region
+    attr_accessor :aws_access_key_id, :aws_secret_access_key, :region, :plugins
 
     def initialize(config = {})
       @aws_access_key_id = config[:aws_access_key_id]
       @aws_secret_access_key = config[:aws_secret_access_key]
-      @region = config[:region]
+      @region = config[:region] || 'us-east-1'
+      @plugins = config[:plugins] || default_plugins
     end
     
     def run
@@ -20,11 +21,14 @@ module Nephelae
           #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, RedisStatus.new]
           scheduler = Rufus::Scheduler::EmScheduler.start_new
 
-          scheduler.every '5m' do
-            plugins.each do |p| 
+          plugins.each do |name, config|
+            schedule = config.delete(:schedule) || '5m'
+            klass_name = config.delete(:plugin_class)
+            klass = Object.const_get('Nephelae').const_get(klass_name)
+            p = klass.new(config)
+            scheduler.every schedule do
               begin
                 cloud.put_metric(p.get_metrics)
               rescue StandardError => e
@@ -33,8 +37,17 @@ module Nephelae
               end
             end
           end
+
       }
     end
 
+    private
+      def default_plugins
+        plugins = {}
+        plugins[:disk_space] = {plugin_class: "DiskSpace", schedule: "5m", path: '/'}
+        plugins[:mem_usage] = {plugin_class: "MemUsage", schedule: "5m"}
+        plugins
+      end
+
   end
 end

data/lib/nephelae/version.rb

@@ -1,3 +1,3 @@
 module Nephelae
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephelae
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -115,6 +115,7 @@ files:
 - lib/nephelae/plugins/mem_usage.rb
 - lib/nephelae/plugins/nephelae_process.rb
 - lib/nephelae/plugins/passenger_status.rb
+- lib/nephelae/plugins/plugin.rb
 - lib/nephelae/plugins/redis.rb
 - lib/nephelae/runner.rb
 - lib/nephelae/version.rb