bipbip 0.6.7 → 0.6.8

data/lib/bipbip/plugin/network.rb

@@ -1,19 +1,17 @@
 module Bipbip
-
   class Plugin::Network < Plugin
-
     def metrics_schema
       [
-          {:name => 'connections_total', :type => 'gauge', :unit => 'Connections'},
+        { name: 'connections_total', type: 'gauge', unit: 'Connections' }
       ]
     end
 
     def monitor
       tcp_summary = `ss -s | grep '^TCP:'`
       tcp_counters = /^TCP:\s+(\d+) \(estab (\d+), closed (\d+), orphaned (\d+), synrecv (\d+), timewait (\d+)\/(\d+)\), ports (\d+)$/.match(tcp_summary)
-      raise "Cannot match ss-output `#{tcp_summary}`" unless tcp_counters
+      fail "Cannot match ss-output `#{tcp_summary}`" unless tcp_counters
 
-      {:connections_total => tcp_counters[1].to_i}
+      { connections_total: tcp_counters[1].to_i }
     end
   end
 end

data/lib/bipbip/plugin/nginx.rb

@@ -1,17 +1,15 @@
 module Bipbip
-
   class Plugin::Nginx < Plugin
-
     def metrics_schema
       [
-        {:name => 'connections_accepts', :type => 'counter', :unit => 'Connections'},
-        {:name => 'connections_handled', :type => 'counter', :unit => 'Connections'},
-        {:name => 'connections_dropped', :type => 'counter', :unit => 'Connections'},
-        {:name => 'connections_requests', :type => 'counter', :unit => 'Requests'},
-        {:name => 'active_total', :type => 'gauge', :unit => 'Connections'},
-        {:name => 'active_reading', :type => 'gauge', :unit => 'Connections'},
-        {:name => 'active_writing', :type => 'gauge', :unit => 'Connections'},
-        {:name => 'active_waiting', :type => 'gauge', :unit => 'Connections'},
+        { name: 'connections_accepts', type: 'counter', unit: 'Connections' },
+        { name: 'connections_handled', type: 'counter', unit: 'Connections' },
+        { name: 'connections_dropped', type: 'counter', unit: 'Connections' },
+        { name: 'connections_requests', type: 'counter', unit: 'Requests' },
+        { name: 'active_total', type: 'gauge', unit: 'Connections' },
+        { name: 'active_reading', type: 'gauge', unit: 'Connections' },
+        { name: 'active_writing', type: 'gauge', unit: 'Connections' },
+        { name: 'active_waiting', type: 'gauge', unit: 'Connections' }
       ]
     end
 
@@ -19,10 +17,10 @@ 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'
 
       lines = response.body.split(/\r*\n/)
-      lines.map { |line| line.strip! }
+      lines.map(&:strip!)
 
       data = {}
 
@@ -48,7 +46,7 @@ module Bipbip
     def match_or_fail(string, regexp)
       match_data = regexp.match(string)
       if match_data.nil?
-        raise "Data `#{string}` doesn't match pattern `#{regexp}`."
+        fail "Data `#{string}` doesn't match pattern `#{regexp}`."
       end
       match_data
     end

data/lib/bipbip/plugin/php_apc.rb

@@ -1,11 +1,9 @@
 module Bipbip
-
   class Plugin::PhpApc < Plugin
-
     def metrics_schema
       [
-          {:name => 'opcode_mem_size', :type => 'gauge', :unit => 'b'},
-          {:name => 'user_mem_size', :type => 'gauge', :unit => 'b'},
+        { name: 'opcode_mem_size', type: 'gauge', unit: 'b' },
+        { name: 'user_mem_size', type: 'gauge', unit: 'b' }
       ]
     end
 
@@ -13,11 +11,11 @@ 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'
 
       stats = JSON.parse(response.body)
 
-      {:opcode_mem_size => stats['opcode_mem_size'].to_i, :user_mem_size => stats['user_mem_size'].to_i}
+      { opcode_mem_size: stats['opcode_mem_size'].to_i, user_mem_size: stats['user_mem_size'].to_i }
     end
   end
 end

data/lib/bipbip/plugin/postfix.rb

@@ -1,17 +1,15 @@
 module Bipbip
-
   class Plugin::Postfix < Plugin
-
     def metrics_schema
       [
-          {:name => 'mails_queued_total', :type => 'gauge', :unit => 'Mails'},
+        { name: 'mails_queued_total', type: 'gauge', unit: 'Mails' }
       ]
     end
 
     def monitor
       queue_counter = /(\d+) Request+s?\.$/.match(postqueue)
       {
-          'mails_queued_total' => queue_counter.nil? ? 0 : queue_counter[1].to_i
+        'mails_queued_total' => queue_counter.nil? ? 0 : queue_counter[1].to_i
       }
     end
 

