bipbip 0.6.7 → 0.6.8

data/lib/bipbip/plugin/fastcgi_php_apc.rb

@@ -1,11 +1,9 @@
 module Bipbip
-
   class Plugin::FastcgiPhpApc < 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
 
@@ -21,10 +19,10 @@ module Bipbip
       ENV.replace(env_backup)
 
       body = response.split(/\r?\n\r?\n/)[1]
-      raise "FastCGI response has no body: #{response}" unless body
+      fail "FastCGI response has no body: #{response}" unless body
       stats = JSON.parse(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/fastcgi_php_fpm.rb

@@ -1,12 +1,10 @@
 module Bipbip
-
   class Plugin::FastcgiPhpFpm < Plugin
-
     def metrics_schema
       [
-          {:name => 'accepted conn', :type => 'counter', :unit => 'Connections'},
-          {:name => 'listen queue', :type => 'gauge', :unit => 'Connections'},
-          {:name => 'active processes', :type => 'gauge', :unit => 'Processes'},
+        { name: 'accepted conn', type: 'counter', unit: 'Connections' },
+        { name: 'listen queue', type: 'gauge', unit: 'Connections' },
+        { name: 'active processes', type: 'gauge', unit: 'Processes' }
       ]
     end
 
@@ -23,10 +21,10 @@ module Bipbip
       ENV.replace(env_backup)
 
       body = response.split(/\r?\n\r?\n/)[1]
-      raise "FastCGI response has no body: #{response}" unless body
+      fail "FastCGI response has no body: #{response}" unless body
       status = JSON.parse(body)
 
-      status.reject{|k, v| !metrics_names.include?(k)}
+      status.reject { |k, _v| !metrics_names.include?(k) }
     end
   end
 end

data/lib/bipbip/plugin/fastcgi_php_opcache.rb

@@ -1,16 +1,14 @@
 module Bipbip
-
   class Plugin::FastcgiPhpOpcache < Plugin
-
     def metrics_schema
       [
-          {:name => 'free_memory', :type => 'gauge', :unit => 'b'},
-          {:name => 'current_wasted_percentage', :type => 'gauge', :unit => '%'},
-          {:name => 'num_cached_keys', :type => 'gauge', :unit => 'Keys'},
-          {:name => 'hit_rate', :type => 'gauge', :unit => '%'},
-          {:name => 'misses', :type => 'counter', :unit => 'Misses'},
-          {:name => 'hits', :type => 'counter', :unit => 'Hits'},
-          {:name => 'oom_restarts', :type => 'counter', :unit => 'Restarts'},
+        { name: 'free_memory', type: 'gauge', unit: 'b' },
+        { name: 'current_wasted_percentage', type: 'gauge', unit: '%' },
+        { name: 'num_cached_keys', type: 'gauge', unit: 'Keys' },
+        { name: 'hit_rate', type: 'gauge', unit: '%' },
+        { name: 'misses', type: 'counter', unit: 'Misses' },
+        { name: 'hits', type: 'counter', unit: 'Hits' },
+        { name: 'oom_restarts', type: 'counter', unit: 'Restarts' }
       ]
     end
 
@@ -26,7 +24,7 @@ module Bipbip
       ENV.replace(env_backup)
 
       body = response.split(/\r?\n\r?\n/)[1]
-      raise "FastCGI response has no body: #{response}" unless body
+      fail "FastCGI response has no body: #{response}" unless body
       stats = JSON.parse(body)
       @data_previous ||= stats
 
@@ -36,13 +34,13 @@ module Bipbip
 
       @data_previous = stats
       {
-          :free_memory => stats_memory['free_memory'].to_i,
-          :current_wasted_percentage => stats_memory['current_wasted_percentage'].to_i,
-          :num_cached_keys => stats_statistics['num_cached_keys'].to_i,
-          :hit_rate => hit_rate,
-          :misses => stats_statistics['misses'].to_i,
-          :hits => stats_statistics['hits'].to_i,
-          :oom_restarts => stats_statistics['oom_restarts'].to_i,
+        free_memory: stats_memory['free_memory'].to_i,
+        current_wasted_percentage: stats_memory['current_wasted_percentage'].to_i,
+        num_cached_keys: stats_statistics['num_cached_keys'].to_i,
+        hit_rate: hit_rate,
+        misses: stats_statistics['misses'].to_i,
+        hits: stats_statistics['hits'].to_i,
+        oom_restarts: stats_statistics['oom_restarts'].to_i
       }
     end
 

data/lib/bipbip/plugin/gearman.rb

@@ -3,12 +3,10 @@ class GearmanServer < Gearman::Server
 end
 
 module Bipbip
-
   class Plugin::Gearman < Plugin
-
     def metrics_schema
       [
-          {:name => 'jobs_queued_total', :type => 'gauge', :unit => 'Jobs'},
+        { name: 'jobs_queued_total', type: 'gauge', unit: 'Jobs' }
       ]
     end
 
@@ -17,13 +15,13 @@ module Bipbip
       stats = gearman.status
 
       jobs_queued_total = 0
-      stats.each do |function_name, data|
-        data.each do |queue, stats|
+      stats.each do |_function_name, data|
+        data.each do |queue, _stats|
           jobs_queued_total += queue.to_i
         end
       end
 
-      {:jobs_queued_total => jobs_queued_total}
+      { jobs_queued_total: jobs_queued_total }
     end
   end
 end

data/lib/bipbip/plugin/log_parser.rb

@@ -1,12 +1,10 @@
 require 'rb-inotify'
 
 module Bipbip
-
   class Plugin::LogParser < Plugin
-
     def metrics_schema
       config['matchers'].map do |matcher|
-        {:name => matcher['name'], :type => 'gauge', :unit => 'Boolean'}
+        { name: matcher['name'], type: 'gauge', unit: 'Boolean' }
       end
     end
 
@@ -14,7 +12,7 @@ module Bipbip
       begin
         io = IO.select([notifier.to_io], [], [], 0)
       rescue Errno::EBADF => e
-        log(Logger::WARN, "Selecting from inotify IO gives EBADF, resetting notifier")
+        log(Logger::WARN, 'Selecting from inotify IO gives EBADF, resetting notifier')
         reset_notifier
       end
 
@@ -35,7 +33,7 @@ module Bipbip
         config['matchers'].map do |matcher|
           name = matcher['name']
           regexp = Regexp.new(matcher['regexp'])
-          value = lines.reject { |line| line.match(regexp).nil? }.length
+          value = lines.count { |line| !line.match(regexp).nil? }
           [name, value]
         end
       ]
