metrix 0.0.6 → 0.0.7

data/README.md

@@ -8,17 +8,30 @@ Add this line to your application's Gemfile:
 
     gem 'metrix'
 
-And then execute:
+## Configuration
 
-    $ bundle
+    #/etc/metrix.tml
+    elasticsearch:  http://127.0.0.1:9200/_status
+    mongodb:        http://127.0.0.1:28017/serverStatus
+    fpm:            http://127.0.0.1:9001/fpm-status
+    nginx:          http://127.0.0.1:8000/
+    opentsdb:       tcp://127.0.0.1:4242/
+    graphite:       tcp://127.0.0.1:2003/
+    load:           true
+    system:         true
+    processes:      true
 
-Or install it yourself as:
+## Start
 
-    $ gem install metrix
+    $ metrix start
 
-## Usage
+## Stop
 
-TODO: Write usage instructions here
+    $ metrix stop
+
+## Status
+
+    $ metrix status
 
 ## Contributing
 

data/lib/metrix/cli.rb

@@ -5,12 +5,14 @@ require "metrix/nginx"
 require "metrix/system"
 require "metrix/load"
 require "metrix/fpm"
+require "metrix/process"
+require "metrix/load"
 require "logger"
 require "fileutils"
 
 module Metrix
   class CLI
-    attr_reader :reporter, :elastic_search_host, :mongodb_host, :interval
+    attr_reader :interval
 
     def initialize(args)
       @args = args
@@ -20,20 +22,32 @@ module Metrix
       Metrix.logger = Syslog::Logger.new("metrix")
     end
 
+    def parse!
+      @action = opts.parse(@args).first
+    end
+
+    def action
+      @action ||= parse!
+    end
+
     def run
-      Metrix.logger.level = log_level
-      action = opts.parse(@args).first
-      case action
+      parse!
+      load_configs_from_file!
+      case @action
       when "start"
         if running?
           logger.warn "refuse to run. seems that #{pid_path} exists!"
           abort "not allowed to run" if running?
         end
-        pid = Process.fork do
+        if daemonize?
+          pid = Process.fork do
+            start
+          end
+          sleep 1
+          Process.detach(pid)
+        else
           start
         end
-        sleep 1
-        Process.detach(pid)
       when "status"
         if File.exists?(pid_path)
           logger.debug "#{pid_path} exists"
@@ -50,6 +64,8 @@ module Metrix
         logger.info "killing pid #{pid}"
         system "kill #{pid}"
         puts "killed #{pid}"
+      when "configtest"
+        puts "running configtest #{attributes.inspect}"
       else
         logger.warn "action #{action} unknown!"
         abort "action #{action} unknown!"
@@ -78,46 +94,19 @@ module Metrix
         begin
           cnt += 1
           now = Time.now.utc
-          if elastic_search?
-            fetch_metrix :elastic_search do
-              reporter << Metrix::ElasticSearch.new(elastic_search_status)
-            end
-          end
-
-          if mongodb?
-            fetch_metrix :mongodb do
-              reporter << Metrix::Mongodb.new(mongodb_status)
+          fetch_metrix(:elasticsearch) { reporter << Metrix::ElasticSearch.new(fetch_resource(:elasticsearch)) }
+          fetch_metrix(:mongodb)       { reporter << Metrix::Mongodb.new(fetch_resource(:mongodb)) }
+          fetch_metrix(:nginx)         { reporter << Metrix::Nginx.new(fetch_resource(:nginx)) }
+          fetch_metrix(:fpm)           { reporter << Metrix::FPM.new(fetch_resource(:fpm)) }
+          fetch_metrix(:system)        { reporter << Metrix::System.new(File.read("/proc/stat")) }
+          fetch_metrix(:load)          { reporter << Metrix::Load.new(File.read("/proc/loadavg")) }
+
+          fetch_metrix :processes do
+            Metrix::ProcessMetric.all.each do |m|
+              reporter << m
             end
           end
 
-          if nginx?
-            fetch_metrix :nginx do
-              reporter << Metrix::Nginx.new(nginx_status)
-            end
-          end
-
-          if fpm?
-            fetch_metrix :fpm do
-              reporter << Metrix::FPM.new(fpm_status)
-            end
-          end
-
-          if system?
-            fetch_metrix :system do
-              reporter << Metrix::System.new(File.read("/proc/stat"))
-            end
-            fetch_metrix :load do
-              reporter << Metrix::Load.new(File.read("/proc/loadavg"))
-            end
-          end
-
-          if processes?
-            fetch_metrix :processes do
-              Metrix::ProcessMetric.all.each do |m|
-                reporter << m
-              end
-            end
-          end
           reporter.flush
         rescue SystemExit
           $running = false
@@ -125,18 +114,37 @@ module Metrix
           Metrix.logger.error "#{err.message}"
           Metrix.logger.error "#{err.backtrace.inspect}"
         ensure
-          sleep_for = @interval - (Time.now - started - cnt * interval)
-          if sleep_for > 0
-            Metrix.logger.info "finished run in %.06f, sleeping for %.06f" % [Time.now - now, sleep_for]
-            sleep sleep_for
-          else
-            Metrix.logger.info "not sleeping because %.06f is negative" % [sleep_for]
+          begin
+            sleep_for = @interval - (Time.now - started - cnt * interval)
+            if sleep_for > 0
+              Metrix.logger.info "finished run in %.06f, sleeping for %.06f" % [Time.now - now, sleep_for]
+              sleep sleep_for
+            else
+              Metrix.logger.info "not sleeping because %.06f is negative" % [sleep_for]
+            end
+          rescue SystemExit, Interrupt
+            $running = false
           end
         end
       end
       delete_pidfile!
     end
 
+    def reporter
+      if attributes[:opentsdb]
+        require "metrix/opentsdb"
+        uri = URI.parse(attributes[:opentsdb])
+        Metrix::OpenTSDB.new(uri.host, uri.port)
+      elsif attributes[:graphite]
+        require "metrix/graphite"
+        uri = URI.parse(attributes[:graphite])
+        Metrix::Graphite.new(uri.host, uri.port)
+      elsif @foreground == true
+        require "metrix/reporter/stdout"
+        Metrix::Reporter::Stdout.new
+      end
+    end
+
     def write_pidfile!(pid)
       logger.info "writing #{pid} to #{pid_path}"
       File.open(pid_path, "w") { |f| f.print(pid) }
@@ -154,44 +162,20 @@ module Metrix
       File.exists?(pid_path)
     end
 
-    def log_level
-      @log_level || Logger::INFO
+    def enabled?(key)
+      !!attributes[key]
     end
 
-    def processes?
-      !!@processes
+    def elasticsearch_status
+      get_url url_for(:elasticsearch)
     end
 
-    def elastic_search?
-      !!@elastic_search
+    def fetch_resource(key)
+      get_url(url_for(key))
     end
 
-    def mongodb?
-      !!@mongodb
-    end
-
-    def fpm?
-      !!@fpm
-    end
-
-    def nginx?
-      !!@nginx
-    end
-
-    def elastic_search_status
-      get_url "http://127.0.0.1:9200/_status"
-    end
-
-    def mongodb_status
-      get_url "http://127.0.0.1:28017/serverStatus"
-    end
-
-    def fpm_status
-      get_url "http://127.0.0.1:9001/fpm-status"
-    end
-
-    def nginx_status
-      get_url "http://127.0.0.1:8000/"
+    def url_for(key)
+      attributes[key]
     end
 
     def get_url(url)
@@ -203,6 +187,7 @@ module Metrix
     end
 
     def fetch_metrix(type)
+      return false if !enabled?(type)
       started = Time.now
       logger.info "fetching metrix for #{type}"
       yield
@@ -215,15 +200,37 @@ module Metrix
       Metrix.logger
     end
 
-    def system?
-      !!@system
-    end
-
     def log_to_stdout
       Metrix.logger = Logger.new(STDOUT)
       Metrix.logger.level = Logger::INFO
     end
 
+    def daemonize?
+      @foreground != true
+    end
+
+    def attributes
+      @attributes ||= {}
+    end
+
+    def load_configs_from_file!
+      require "erb"
+      require "yaml"
+      hash = YAML.load(ERB.new(File.read(config_path)).result)
+      @attributes = hash.inject({}) do |hash, (k, v)|
+        hash[k.to_sym] = v
+        hash
+      end
+    end
+
+    def config_path
+      @config_path || default_config_path
+    end
+
+    def default_config_path
+      File.expand_path("/etc/metrix.yml")
+    end
+
     def opts
       require "optparse"
       @opts ||= OptionParser.new do |o|
@@ -232,53 +239,14 @@ module Metrix
           exit
         end
 
-        o.on("--fpm") do
-          @fpm = true
-        end
-
-        o.on("--nginx") do
-          @nginx = true
-        end
-
-        o.on("--mongodb") do
-          @mongodb = true
-        end
-
-        o.on("--elasticsearch") do
-          @elastic_search = true
-        end
-
-        o.on("--graphite-host HOST") do |value|
-          require "metrix/graphite"
-          @reporter = Metrix::Graphite.new(value, 2003)
-        end
-
-        o.on("--opentsdb-host HOST") do |value|
-          require "metrix/opentsdb"
-          @reporter = Metrix::OpenTSDB.new(value, 4242)
+        o.on("-c PATH") do |value|
+          @config_path = value
         end
 
-        o.on("--stdout") do
-          require "metrix/reporter/stdout"
-          @reporter = Metrix::Reporter::Stdout.new
-        end
-
-        o.on("--debug") do
-          @log_level = Logger::DEBUG
-        end
-
-        o.on("--no-syslog") do
+        o.on("-d", "--debug") do |value|
+          @foreground = true
           log_to_stdout
-        end
-
-        o.on("--processes") do
-          require "metrix/process"
-          @processes = true
-        end
-
-        o.on("--system") do
-          require "metrix/system"
-          @system = true
+          Metrix.logger.level = Logger::DEBUG
         end
       end
     end

data/lib/metrix/opentsdb.rb

@@ -2,6 +2,8 @@ require "socket"
 
 module Metrix
   class OpenTSDB
+    attr_reader :host, :port
+
     def initialize(host, port = 4242)
       @host = host
       @port = port

data/lib/metrix/system.rb

@@ -49,14 +49,6 @@ module Metrix
       }
     end
 
-    def load1
-      loadavg.split(" ").first.to_f
-    end
-
-    def loadavg
-      @loadavg ||= File.read("/proc/loadavg")
-    end
-
     def prefix
       "system"
     end

data/lib/metrix/version.rb

@@ -1,3 +1,3 @@
 module Metrix
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/fixtures/metrix.yml

@@ -0,0 +1,6 @@
+system: true
+processes: true
+load: true
+opentsdb: tcp://<%= "some.host" %>:1234
+log_level: debug
+fpm: http://localhost:9001

data/spec/lib/metrix/cli_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "metrix/cli"
 
-describe "Metrix::CLI", :wip do
+describe "Metrix::CLI" do
   subject(:cli) { Metrix::CLI.new([]) }
   it { should_not be_nil }
 
@@ -28,4 +28,60 @@ describe "Metrix::CLI", :wip do
 
     it { should_not be_allowed_to_run }
   end
+
+  describe "with graphite reporter" do
+    subject(:reporter) do
+      cli.attributes[:graphite] = "tcp://123.3.4.5:1212"
+      cli.reporter
+    end
+
+    it { should_not be_nil }
+    it { subject.host.should eq("123.3.4.5") }
+    it { subject.port.should eq(1212) }
+  end
+
+  describe "initializing from config file" do
+    let(:path) { FIXTURES_PATH.join("metrix.yml").to_s }
+    subject(:cli) { Metrix::CLI.new(["-c", path, "configtest"]) }
+
+    before do
+      cli.stub(:puts)
+      cli.run
+    end
+
+    it { cli.config_path.should eq(path) }
+    it { should_not be_nil }
+    it { should be_enabled(:system) }
+    it { should be_enabled(:load) }
+    it { should be_enabled(:processes) }
+    it { subject.reporter.should be_kind_of(Metrix::OpenTSDB) }
+    it { subject.attributes[:opentsdb].should include("some.host") }
+    it { subject.should_not be_enabled(:elasticsearch) }
+    it { subject.url_for(:fpm).should_not be_nil }
+    it { subject.should be_enabled(:fpm) }
+    it { subject.should_not be_enabled(:mongodb) }
+    it { subject.should be_daemonize }
+
+    describe "#reporter" do
+      subject(:reporter) { cli.reporter }
+      it { should_not be_nil }
+      it { subject.host.should eq("some.host") }
+    end
+  end
+
+  describe "with no parameters called" do
+    subject(:cli) { Metrix::CLI.new([]) }
+    it { should_not be_nil }
+    it { cli.config_path.should eq("/etc/metrix.yml") }
+  end
+
+  describe "running in forground" do
+    subject(:cli) { Metrix::CLI.new(["--debug"]) }
+    before do
+      cli.parse!
+    end
+    it { should_not be_nil }
+    it { subject.reporter.should_not be_nil }
+    it { cli.config_path.should eq("/etc/metrix.yml") }
+  end
 end

data/spec/lib/metrix/fpm_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "metrix/fpm"
 
-describe "Metrix::FPM", :wip do
+describe "Metrix::FPM" do
   let(:data) { FIXTURES_PATH.join("php.fpm.status.txt").read }
   subject(:fpm) { Metrix::FPM.new(data) }
   it { should_not be_nil }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metrix
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -109,6 +109,7 @@ files:
 - spec/fixtures/ec2metadata.txt
 - spec/fixtures/es_status.json
 - spec/fixtures/loadavg.txt
+- spec/fixtures/metrix.yml
 - spec/fixtures/mongo_server_status.json
 - spec/fixtures/nginx.status.txt
 - spec/fixtures/php.fpm.status.txt
@@ -154,6 +155,7 @@ test_files:
 - spec/fixtures/ec2metadata.txt
 - spec/fixtures/es_status.json
 - spec/fixtures/loadavg.txt
+- spec/fixtures/metrix.yml
 - spec/fixtures/mongo_server_status.json
 - spec/fixtures/nginx.status.txt
 - spec/fixtures/php.fpm.status.txt