data/lib/bipbip/plugin/puppet.rb

@@ -2,21 +2,19 @@ require 'pathname'
 require 'yaml'
 
 module Bipbip
-
   class Plugin::Puppet < Plugin
-
     def metrics_schema
       [
-          {:name => 'report_ok', :type => 'gauge', :unit => 'Boolean'},
-          {:name => 'last_run_total_time', :type => 'gauge', :unit => 'Seconds'},
-          {:name => 'last_run_age', :type => 'gauge', :unit => 'Seconds'},
-          {:name => 'events_failure_count', :type => 'gauge', :unit => 'Events'},
-          {:name => 'events_success_count', :type => 'gauge', :unit => 'Events'},
-          {:name => 'events_total_count', :type => 'gauge', :unit => 'Events'},
-          {:name => 'resources_failed_count', :type => 'gauge', :unit => 'Resources'},
-          {:name => 'resources_skipped_count', :type => 'gauge', :unit => 'Resources'},
-          {:name => 'resources_total_count', :type => 'gauge', :unit => 'Resources'},
-          {:name => 'changes_total_count', :type => 'gauge', :unit => 'Changes'},
+        { name: 'report_ok', type: 'gauge', unit: 'Boolean' },
+        { name: 'last_run_total_time', type: 'gauge', unit: 'Seconds' },
+        { name: 'last_run_age', type: 'gauge', unit: 'Seconds' },
+        { name: 'events_failure_count', type: 'gauge', unit: 'Events' },
+        { name: 'events_success_count', type: 'gauge', unit: 'Events' },
+        { name: 'events_total_count', type: 'gauge', unit: 'Events' },
+        { name: 'resources_failed_count', type: 'gauge', unit: 'Resources' },
+        { name: 'resources_skipped_count', type: 'gauge', unit: 'Resources' },
+        { name: 'resources_total_count', type: 'gauge', unit: 'Resources' },
+        { name: 'changes_total_count', type: 'gauge', unit: 'Changes' }
       ]
     end
 
@@ -24,14 +22,14 @@ module Bipbip
       puppet_report = last_run_summary
 
       report_age = Time.new.to_i - puppet_report['time']['last_run'].to_i
-      has_events = puppet_report.has_key?('events')
-      has_resources = puppet_report.has_key?('resources')
-      has_changes = puppet_report.has_key?('changes')
+      has_events = puppet_report.key?('events')
+      has_resources = puppet_report.key?('resources')
+      has_changes = puppet_report.key?('changes')
 
       metrics = {
-          'report_ok' => ((has_events and has_changes and has_resources) ? 1 : 0),
-          'last_run_total_time' => puppet_report['time']['total'].to_i,
-          'last_run_age' => report_age,
+        'report_ok' => ((has_events && has_changes && has_resources) ? 1 : 0),
+        'last_run_total_time' => puppet_report['time']['total'].to_i,
+        'last_run_age' => report_age
       }
 
       if has_events

data/lib/bipbip/plugin/redis.rb

@@ -3,30 +3,28 @@ class RedisClient < Redis
 end
 
 module Bipbip
-
   class Plugin::Redis < Plugin
-
     def metrics_schema
       [
-          {:name => 'total_commands_processed', :type => 'counter', :unit => 'Commands'},
-          {:name => 'used_memory', :type => 'gauge', :unit => 'b'},
-          {:name => 'used_memory_rss', :type => 'gauge', :unit => 'b'},
-          {:name => 'mem_fragmentation_ratio', :type => 'gauge', :unit => 'Frag'},
-          {:name => 'connected_clients', :type => 'gauge', :unit => 'Clients'},
-          {:name => 'blocked_clients', :type => 'gauge', :unit => 'BlockedClients'},
+        { name: 'total_commands_processed', type: 'counter', unit: 'Commands' },
+        { name: 'used_memory', type: 'gauge', unit: 'b' },
+        { name: 'used_memory_rss', type: 'gauge', unit: 'b' },
+        { name: 'mem_fragmentation_ratio', type: 'gauge', unit: 'Frag' },
+        { name: 'connected_clients', type: 'gauge', unit: 'Clients' },
+        { name: 'blocked_clients', type: 'gauge', unit: 'BlockedClients' }
       ]
     end
 
     def float_roundings
       {
-          'mem_fragmentation_ratio' => 2
+        'mem_fragmentation_ratio' => 2
       }
     end
 
     def monitor
       redis = RedisClient.new(
-          :host => config['hostname'],
-          :port => config['port']
+        host: config['hostname'],
+        port: config['port']
       )
       stats = redis.info
       redis.quit