@@ -46,7 +44,7 @@ module Bipbip
     def notifier
       if @notifier.nil?
         file_stat = File.stat(config['path'])
-        raise "Cannot read file `#{config['path']}`" unless file_stat.readable?
+        fail "Cannot read file `#{config['path']}`" unless file_stat.readable?
         @lines = []
         @size = file_stat.size
         @notifier = create_notifier
@@ -70,15 +68,14 @@ module Bipbip
     end
 
     def reset_notifier
-      unless @notifier.nil?
-        @notifier.stop
-        begin
-          @notifier.close
-        rescue SystemCallError => e
-          log(Logger::WARN, "Cannot close notifier: `#{e.message}`")
-        end
-        @notifier = nil
+      return if @notifier.nil?
+      @notifier.stop
+      begin
+        @notifier.close
+      rescue SystemCallError => e
+        log(Logger::WARN, "Cannot close notifier: `#{e.message}`")
       end
+      @notifier = nil
     end
 
     def roll_file
@@ -90,6 +87,5 @@ module Bipbip
       end
       file.close
     end
-
   end
 end

data/lib/bipbip/plugin/memcached.rb

@@ -3,16 +3,14 @@ class MemcachedClient < Memcached
 end
 
 module Bipbip
-
   class Plugin::Memcached < Plugin
-
     def metrics_schema
       [
-          {:name => 'cmd_get', :type => 'counter'},
-          {:name => 'cmd_set', :type => 'counter'},
-          {:name => 'get_misses', :type => 'counter'},
-          {:name => 'bytes', :type => 'gauge', :unit => 'b'},
-          {:name => 'evictions', :type => 'counter'},
+        { name: 'cmd_get', type: 'counter' },
+        { name: 'cmd_set', type: 'counter' },
+        { name: 'get_misses', type: 'counter' },
+        { name: 'bytes', type: 'gauge', unit: 'b' },
+        { name: 'evictions', type: 'counter' }
       ]
     end
 

