bipbip 0.5.14 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 297ab31c33a70036e4877f4b5b44d47acdbc9a32
-  data.tar.gz: f48f374bb3cd80e87ab5ece81c99ced7b7c2211a
+  metadata.gz: ddfc3ddd44eded3569a8967a2ee2afbab46d874a
+  data.tar.gz: 97bc00b753c876da95ab4f1c0ebe4516a3409c4d
 SHA512:
-  metadata.gz: 4acccd584041353c38d5e234836474d9fcc44b218b2582fc06ee0d5b6ade33d0f78cf11a14a67e1470988ad4fcbdd18b211f3f0f561a12bf04a0300b8e8560b0
-  data.tar.gz: e971c88b6ab120a8f20be1d44759f71b1fab52c4f039a14bc315891e24a82b674fa42f5ae339a1a2b52bd823e6ac0e5d1c741d1bad0cda1258a81e7895c84030
+  metadata.gz: 35561804f688ee6fb08154151c28b00c28e14b8885a0751c46909bcac5da4e5cfa9c7c79be1b9079dff8e214088cf92aed4e3b3db28cac37d65ebffd25c7a593
+  data.tar.gz: c25eb8bb521915d0a4afb6394b4bb75fe554d8b067263f95e322b62862111a8527d15ee8630a50c77d00fb05167c0f9fa9eec3ef808aa701ae4bd349c27245e8

data/lib/bipbip/plugin/mongodb.rb

@@ -20,7 +20,8 @@ module Bipbip
           {:name => 'mem_pagefaults', :type => 'counter', :unit => 'faults'},
           {:name => 'globalLock_currentQueue', :type => 'gauge'},
           {:name => 'replication_lag', :type => 'gauge', :unit => 'Seconds'},
-          {:name => 'slow_queries', :type => 'gauge', :unit => 'Queries'},
+          {:name => 'slow_queries_count', :type => 'gauge', :unit => 'Queries'},
+          {:name => 'slow_queries_time_avg', :type => 'gauge', :unit => 'Seconds'},
       ]
     end
 
@@ -28,6 +29,7 @@ module Bipbip
       @mongodb_client = nil
 
       status = fetch_server_status
+      slow_queries_status = fetch_slow_queries_status
 
       data = {}
 
@@ -62,7 +64,8 @@ module Bipbip
         data['replication_lag'] = replication_lag
       end
 
-      data['slow_queries'] = calculate_slow_queries
+      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
     end
@@ -103,20 +106,31 @@ module Bipbip
       old
     end
 
-    def calculate_slow_queries
+    def fetch_slow_queries_status
       timestamp_last_check = slow_query_last_check
+      time_period = Time.now - timestamp_last_check
 
-      slow_queries = fetch_slow_queries_count(slow_query_threshold, timestamp_last_check)
+      database_names_ignore = ['admin', 'system']
+      database_list = (mongodb_client.database_names - database_names_ignore).map { |name| mongodb_database(name) }
 
-      (slow_queries/(Time.now - timestamp_last_check)).to_i
-    end
+      stats = database_list.reduce({'total_count' => 0, 'total_time' => 0}) do |memo, database|
 
-    def fetch_slow_queries_count(millis_min, ts_min)
-      query = {'millis' => {'$gte' => millis_min}, 'ts' => {'$gte' => ts_min}}
-      database_names_ignore = ['admin', 'system']
+        results = database.collection('system.profile').aggregate(
+            [
+                {'$match' => {'millis' => {'$gte' => slow_query_threshold}, 'ts' => {'$gt' => timestamp_last_check}}},
+                {'$group' => {'_id' => 'null', 'total_count' => {'$sum' => 1}, 'total_time' => {'$sum' => '$millis'}}}
+            ])
 
-      database_list = (mongodb_client.database_names - database_names_ignore).map { |name| mongodb_database(name) }
-      database_list.reduce(0) { |memo, database| memo + database.collection('system.profile').count({:query => query}) }
+        unless results.empty?
+          result = results.pop
+          memo['total_count'] += result['total_count']
+          memo['total_time'] += result['total_time'].to_f/1000
+        end
+
+        memo
+      end
+
+      stats.each { |metric, value| stats[metric] = value/time_period }
     end
 
     def replication_lag

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.5.14'
+  VERSION = '0.5.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg