bipbip 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12b5c1397dff6859436b3219cc2f6d53502a8c44
-  data.tar.gz: 3105ea62b4e44e25b971403ceef0fb6977c213ea
+  metadata.gz: 334c4a2cf9c0c11478f524f0e6316d71de27a055
+  data.tar.gz: 6c48b47f6ca4668bde7aa7345d7e4e7eb8532613
 SHA512:
-  metadata.gz: 289de4232b6a3f08b8ea9b4de856f9403d72caef91f4abdba8fabd7df436a73d21033c3b691d376bf169ba6c4d62c99fd87b95dbf5882b5efdac672fbc667dbc
-  data.tar.gz: 7cc70c13a262e60480fe8fb48dfc8c8354b8df4df80a82677a70a757fadf212a85f2723629b5775b7d384545fe305c2806c441602fa7e0cf9b7356b8f8edfb74
+  metadata.gz: bed5bf43747499e9874fa1cff47eb3774f002ce8fda0bda28d7243a7462a530060182f2deead017cbf4723a2bbf74122f7c3a30ed7ada2bb483dc7f78de816ad
+  data.tar.gz: 05e7335084e0c941c9c26ab3181f4dce7d9b405b1b7930023afcacac7f1f3d3f276d8963b3451a50998bd0a2b3a2cbb6677bb3bc576f2d9065316cb1e4fd5795

data/README.md

@@ -1,8 +1,12 @@
-bipbip [![Build Status](https://travis-ci.org/cargomedia/bipbip.png)](https://travis-ci.org/cargomedia/bipbip)
+bipbip
 ======
 Agent to collect server metrics and send them to the [CopperEgg RevealMetrics](http://copperegg.com/) platform.
 Plugins for different metrics available.
 
+[![Build Status](https://img.shields.io/travis/cargomedia/bipbip/master.svg)](https://travis-ci.org/cargomedia/bipbip)
+[![Gem Version](https://img.shields.io/gem/v/bipbip.svg)](https://rubygems.org/gems/bipbip)
+
+
 Installation
 ------------
 ```

data/bin/bipbip

@@ -11,30 +11,29 @@ options = {}
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: #{name} [options]"
 
-  opts.on("-c", "--config PATH", "Configuration file") do |c|
+  opts.on('-c', '--config PATH', 'Configuration file') do |c|
     options[:config] = c
   end
 
-  opts.on("-v", "--version", "Version") do |v|
+  opts.on('-v', '--version', 'Version') do |_v|
     puts "#{name} v#{version}"
     exit
   end
 
-  opts.on("-h", "--help", "Show this help") do |h|
+  opts.on('-h', '--help', 'Show this help') do |_h|
     puts opts
     exit
   end
 end
 
-
 begin
   optparse.parse!
   unless options[:config]
-    puts "Missing options: config file [-c PATH]"
+    puts 'Missing options: config file [-c PATH]'
     exit
   end
 rescue OptionParser::InvalidOption, OptionParser::MissingArgument
-  puts $!.to_s
+  puts $ERROR_INFO.to_s
   puts optparse
   exit
 end

data/lib/bipbip.rb

@@ -1,5 +1,5 @@
 module Bipbip
-  require 'rubygems'  # For ruby < 1.9
+  require 'rubygems' # For ruby < 1.9
 
   require 'copperegg/revealmetrics'
   require 'yaml'
@@ -28,6 +28,10 @@ module Bipbip
   end
 
   def self.fqdn
-    @fqdn ||= Socket.gethostbyname(Socket.gethostname).first rescue Socket.gethostname
+    @fqdn ||= begin
+                Socket.gethostbyname(Socket.gethostname).first
+              rescue
+                Socket.gethostname
+              end
   end
 end

data/lib/bipbip/agent.rb

@@ -1,5 +1,4 @@
 module Bipbip
-
   class Agent
     include InterruptibleSleep
 
@@ -22,9 +21,7 @@ module Bipbip
       Bipbip.logger.info 'Startup...'
       Bipbip.logger.warn 'No storages configured' if @storages.empty?
 
-      if @plugins.empty?
-        raise 'No services configured'
-      end
+      fail 'No services configured' if @plugins.empty?
 
       @storages.each do |storage|
         @plugins.each do |plugin|
@@ -38,7 +35,7 @@ module Bipbip
         start_plugin(plugin, @storages)
       end
 
-      while true
+      loop do
         thread = ThreadsWait.new(@threads).next_wait
         @threads.delete(thread)
         plugin = thread['plugin']

data/lib/bipbip/config.rb

@@ -1,7 +1,5 @@
 module Bipbip
-
   class Config
-
     attr_reader :plugins
     attr_reader :storages
     attr_reader :logger
@@ -16,11 +14,11 @@ module Bipbip
         'frequency' => 60,
         'include' => nil,
         'services' => [],
-        'tags' => [],
+        'tags' => []
       }.merge(config)
 
       logger = Logger.new(config['logfile'])
-      logger.level = Logger::const_get(config['loglevel'])
+      logger.level = Logger.const_get(config['loglevel'])
 
       plugins_config = config['services'].to_a
       if config['include']
@@ -35,14 +33,14 @@ module Bipbip
         metric_group = service['metric_group']
         frequency = service['frequency'].nil? ? config['frequency'] : service['frequency']
         tags = config['tags'].to_a + service['tags'].to_a
-        plugin_config = service.reject { |key, value| ['plugin', 'frequency', 'tags', 'metric_group'].include?(key) }
+        plugin_config = service.reject { |key, _value| %w(plugin frequency tags metric_group).include?(key) }
         Bipbip::Plugin.factory(plugin_name, plugin_config, frequency, tags, metric_group)
       end
 
       storages_config = config['storages'].to_a
       storages = storages_config.map do |storage|
         storage_name = storage['name'].to_s
-        storage_config = storage.reject { |key, value| ['name'].include?(key) }
+        storage_config = storage.reject { |key, _value| ['name'].include?(key) }
         Bipbip::Storage.factory(storage_name, storage_config)
       end
 
@@ -57,6 +55,5 @@ module Bipbip
       @storages = storages || []
       @logger = logger || Logger.new(STDOUT)
     end
-
   end
 end

data/lib/bipbip/helper.rb

@@ -1,7 +1,6 @@
 module Bipbip::Helper
-
   def self.name_to_classname(name)
-    name.split('-').map{|w| w.capitalize}.join
+    name.split('-').map(&:capitalize).join
   end
 
   def self.name_to_filename(name)

data/lib/bipbip/plugin.rb

@@ -1,7 +1,5 @@
 module Bipbip
-
   class Plugin
-
     class MeasurementTimeout < RuntimeError
     end
 
@@ -15,7 +13,7 @@ module Bipbip
 
     def self.factory(name, config, frequency, tags, metric_group = nil)
       require "bipbip/plugin/#{Bipbip::Helper.name_to_filename(name)}"
-      Plugin::const_get(Bipbip::Helper.name_to_classname(name)).new(name, config, frequency, tags, metric_group)
+      Plugin.const_get(Bipbip::Helper.name_to_classname(name)).new(name, config, frequency, tags, metric_group)
     end
 
     # @param [Bipbip::Plugin] plugin
@@ -34,31 +32,27 @@ module Bipbip
 
     # @param [Array] storages
     def run(storages)
-      begin
-        timeout = frequency * 2
-        while true
-          time = Time.now
-          Timeout::timeout(timeout, MeasurementTimeout) do
-            run_measurement(time, storages)
-          end
-          interruptible_sleep (frequency - (Time.now - time))
+      timeout = frequency * 2
+      loop do
+        time = Time.now
+        Timeout.timeout(timeout, MeasurementTimeout) do
+          run_measurement(time, storages)
         end
-      rescue MeasurementTimeout => e
-        log(Logger::ERROR, "Measurement timeout of #{timeout} seconds reached.")
-        retry
-      rescue StandardError => e
-        log_exception(Logger::ERROR, e)
-        interruptible_sleep frequency
-        retry
-      rescue Exception => e
-        log_exception(Logger::FATAL, e)
-        raise e
+        interruptible_sleep (frequency - (Time.now - time))
       end
+    rescue MeasurementTimeout => e
+      log(Logger::ERROR, "Measurement timeout of #{timeout} seconds reached.")
+      retry
+    rescue StandardError => e
+      log_exception(Logger::ERROR, e)
+      interruptible_sleep frequency
+      retry
+    rescue Exception => e
+      log_exception(Logger::FATAL, e)
+      raise e
     end
 
-    def frequency
-      @frequency
-    end
+    attr_reader :frequency
 
     def source_identifier
       identifier = Bipbip.fqdn + '::' + metric_group
@@ -73,20 +67,18 @@ module Bipbip
     end
 
     def metrics_schema
-      raise 'Missing method metrics_schema'
+      fail 'Missing method metrics_schema'
     end
 
     def monitor
-      raise 'Missing method monitor'
+      fail 'Missing method monitor'
     end
 
     private
 
     def run_measurement(time, storages)
       data = monitor
-      if data.empty?
-        raise "#{name} #{source_identifier}: Empty data"
-      end
+      fail "#{name} #{source_identifier}: Empty data" if data.empty?
       log(Logger::DEBUG, "Data: #{data}")
       storages.each do |storage|
         storage.store_sample(self, time, data)

data/lib/bipbip/plugin/apache2.rb

@@ -1,11 +1,9 @@
 module Bipbip
-
   class Plugin::Apache2 < Plugin
-
     def metrics_schema
       [
-          {:name => 'request_per_sec', :type => 'gauge', :unit => 'Requests'},
-          {:name => 'busy_workers', :type => 'gauge', :unit => 'Workers'},
+        { name: 'request_per_sec', type: 'gauge', unit: 'Requests' },
+        { name: 'busy_workers', type: 'gauge', unit: 'Workers' }
       ]
     end
 
@@ -13,7 +11,7 @@ module Bipbip
       uri = URI.parse(config['url'])
       response = Net::HTTP.get_response(uri)
 
-      raise "Invalid response from server at #{config['url']}" unless response.code == '200'
+      fail "Invalid response from server at #{config['url']}" unless response.code == '200'
 
       astats = response.body.split(/\r*\n/)
 
@@ -23,7 +21,7 @@ module Bipbip
         ainfo[name] = value
       end
 
-      {:request_per_sec => ainfo['ReqPerSec'].to_f, :busy_workers => ainfo['BusyWorkers'].to_i}
+      { request_per_sec: ainfo['ReqPerSec'].to_f, busy_workers: ainfo['BusyWorkers'].to_i }
     end
   end
 end

data/lib/bipbip/plugin/command.rb

@@ -2,9 +2,7 @@ require 'open3'
 require 'json'
 
 module Bipbip
-
   class Plugin::Command < Plugin
-
     attr_accessor :schema
 
     def metrics_schema
@@ -19,24 +17,24 @@ module Bipbip
 
     def metric_value(value)
       value = value['value'] if detect_operation_mode(value) == :advanced
-      value = 1 if value == 'true' or value == true
-      value = 0 if value == 'false' or value == false
+      value = 1 if value == 'true' || value == true
+      value = 0 if value == 'false' || value == false
       value
     end
 
     def find_schema
       command_output.map do |metric, value|
         case detect_operation_mode(value)
-          when :simple
-            {:name => "#{metric}", :type => 'gauge'}
-          when :advanced
-            {:name => "#{metric}", :type => value['type'], :unit => value['unit']}
+        when :simple
+          { name: "#{metric}", type: 'gauge' }
+        when :advanced
+          { name: "#{metric}", type: value['type'], unit: value['unit'] }
         end
       end
     end
 
     def detect_operation_mode(value)
-      {true => :advanced, false => :simple}.fetch(value.is_a?(Hash))
+      { true => :advanced, false => :simple }.fetch(value.is_a?(Hash))
     end
 
     def command_output
@@ -47,21 +45,20 @@ module Bipbip
       command = config['command'].to_s
 
       output_stdout = output_stderr = exit_code = nil
-      Open3.popen3(command) { |stdin, stdout, stderr, wait_thr|
+      Open3.popen3(command) do |_stdin, stdout, stderr, wait_thr|
         output_stdout = stdout.read.chomp
         output_stderr = stderr.read.chomp
         exit_code = wait_thr.value
-      }
+      end
 
       unless exit_code.success?
         message = ['Command execution failed:', command]
         message.push 'STDOUT:', output_stdout unless output_stdout.empty?
         message.push 'STDERR:', output_stderr unless output_stderr.empty?
-        raise message.join("\n")
+        fail message.join("\n")
       end
 
       output_stdout
     end
-
   end
 end

data/lib/bipbip/plugin/elasticsearch.rb

@@ -3,89 +3,86 @@ class ElasticsearchClient < Elasticsearch::Transport::Client
 end
 
 module Bipbip
-
   class Plugin::Elasticsearch < Plugin
-
     def metrics_schema
       [
-          {:name => 'store_size', :type => 'gauge', :unit => 'b'},
-          {:name => 'docs_count', :type => 'gauge', :unit => 'Docs'},
-          {:name => 'docs_deleted', :type => 'counter', :unit => 'Deleted'},
-          {:name => 'segments_count', :type => 'gauge', :unit => 'Segments'},
-
-          {:name => 'search_query_total', :type => 'counter', :unit => 'Queries'},
-          {:name => 'search_query_time', :type => 'counter', :unit => 'Seconds'},
-          {:name => 'search_fetch_total', :type => 'counter', :unit => 'Fetches'},
-          {:name => 'search_fetch_time', :type => 'counter', :unit => 'Seconds'},
-
-          {:name => 'get_total', :type => 'counter', :unit => 'Gets'},
-          {:name => 'get_time', :type => 'counter', :unit => 'Seconds'},
-          {:name => 'get_exists_total', :type => 'counter', :unit => 'Exists'},
-          {:name => 'get_exists_time', :type => 'counter', :unit => 'Seconds'},
-          {:name => 'get_missing_total', :type => 'counter', :unit => 'Missing'},
-          {:name => 'get_missing_time', :type => 'counter', :unit => 'Seconds'},
-
-          {:name => 'indexing_index_total', :type => 'counter', :unit => 'Indexes'},
-          {:name => 'indexing_index_time', :type => 'counter', :unit => 'Seconds'},
-          {:name => 'indexing_delete_total', :type => 'counter', :unit => 'Deletes'},
-          {:name => 'indexing_delete_time', :type => 'counter', :unit => 'Seconds'},
-
-          {:name => 'cache_filter_size', :type => 'gauge', :unit => 'b'},
-          {:name => 'cache_filter_evictions', :type => 'gauge', :unit => 'b'},
-          {:name => 'cache_field_size', :type => 'gauge', :unit => 'b'},
-          {:name => 'cache_field_evictions', :type => 'gauge', :unit => 'b'},
+        { name: 'store_size', type: 'gauge', unit: 'b' },
+        { name: 'docs_count', type: 'gauge', unit: 'Docs' },
+        { name: 'docs_deleted', type: 'counter', unit: 'Deleted' },
+        { name: 'segments_count', type: 'gauge', unit: 'Segments' },
+
+        { name: 'search_query_total', type: 'counter', unit: 'Queries' },
+        { name: 'search_query_time', type: 'counter', unit: 'Seconds' },
+        { name: 'search_fetch_total', type: 'counter', unit: 'Fetches' },
+        { name: 'search_fetch_time', type: 'counter', unit: 'Seconds' },
+
+        { name: 'get_total', type: 'counter', unit: 'Gets' },
+        { name: 'get_time', type: 'counter', unit: 'Seconds' },
+        { name: 'get_exists_total', type: 'counter', unit: 'Exists' },
+        { name: 'get_exists_time', type: 'counter', unit: 'Seconds' },
+        { name: 'get_missing_total', type: 'counter', unit: 'Missing' },
+        { name: 'get_missing_time', type: 'counter', unit: 'Seconds' },
+
+        { name: 'indexing_index_total', type: 'counter', unit: 'Indexes' },
+        { name: 'indexing_index_time', type: 'counter', unit: 'Seconds' },
+        { name: 'indexing_delete_total', type: 'counter', unit: 'Deletes' },
+        { name: 'indexing_delete_time', type: 'counter', unit: 'Seconds' },
+
+        { name: 'cache_filter_size', type: 'gauge', unit: 'b' },
+        { name: 'cache_filter_evictions', type: 'gauge', unit: 'b' },
+        { name: 'cache_field_size', type: 'gauge', unit: 'b' },
+        { name: 'cache_field_evictions', type: 'gauge', unit: 'b' }
       ]
     end
 
     def monitor
       @stats = nil
       {
-          'store_size' => stats_sum(['indices', 'store', 'size_in_bytes']),
-          'docs_count' => stats_sum(['indices', 'docs', 'count']),
-          'docs_deleted' => stats_sum(['indices', 'docs', 'deleted']),
-          'segments_count' => stats_sum(['indices', 'segments', 'count']),
-
-          'search_query_total' => stats_sum(['indices', 'search', 'query_total']),
-          'search_query_time' => stats_sum(['indices', 'search', 'query_time_in_millis'])/1000,
-          'search_fetch_total' => stats_sum(['indices', 'search', 'fetch_total']),
-          'search_fetch_time' => stats_sum(['indices', 'search', 'fetch_time_in_millis'])/1000,
-
-          'get_total' => stats_sum(['indices', 'get', 'total']),
-          'get_time' => stats_sum(['indices', 'get', 'time_in_millis'])/1000,
-          'get_exists_total' => stats_sum(['indices', 'get', 'exists_total']),
-          'get_exists_time' => stats_sum(['indices', 'get', 'exists_time_in_millis'])/1000,
-          'get_missing_total' => stats_sum(['indices', 'get', 'missing_total']),
-          'get_missing_time' => stats_sum(['indices', 'get', 'missing_time_in_millis'])/1000,
-
-          'indexing_index_total' => stats_sum(['indices', 'indexing', 'index_total']),
-          'indexing_index_time' => stats_sum(['indices', 'indexing', 'index_time_in_millis'])/1000,
-          'indexing_delete_total' => stats_sum(['indices', 'indexing', 'delete_total']),
-          'indexing_delete_time' => stats_sum(['indices', 'indexing', 'delete_time_in_millis'])/1000,
-
-          'cache_filter_size' => stats_sum(['indices', 'filter_cache', 'memory_size_in_bytes']),
-          'cache_filter_evictions' => stats_sum(['indices', 'filter_cache', 'evictions']),
-          'cache_field_size' => stats_sum(['indices', 'fielddata', 'memory_size_in_bytes']),
-          'cache_field_evictions' => stats_sum(['indices', 'fielddata', 'evictions']),
+        'store_size' => stats_sum(%w(indices store size_in_bytes)),
+        'docs_count' => stats_sum(%w(indices docs count)),
+        'docs_deleted' => stats_sum(%w(indices docs deleted)),
+        'segments_count' => stats_sum(%w(indices segments count)),
+
+        'search_query_total' => stats_sum(%w(indices search query_total)),
+        'search_query_time' => stats_sum(%w(indices search query_time_in_millis)) / 1000,
+        'search_fetch_total' => stats_sum(%w(indices search fetch_total)),
+        'search_fetch_time' => stats_sum(%w(indices search fetch_time_in_millis)) / 1000,
+
+        'get_total' => stats_sum(%w(indices get total)),
+        'get_time' => stats_sum(%w(indices get time_in_millis)) / 1000,
+        'get_exists_total' => stats_sum(%w(indices get exists_total)),
+        'get_exists_time' => stats_sum(%w(indices get exists_time_in_millis)) / 1000,
+        'get_missing_total' => stats_sum(%w(indices get missing_total)),
+        'get_missing_time' => stats_sum(%w(indices get missing_time_in_millis)) / 1000,
+
+        'indexing_index_total' => stats_sum(%w(indices indexing index_total)),
+        'indexing_index_time' => stats_sum(%w(indices indexing index_time_in_millis)) / 1000,
+        'indexing_delete_total' => stats_sum(%w(indices indexing delete_total)),
+        'indexing_delete_time' => stats_sum(%w(indices indexing delete_time_in_millis)) / 1000,
+
+        'cache_filter_size' => stats_sum(%w(indices filter_cache memory_size_in_bytes)),
+        'cache_filter_evictions' => stats_sum(%w(indices filter_cache evictions)),
+        'cache_field_size' => stats_sum(%w(indices fielddata memory_size_in_bytes)),
+        'cache_field_evictions' => stats_sum(%w(indices fielddata evictions))
       }
     end
 
     private
 
     def connection
-      ElasticsearchClient.new({:host => [config['hostname'], config['port']].join(':')})
+      ElasticsearchClient.new(host: [config['hostname'], config['port']].join(':'))
     end
 
     def nodes_stats
-      connection.nodes.stats({:node_id => '_local'})
+      connection.nodes.stats(node_id: '_local')
     end
 
     def stats_sum(keys)
       sum = 0
-      (@stats ||= nodes_stats)['nodes'].each do |node, stats|
-        sum += keys.inject(stats) { |h, k| (h.is_a?(Hash) and !h[k].nil?) ? h[k] : 0 }
+      (@stats ||= nodes_stats)['nodes'].each do |_node, stats|
+        sum += keys.inject(stats) { |a, e| (a.is_a?(Hash) && !a[e].nil?) ? a[e] : 0 }
       end
       sum
     end
-
   end
 end