bipbip 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffb2e47b0d064209e1459b7be4036cc1ab15f2bb
-  data.tar.gz: 6da35aa18a085d1bfcc572c5d7197d903b7a4ee1
+  metadata.gz: 8aa8df7e73d0d7c9d463fb6770ad5b3e59327375
+  data.tar.gz: 75973cff2c74e8eff315d6484b89628ec4d9e7be
 SHA512:
-  metadata.gz: 3ef24076ec298fc436416646b4c09d936b767282d93fc77e083da7345d7ce506efd8cb3915b93997390038c5030169ec66e5f5df80841ef32aac5df397882478
-  data.tar.gz: 3c6330c8064fe34ca717e177e7f6e1be8f86b0008cd02ace5f3e46a286381a6e0e80f7c2d2690faac28fba85fadfe296cb5e1c5c0a495802ba62de387cfb0eae
+  metadata.gz: 0a19418f1f7693d768ab30a6b14000d2dd50fcd24b4702c8ef307962f8f77369bab604ae21f73a1daeec26d31fe3c71fd2556569a38b6ebd9cdd12639543d701
+  data.tar.gz: c1453b8c39cb419f6c8d6ecd614d0105aa5bce98eaec83a0e5493c7d439e073a5d279c29d423aed7bfc30c6b60107595c551f4164198051763c9d830671bf88e

data/README.md

@@ -1,22 +1,31 @@
 bipbip
 ======
 Agent to collect server metrics and send them to the [CopperEgg RevealMetrics](http://copperegg.com/) platform.
-Plugins for different metrics available in the `plugin/`-directory.
+Plugins for different metrics available.
 Will spawn a child process for every plugin and server you tell it to monitor.
 
-Configure and run
------------------
+Installation
+------------
+```
+gem install bipbip
+```
+
+Configuration
+-------------
 Pass the path to your configuration file to `bipbip` using the `-c` command line argument.
 ```sh
-bipbip -c /etc/bipbip/bipbip.yml
+bipbip -c /etc/bipbip/config.yml
 ```
 
-The configuration file should list the services you want to collect for, and the servers for each of them, e.g.:
+The configuration file should list the services you want to collect data for:
 ```yml
+logfile: /var/log/bipbip.log
 loglevel: INFO
+frequency: 15
+include: services.d/
+
 copperegg:
   apikey: YOUR_APIKEY
-  frequency: 15
 
 services:
   -

data/bin/bipbip

@@ -39,4 +39,4 @@ rescue OptionParser::InvalidOption, OptionParser::MissingArgument
   exit
 end
 
-Bipbip::Agent.new.run options[:config]
+Bipbip::Agent.new(options[:config]).run

data/lib/bipbip.rb

@@ -16,7 +16,7 @@ module Bipbip
   require 'bipbip/plugin/gearman'
 
   def self.logger
-    @logger
+    @logger || Logger.new(STDOUT)
   end
 
   def self.logger=(logger)

data/lib/bipbip/agent.rb

@@ -2,49 +2,47 @@ module Bipbip
 
   class Agent
 
-    def initialize
+    def initialize(config_file)
       @plugin_pids = []
-    end
+      @logfile = STDOUT
+      @loglevel = 'INFO'
+      @frequency = 60
+      @services = []
+      @copperegg_api_key
 
-    def run(config_file)
-      config = YAML.load(File.open(config_file))
+      load_config(config_file)
+    end
 
-      Bipbip.logger = Logger.new(STDOUT)
-      Bipbip.logger.level = Logger::const_get(config['loglevel'] || 'INFO')
+    def run
+      Bipbip.logger = Logger.new(@logfile)
+      Bipbip.logger.level = Logger::const_get(@loglevel)
       Bipbip.logger.info 'Startup...'
 
-      CopperEgg::Api.apikey = config['copperegg']['apikey']
-      CopperEgg::Api.host = config['copperegg']['host'] if !config['copperegg']['host'].nil?
-      frequency = config['copperegg']['frequency'].to_i
+      Bipbip.logger.info "Using CopperEgg API key `#{@copperegg_api_key}`"
+      CopperEgg::Api.apikey = @copperegg_api_key
 
-      if ![5, 15, 60, 300, 900, 3600, 21600].include?(frequency)
-        Bipbip.logger.fatal "Invalid frequency: #{frequency}"
-        exit
+      if ![5, 15, 60, 300, 900, 3600, 21600].include?(@frequency)
+        Bipbip.logger.fatal "Invalid frequency: #{@frequency}"
+        exit 1
       end
 
       ['INT', 'TERM'].each { |sig| trap(sig) {
         Thread.new { interrupt }
       } }
 
-      services = config['services']
-      if config.has_key?('include')
-        include_path = File.expand_path(config['include'], File.dirname(config_file))
-        services += load_include_configs(include_path)
-      end
-
-      metric_groups = load_metric_groups
-      dashboards = load_dashboards
+      metric_groups = get_copperegg_metric_groups
+      dashboards = get_copperegg_dashboards
 
-      plugin_names = services.map { |service| service['plugin'] }
+      plugin_names = @services.map { |service| service['plugin'] }
       plugin_names.each do |plugin_name|
         plugin = Plugin::const_get(plugin_name).new
 
         metric_group = metric_groups.detect { |m| m.name == plugin_name }
         if metric_group.nil? || !metric_group.is_a?(CopperEgg::MetricGroup)
           Bipbip.logger.info "Creating metric group `#{plugin_name}`"
-          metric_group = CopperEgg::MetricGroup.new(:name => plugin_name, :label => plugin_name, :frequency => frequency)
+          metric_group = CopperEgg::MetricGroup.new(:name => plugin_name, :label => plugin_name, :frequency => @frequency)
         end
-        metric_group.frequency = frequency
+        metric_group.frequency = @frequency
         metric_group.metrics = plugin.metrics_schema
         metric_group.save
 
@@ -56,37 +54,61 @@ module Bipbip
         end
       end
 
-      services.each do |service|
+      @services.each do |service|
         plugin_name = service['plugin']
         Bipbip.logger.info "Starting plugin #{plugin_name}"
         plugin = Plugin::const_get(plugin_name).new
-        @plugin_pids.push plugin.run(service, frequency)
+        @plugin_pids.push plugin.run(service, @frequency)
       end
 
       p Process.waitall
     end
 
-    def load_metric_groups
+    def get_copperegg_metric_groups
       Bipbip.logger.info 'Loading metric groups'
       metric_groups = CopperEgg::MetricGroup.find
       if metric_groups.nil?
-        raise 'Cannot load metric groups'
+        Bipbip.logger.fatal 'Cannot load metric groups'
+        exit 1
       end
       metric_groups
     end
 
-    def load_dashboards
+    def get_copperegg_dashboards
       Bipbip.logger.info 'Loading dashboards'
       dashboards = CopperEgg::CustomDashboard.find
       if dashboards.nil?
-        raise 'Cannot load dashboards'
+        Bipbip.logger.fatal 'Cannot load dashboards'
+        exit 1
       end
       dashboards
     end
 
-    def load_include_configs(directory)
-      files = Dir[directory + '/**/*.yaml', directory + '/**/*.yml']
-      services = files.map {|file| YAML.load(File.open(file))}
+    def load_config(config_file)
+      config = YAML.load(File.open(config_file))
+      if config.has_key?('logfile')
+        @logfile = config['logfile'].to_s
+      end
+      if config.has_key?('loglevel')
+        @loglevel = config['loglevel'].to_s
+      end
+      if config.has_key?('frequency')
+        @frequency = config['frequency'].to_i
+      end
+      if config.has_key?('services')
+        @services = config['services'].to_a
+      end
+      if config.has_key?('include')
+        include_path = File.expand_path(config['include'].to_s, File.dirname(config_file))
+        files = Dir[include_path + '/**/*.yaml', include_path + '/**/*.yml']
+        @services += files.map {|file| YAML.load(File.open(file))}
+      end
+      if config.has_key?('copperegg')
+        config_copperegg = config['copperegg']
+        if config_copperegg.has_key?('apikey')
+          @copperegg_api_key = config_copperegg['apikey']
+        end
+      end
     end
 
     def interrupt

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Cargo Media