bipbip 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f941fb989afaa352100d0f5abb6db11979061f1a
-  data.tar.gz: 02155b7336f3b851c825f35c7daa59c8f083e5fb
+  metadata.gz: 0b7777292e1ad5542031723e2560daf16236b60c
+  data.tar.gz: e377adebf53bc1b22624627dac1901dd056c3f6e
 SHA512:
-  metadata.gz: 7691f2ff5ec9333e7ad52b33261a9bf1815741dab78b4bbc560a1d867a16942156b890ab89869876f6f17d984a4397f056b7e29aac5e70bc0f3d3f406317e52e
-  data.tar.gz: 614662716ef0d44b25e17dd93a0274cfe2dac73fbc19c3d3546b6c7196930c9ecda70c6eed83e4dbf32780a6e790e94dd90e81a964da3a2afda6ee2f6787dbdd
+  metadata.gz: 08f7c9b3eb80606e59c7e323b140f7288cc72f5ec3bcb549fa63d2e9b93e01830aeabf5883eb0a67af4be9ce5e7da4c68e341ea1c03338568cf884bb8838b19a
+  data.tar.gz: 21cec67eb92bf830b11e30f63a987121e06d1c77b9da182c1558a75c80ec9e00cf85aba6e4ffad5859aee5e2ff1289714c67a21b0f9dea13a2ff4d00b33829c0

data/lib/bipbip/plugin/gearman.rb

@@ -1,20 +1,28 @@
 require 'gearman/server'
+require 'mysql2'
 class GearmanServer < Gearman::Server
 end
 
 module Bipbip
   class Plugin::Gearman < Plugin
+    PRIORITY_LOW = 0
+    PRIORITY_NORMAL = 1
+    PRIORITY_HIGH = 2
+
     def metrics_schema
       [
         { name: 'jobs_queued_total', type: 'gauge', unit: 'Jobs' },
         { name: 'jobs_active_total', type: 'gauge', unit: 'Jobs' },
-        { name: 'jobs_waiting_total', type: 'gauge', unit: 'Jobs' }
+        { name: 'jobs_waiting_total', type: 'gauge', unit: 'Jobs' },
+
+        { name: 'jobs_queued_total_low', type: 'gauge', unit: 'Jobs' },
+        { name: 'jobs_queued_total_normal', type: 'gauge', unit: 'Jobs' },
+        { name: 'jobs_queued_total_high', type: 'gauge', unit: 'Jobs' }
       ]
     end
 
     def monitor
-      gearman = GearmanServer.new(config['hostname'] + ':' + config['port'].to_s)
-      stats = gearman.status
+      stats = _fetch_gearman_status
 
       jobs_queued_total = 0
       jobs_active_total = 0
@@ -23,11 +31,46 @@ module Bipbip
         jobs_active_total += data[:active].to_i
       end
 
+      priority_stats = {}
+      if config['persistence'] == 'mysql'
+        stats = _fetch_mysql_priority_stats(config)
+        priority_stats = {
+          jobs_queued_total_low: stats[PRIORITY_LOW],
+          jobs_queued_total_normal: stats[PRIORITY_NORMAL],
+          jobs_queued_total_high: stats[PRIORITY_HIGH]
+        }
+      end
+
       {
         jobs_queued_total: jobs_queued_total,
         jobs_active_total: jobs_active_total,
         jobs_waiting_total: (jobs_queued_total - jobs_active_total)
-      }
+      }.merge(priority_stats)
+    end
+
+    private
+
+    def _fetch_gearman_status
+      gearman = GearmanServer.new(config['hostname'] + ':' + config['port'].to_s)
+      gearman.status
+    end
+
+    def _fetch_mysql_priority_stats(config)
+      mysql = Mysql2::Client.new(
+        host: config['mysql_hostname'] || 'localhost',
+        port: config['mysql_port'] || 3306,
+        username: config['mysql_username'] || nil,
+        password: config['mysql_password'] || nil,
+        database: config['mysql_database'] || 'gearman'
+      )
+
+      stats = Hash.new(0)
+
+      mysql.query('SELECT priority, count(priority) as jobs_count FROM gearman_queue GROUP by priority').each do |row|
+        stats[row['priority']] = row['jobs_count']
+      end
+
+      stats
     end
   end
 end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.7.7'.freeze
+  VERSION = '0.7.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg-revealmetrics
@@ -343,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Gather services data and store in CopperEgg