bipbip 0.5.17 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7795f64525735eeb9f518150c09193ef6c91509d
-  data.tar.gz: dfbe46387b11a91abdef6b93c9dd096b48304d84
+  metadata.gz: 07a183a1ec6d671c1fd72f5874607a68a7799408
+  data.tar.gz: 15e9ab0331b98776ac0fdba6c7cd7c5838dddc80
 SHA512:
-  metadata.gz: 54e3d5901fbf47de34be5b00e6d4f88b3bb50c78f1816ba4b91d2d9f7d2444fd59907dbc4290a3f129dc54ca9387dab143d654d3443e3326cbb4a55ba2bef8c6
-  data.tar.gz: 2e4972fdf1001ed8c0ff46391aa280f1bbe1abac6af87edb836f45c84d17ae0fda83ce9f868e1641b485ffe34fe289ca100755b6876834f7c2ff56d2dea21a2e
+  metadata.gz: 686f19d252febc67ac1d5592211c277da737b464c3c645ca56b709aac7fff7efc435593b9005d6e3d323ecf45499efde172e99e548f9e5640e753183f5e862af
+  data.tar.gz: f0933411816db888b9a6aa249efa69b1bd68c07e6da36f49326f26c4d7a0ad7048201763b42d0a7772b1a9f069bdb1fcd673fcbba343b4e564279fabe66b115d

data/lib/bipbip/plugin/mongodb.rb

@@ -22,6 +22,7 @@ module Bipbip
           {: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,8 +65,9 @@ module Bipbip
         data['replication_lag'] = replication_lag
       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_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_max'] = slow_queries_status['max']['time']
 
       data
     end
@@ -113,24 +115,29 @@ module Bipbip
       database_names_ignore = ['admin', 'system']
       database_list = (mongodb_client.database_names - database_names_ignore).map { |name| mongodb_database(name) }
 
-      stats = database_list.reduce({'total_count' => 0, 'total_time' => 0}) do |memo, database|
+      stats = database_list.reduce({'total' => {'count' => 0, 'time' => 0}, 'max' => {'time' => 0}}) do |memo, database|
 
         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'}}}
+                {'$group' => {'_id' => 'null', 'total_count' => {'$sum' => 1}, 'total_time' => {'$sum' => '$millis'}, 'max_time' => {'$max' => '$millis'}}}
             ])
 
         unless results.empty?
           result = results.pop
-          memo['total_count'] += result['total_count']
-          memo['total_time'] += result['total_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['max']['time'] = max_time if memo['max']['time'] < max_time
         end
 
         memo
       end
 
-      stats.each { |metric, value| stats[metric] = value/time_period }
+      stats['total'].each { |metric, value| stats['total'][metric] = value/time_period }
+
+      stats
     end
 
     def replication_lag

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.5.17'
+  VERSION = '0.5.18'
 end

metadata

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