data/lib/bipbip/plugin/resque.rb

@@ -2,19 +2,18 @@ require 'redis'
 require 'resque'
 
 module Bipbip
-
   class Plugin::Resque < Plugin
-
     def metrics_schema
       schema_list = [
-          {:name => 'num_workers', :type => 'counter', :unit => 'Workers'},
-          {:name => 'num_idle_workers', :type => 'counter', :unit => 'Workers'},
-          {:name => 'num_active_workers', :type => 'counter', :unit => 'Workers'},
+        { name: 'num_workers', type: 'counter', unit: 'Workers' },
+        { name: 'num_idle_workers', type: 'counter', unit: 'Workers' },
+        { name: 'num_active_workers', type: 'counter', unit: 'Workers' },
+        { name: 'num_failures', type: 'counter', unit: 'Jobs' }
       ]
 
       with_resque_connection do
         ::Resque.queues.each do |queue|
-          schema_list << {:name => "queue_size_#{sanitize_queue_name(queue)}", :type => 'gauge', :unit => 'Jobs'}
+          schema_list << { name: "queue_size_#{sanitize_queue_name(queue)}", type: 'gauge', unit: 'Jobs' }
         end
       end
 
@@ -27,8 +26,8 @@ module Bipbip
 
     def with_resque_connection
       redis = ::Redis.new(
-          :host => config['hostname'] || 'localhost',
-          :port => config['port'] || 6369
+        host: config['hostname'] || 'localhost',
+        port: config['port'] || 6369
       )
       redis.select config['database']
       ::Resque.redis = redis
@@ -43,8 +42,9 @@ module Bipbip
       data = {}
       with_resque_connection do
         data['num_workers'] = ::Resque.workers.count
-        data['num_idle_workers'] = ::Resque.workers.select { |w| w.idle? }.count
+        data['num_idle_workers'] = ::Resque.workers.count(&:idle?)
         data['num_active_workers'] = data['num_workers'] - data['num_idle_workers']
+        data['num_failures'] = ::Resque::Failure.count
         ::Resque.queues.each do |queue|
           data["queue_size_#{sanitize_queue_name(queue)}"] = ::Resque.size(queue).to_i
         end

data/lib/bipbip/plugin/socket_redis.rb

@@ -1,21 +1,19 @@
 require 'net/http'
 
 module Bipbip
-
   class Plugin::SocketRedis < Plugin
-
     def metrics_schema
       [
-          {:name => 'channels_count', :type => 'gauge', :unit => 'Channels'},
-          {:name => 'subscribers_count', :type => 'gauge', :unit => 'Subscribers'},
+        { name: 'channels_count', type: 'gauge', unit: 'Channels' },
+        { name: 'subscribers_count', type: 'gauge', unit: 'Subscribers' }
       ]
     end
 
     def monitor
       stats = fetch_socket_redis_status
       {
-          'channels_count' => stats.length,
-          'subscribers_count' => stats.values.reduce(0) { |memo, channel| memo += channel['subscribers'].length },
+        'channels_count' => stats.length,
+        'subscribers_count' => stats.values.reduce(0) { |memo, channel| memo += channel['subscribers'].length }
       }
     end
 
@@ -26,10 +24,11 @@ module Bipbip
       uri = URI.parse(url)
 
       response = Net::HTTP.get_response(uri)
-      raise "Invalid response from server at `#{url}`. Response code `#{response.code}`, message `#{response.message}`, body `#{response.body}`" unless response.code == '200'
+      unless response.code == '200'
+        fail "Invalid response from server at `#{url}`. Response code `#{response.code}`, message `#{response.message}`, body `#{response.body}`"
+      end
 
       JSON.parse(response.body)
     end
-
   end
 end

data/lib/bipbip/storage.rb

@@ -1,13 +1,11 @@
 module Bipbip
-
   class Storage
-
     attr_accessor :name
     attr_accessor :config
 
     def self.factory(name, config)
       require "bipbip/storage/#{Bipbip::Helper.name_to_filename(name)}"
-      Storage::const_get(Bipbip::Helper.name_to_classname(name)).new(name, config)
+      Storage.const_get(Bipbip::Helper.name_to_classname(name)).new(name, config)
     end
 
     def initialize(name, config)
@@ -15,12 +13,12 @@ module Bipbip
       @config = config.to_hash
     end
 
-    def setup_plugin(plugin)
-      raise 'Missing method setup_plugin'
+    def setup_plugin(_plugin)
+      fail 'Missing method setup_plugin'
     end
 