data/lib/bipbip/plugin/mongodb.rb

@@ -1,28 +1,26 @@
 require 'mongo'
 
 module Bipbip
-
   class Plugin::Mongodb < Plugin
-
     def metrics_schema
       [
-          {:name => 'flushing_last_ms', :type => 'gauge', :unit => 'ms'},
-          {:name => 'btree_misses', :type => 'gauge', :unit => 'misses'},
-          {:name => 'op_inserts', :type => 'counter'},
-          {:name => 'op_queries', :type => 'counter'},
-          {:name => 'op_updates', :type => 'counter'},
-          {:name => 'op_deletes', :type => 'counter'},
-          {:name => 'op_getmores', :type => 'counter'},
-          {:name => 'op_commands', :type => 'counter'},
-          {:name => 'connections_current', :type => 'gauge'},
-          {:name => 'mem_resident', :type => 'gauge', :unit => 'MB'},
-          {:name => 'mem_mapped', :type => 'gauge', :unit => 'MB'},
-          {:name => 'mem_pagefaults', :type => 'counter', :unit => 'faults'},
-          {:name => 'globalLock_currentQueue', :type => 'gauge'},
-          {:name => 'replication_lag', :type => 'gauge', :unit => 'Seconds'},
-          {:name => 'slow_queries_count', :type => 'gauge_f', :unit => 'Queries'},
-          {:name => 'slow_queries_time_avg', :type => 'gauge_f', :unit => 'Seconds'},
-          {:name => 'slow_queries_time_max', :type => 'gauge_f', :unit => 'Seconds'},
+        { name: 'flushing_last_ms', type: 'gauge', unit: 'ms' },
+        { name: 'btree_misses', type: 'gauge', unit: 'misses' },
+        { name: 'op_inserts', type: 'counter' },
+        { name: 'op_queries', type: 'counter' },
+        { name: 'op_updates', type: 'counter' },
+        { name: 'op_deletes', type: 'counter' },
+        { name: 'op_getmores', type: 'counter' },
+        { name: 'op_commands', type: 'counter' },
+        { name: 'connections_current', type: 'gauge' },
+        { name: 'mem_resident', type: 'gauge', unit: 'MB' },
+        { name: 'mem_mapped', type: 'gauge', unit: 'MB' },
+        { name: 'mem_pagefaults', type: 'counter', unit: 'faults' },
+        { name: 'globalLock_currentQueue', type: 'gauge' },
+        { name: 'replication_lag', type: 'gauge', unit: 'Seconds' },
+        { name: 'slow_queries_count', type: 'gauge_f', unit: 'Queries' },
+        { name: 'slow_queries_time_avg', type: 'gauge_f', unit: 'Seconds' },
+        { name: 'slow_queries_time_max', type: 'gauge_f', unit: 'Seconds' }
       ]
     end
 
@@ -64,7 +62,7 @@ module Bipbip
       end
 
       data['slow_queries_count'] = slow_queries_status['total']['count']
-      data['slow_queries_time_avg'] = slow_queries_status['total']['count'] > 0 ? (slow_queries_status['total']['time'].to_f/slow_queries_status['total']['count'].to_f) : 0
+      data['slow_queries_time_avg'] = slow_queries_status['total']['time'].to_f / (slow_queries_status['total']['count'].to_f.nonzero? || 1)
       data['slow_queries_time_max'] = slow_queries_status['max']['time']
 
       data
@@ -79,10 +77,10 @@ module Bipbip
     # @return [Mongo::Client]
     def mongodb_client
       options = {
-          'hostname' => 'localhost',
-          'port' => 27017,
+        'hostname' => 'localhost',
+        'port' => 27_017
       }.merge(config)
-      @mongodb_client ||= Mongo::Client.new([options['hostname'] + ':' + options['port'].to_s], :socket_timeout => 2, :slave_ok => true)
+      @mongodb_client ||= Mongo::Client.new([options['hostname'] + ':' + options['port'].to_s], socket_timeout: 2, slave_ok: true)
     end
 
     # @return [Mongo::DB]