-    def store_sample(plugin, time, data)
-      raise 'Missing method store_sample'
+    def store_sample(_plugin, _time, _data)
+      fail 'Missing method store_sample'
     end
 
     private
@@ -28,6 +26,5 @@ module Bipbip
     def log(severity, message)
       Bipbip.logger.add(severity, message, "#{name}")
     end
-
   end
 end

data/lib/bipbip/storage/copperegg.rb

@@ -1,7 +1,5 @@
 module Bipbip
-
   class Storage::Copperegg < Storage
-
     def initialize(name, config)
       super(name, config)
       ::Copperegg::Revealmetrics::Api.apikey = config['api_key']
@@ -12,7 +10,7 @@ module Bipbip
       @dashboards ||= _load_dashboards
       @tags ||= _load_tags
 
-      if ![5, 15, 60, 300, 900, 3600, 21600].include?(plugin.frequency)
+      unless [5, 15, 60, 300, 900, 3600, 21_600].include?(plugin.frequency)
         log(Logger::FATAL, "Cannot use frequency #{plugin.frequency}")
         exit 1
       end
@@ -20,14 +18,14 @@ module Bipbip
       metric_group = @metric_groups.detect { |m| m.name == plugin.metric_group }
       if metric_group.nil? || !metric_group.is_a?(::Copperegg::Revealmetrics::MetricGroup)
         log(Logger::INFO, "Creating metric group `#{plugin.metric_group}`")
-        metric_group = ::Copperegg::Revealmetrics::MetricGroup.new(:name => plugin.metric_group, :label => plugin.metric_group, :frequency => plugin.frequency)
+        metric_group = ::Copperegg::Revealmetrics::MetricGroup.new(name: plugin.metric_group, label: plugin.metric_group, frequency: plugin.frequency)
       end
       metric_group.frequency = plugin.frequency
       metric_group.metrics = plugin.metrics_schema.map do |sample|
         {
-          :name => sample[:name],
-          :type => 'ce_' + sample[:type],
-          :unit => sample[:unit],
+          name: sample[:name],
+          type: 'ce_' + sample[:type],
+          unit: sample[:unit]
         }
       end
       log(Logger::INFO, "Updating metric group `#{plugin.metric_group}`")
@@ -37,7 +35,7 @@ module Bipbip
         tag = @tags.detect { |t| t.name == tag_name }
         if tag.nil?
           log(Logger::INFO, "Creating tag `#{tag_name}`")
-          tag = ::Copperegg::Revealmetrics::Tag.new(:name => tag_name)
+          tag = ::Copperegg::Revealmetrics::Tag.new(name: tag_name)
         end
         object_identifier = plugin.source_identifier
         unless tag.objects.include?(object_identifier)
@@ -53,14 +51,14 @@ module Bipbip
       if dashboard.nil?
         log(Logger::INFO, "Creating dashboard `#{plugin.metric_group}`")
         metrics = metric_group.metrics || []
-        ::Copperegg::Revealmetrics::CustomDashboard.create(metric_group, :name => plugin.metric_group, :identifiers => nil, :metrics => metrics)
+        ::Copperegg::Revealmetrics::CustomDashboard.create(metric_group, name: plugin.metric_group, identifiers: nil, metrics: metrics)
       end
     end
 
     def store_sample(plugin, time, data)
       response = ::Copperegg::Revealmetrics::MetricSample.save(plugin.metric_group, plugin.source_identifier, time.to_i, data)
       if response.code != '200'
-        raise("Cannot store copperegg data `#{data}`. Response code `#{response.code}`, message `#{response.message}`, body `#{response.body}`")
+        fail("Cannot store copperegg data `#{data}`. Response code `#{response.code}`, message `#{response.message}`, body `#{response.body}`")
       end
     end
 
@@ -94,6 +92,5 @@ module Bipbip
       end
       tags
     end
-
   end
 end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.6.7'
+  VERSION = '0.6.8'
 end

data/lib/interruptible_sleep.rb

@@ -7,6 +7,6 @@ module InterruptibleSleep
   end
 
   def interrupt_sleep
-    @_sleep_interrupt.close if @_sleep_interrupt and !@_sleep_interrupt.closed?
+    @_sleep_interrupt.close if @_sleep_interrupt && !@_sleep_interrupt.closed?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg-revealmetrics
@@ -208,6 +208,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.21'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
 description: Agent to collect data for common server programs and push them to CopperEgg
 email: hello@cargomedia.ch
 executables:
@@ -269,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Gather services data and store in CopperEgg