@@ -109,30 +107,34 @@ module Bipbip
       timestamp_last_check = slow_query_last_check
       time_period = Time.now - timestamp_last_check
 
-      database_names_ignore = ['admin', 'system', 'local']
+      database_names_ignore = %w(admin system local)
       database_list = (mongodb_client.database_names - database_names_ignore).map { |name| mongodb_database(name) }
 
-      stats = database_list.reduce({'total' => {'count' => 0, 'time' => 0}, 'max' => {'time' => 0}}) do |memo, database|
-
+      stats = database_list.reduce('total' => { 'count' => 0, 'time' => 0 }, 'max' => { 'time' => 0 }) do |memo, database|
         results = database['system.profile'].find.aggregate(
-            [
-                {'$match' => {'millis' => {'$gte' => slow_query_threshold}, 'ts' => {'$gt' => timestamp_last_check}}},
-                {'$group' => {'_id' => 'null', 'total_count' => {'$sum' => 1}, 'total_time' => {'$sum' => '$millis'}, 'max_time' => {'$max' => '$millis'}}}
-            ])
+          [
+            { '$match' => { 'millis' => { '$gte' => slow_query_threshold }, 'ts' => { '$gt' => timestamp_last_check } } },
+            { '$group' => {
+              '_id' => 'null',
+              'total_count' => { '$sum' => 1 },
+              'total_time' => { '$sum' => '$millis' },
+              'max_time' => { '$max' => '$millis' }
+            } }
+          ])
 
         unless results.count == 0
           result = results.first
-          max_time = result['max_time'].to_f/1000
+          max_time = result['max_time'].to_f / 1000
 
           memo['total']['count'] += result['total_count']
-          memo['total']['time'] += result['total_time'].to_f/1000
+          memo['total']['time'] += result['total_time'].to_f / 1000
           memo['max']['time'] = max_time if memo['max']['time'] < max_time
         end
 
         memo
       end
 
-      stats['total'].each { |metric, value| stats['total'][metric] = value/time_period }
+      stats['total'].each { |metric, value| stats['total'][metric] = value / time_period }
 
       stats
     end
@@ -140,11 +142,11 @@ module Bipbip
     def replication_lag
       status = fetch_replica_status
       member_list = status['members']
-      primary = member_list.select { |member| member['stateStr'] == 'PRIMARY' }.first
-      secondary = member_list.select { |member| member['stateStr'] == 'SECONDARY' and member['self'] == true }.first
+      primary = member_list.find { |member| member['stateStr'] == 'PRIMARY' }
+      secondary = member_list.find { |member| member['stateStr'] == 'SECONDARY' && member['self'] == true }
 
-      raise "No primary member in replica `#{status['set']}`" if primary.nil?
-      raise "Cannot find itself as secondary member in replica `#{status['set']}`" if secondary.nil?
+      fail "No primary member in replica `#{status['set']}`" if primary.nil?
+      fail "Cannot find itself as secondary member in replica `#{status['set']}`" if secondary.nil?
 
       (secondary['optime'].seconds - primary['optime'].seconds)
     end

data/lib/bipbip/plugin/monit.rb

@@ -1,9 +1,7 @@
 require 'monit'
 
 module Bipbip
-
   class Plugin::Monit < Plugin
-
     # See https://bitbucket.org/tildeslash/monit/src/d60968cf7972cc902e5b6e2961d44456e1d9b736/src/monit.h?at=master#monit.h-145
     STATE_FAILED = '1'
 
@@ -12,27 +10,28 @@ module Bipbip
 
     def metrics_schema
       [
-          {:name => 'Running', :type => 'gauge', :unit => 'Boolean'},
-          {:name => 'All_Services_ok', :type => 'gauge', :unit => 'Boolean'},
+        { name: 'Running', type: 'gauge', unit: 'Boolean' },
+        { name: 'All_Services_ok', type: 'gauge', unit: 'Boolean' }
       ]
     end
 
     def monitor
-      status =  ::Monit::Status.new({
-        :host => 'localhost',
-        :port => 2812,
-        :ssl => false,
-        :auth => false,
-        :username => nil,
-        :password => nil,
+      status = ::Monit::Status.new({
+        host: 'localhost',
+        port: 2812,
+        ssl: false,
+        auth: false,
+        username: nil,
+        password: nil
       }.merge(config))
 
       data = Hash.new(0)
 
       begin
         data['Running'] = status.get ? 1 : 0
-        data['All_Services_ok'] = status.services.any? { |service|
-          service.monitor == MONITOR_NOT || service.status == STATE_FAILED } ? 0 : 1
+        data['All_Services_ok'] = status.services.any? do |service|
+          service.monitor == MONITOR_NOT || service.status == STATE_FAILED
+        end ? 0 : 1
       rescue
         data['Running'] = 0
         data['All_Services_ok'] = 0

data/lib/bipbip/plugin/mysql.rb

@@ -1,43 +1,41 @@
 require 'mysql2'
 
 module Bipbip
-
   class Plugin::Mysql < Plugin
-
     def metrics_schema
       [
-          {:name => 'Max_used_connections', :type => 'gauge', :unit => 'Connections'},
-          {:name => 'Connections', :type => 'counter', :unit => 'Connections'},
-          {:name => 'Threads_connected', :type => 'gauge', :unit => 'Threads'},
+        { name: 'Max_used_connections', type: 'gauge', unit: 'Connections' },
+        { name: 'Connections', type: 'counter', unit: 'Connections' },
+        { name: 'Threads_connected', type: 'gauge', unit: 'Threads' },
 
-          {:name => 'Slave_running', :type => 'gauge', :unit => 'Boolean'},
-          {:name => 'Seconds_Behind_Master', :type => 'gauge', :unit => 'Seconds'},
+        { name: 'Slave_running', type: 'gauge', unit: 'Boolean' },
+        { name: 'Seconds_Behind_Master', type: 'gauge', unit: 'Seconds' },
 
-          {:name => 'Created_tmp_disk_tables', :type => 'counter', :unit => 'Tables'},
+        { name: 'Created_tmp_disk_tables', type: 'counter', unit: 'Tables' },
 
-          {:name => 'Queries', :type => 'counter', :unit => 'Queries'},
-          {:name => 'Slow_queries', :type => 'counter', :unit => 'Queries'},
+        { name: 'Queries', type: 'counter', unit: 'Queries' },
+        { name: 'Slow_queries', type: 'counter', unit: 'Queries' },
 
-          {:name => 'Table_locks_immediate', :type => 'counter', :unit => 'Locks'},
-          {:name => 'Table_locks_waited', :type => 'counter', :unit => 'Locks'},
+        { name: 'Table_locks_immediate', type: 'counter', unit: 'Locks' },
+        { name: 'Table_locks_waited', type: 'counter', unit: 'Locks' },
 
-          {:name => 'Processlist', :type => 'gauge', :unit => 'Processes'},
-          {:name => 'Processlist_Locked', :type => 'gauge', :unit => 'Processes'},
+        { name: 'Processlist', type: 'gauge', unit: 'Processes' },
+        { name: 'Processlist_Locked', type: 'gauge', unit: 'Processes' },
 
-          {:name => 'Com_select', :type => 'counter', :unit => 'Commands'},
-          {:name => 'Com_delete', :type => 'counter', :unit => 'Commands'},
-          {:name => 'Com_insert', :type => 'counter', :unit => 'Commands'},
-          {:name => 'Com_update', :type => 'counter', :unit => 'Commands'},
-          {:name => 'Com_replace', :type => 'counter', :unit => 'Commands'},
+        { name: 'Com_select', type: 'counter', unit: 'Commands' },
+        { name: 'Com_delete', type: 'counter', unit: 'Commands' },
+        { name: 'Com_insert', type: 'counter', unit: 'Commands' },
+        { name: 'Com_update', type: 'counter', unit: 'Commands' },
+        { name: 'Com_replace', type: 'counter', unit: 'Commands' }
       ]
     end
 
     def monitor
       mysql = Mysql2::Client.new(
-          :host => config['hostname'],
-          :port => config['port'],
-          :username => config['username'],
-          :password => config['password']
+        host: config['hostname'],
+        port: config['port'],
+        username: config['username'],
+        password: config['password']
       )
 
       stats = Hash.new(0)