cloudscopes 0.9.4 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8e79c10c554db17ad3b0862288bcde96c7f61a3
-  data.tar.gz: 6df2095203efca877fe1091d254ff7016319bbc5
+  metadata.gz: ada32353df538d7e72569a50d31b5974adbbe8a9
+  data.tar.gz: e61a1366946ba68aa44fa829eca02323829c1fbe
 SHA512:
-  metadata.gz: d0a4ff5deb6aefd4887bd32658956047e3078b2f24984c08758369e414c8fb6b8173f6716fcd28e623c3ff1963eaa6597307f116849a7c6628380e0ec5282c9a
-  data.tar.gz: 99d4bb235f44ad5103b24382fb7482b59deadda663a237108f49940f50c1fba4bbc801d90770fa4dac33f028cd387d9ccd299563f63411ebfb45f8fb8e24c9e6
+  metadata.gz: 8b43bb5e42ed3074aba77fa6bab03674f52b5654c33fdb6bc63176c0d71c552c201aaeeaebd63b41c8f951893c18d89ac1a915a9da4389ecbbdda5b699299930
+  data.tar.gz: 638a56d9681f519a284c70208cbe1f230e4c7959ef7f825eb7aca86d262957d364e4f428202bcff07d647e9198fb15f15fcccf269743f9662e302beec253fd01

data/bin/cloudscopes-setup

@@ -3,5 +3,6 @@
 require 'fileutils'
 
 basedir = File.expand_path(File.dirname(__FILE__) + "/..")
+FileUtils.mkdir_p '/etc/cloudscopes/monitor.d'
 FileUtils.cp "#{basedir}/config/cron.config", '/etc/cron.d/cloudscopes-monitoring'
-FileUtils.cp "#{basedir}/config/monitoring.yaml", '/etc/cloudscopes-monitoring.yaml'
+FileUtils.cp "#{basedir}/config/monitoring.yaml", '/etc/cloudscopes/monitor.conf'

data/config/cron.config

@@ -1,2 +1,2 @@
 PATH=$PATH:/usr/local/bin
-*/1 * * * *	root cloudscopes-monitor /etc/cloudscopes-monitoring.yaml
+*/1 * * * *	root cloudscopes-monitor /etc/cloudscopes/monitor.conf

data/config/monitoring.yaml

@@ -1,4 +1,6 @@
 settings:
+  configdir: /etc/cloudscopes/monitor.d
+  interval: 60
   provider: cloudwatch
   key: AWS_KEY_ID 
   secret: AWS_SECRET_KEY

data/lib/cloudscopes/redis.rb

@@ -20,6 +20,17 @@ module Cloudscopes
       end.reduce(0,:+)
     end
     
+    def resque_workers(queue, activity = nil)
+      case activity
+      when :active
+        @redis.keys('resque:worker:*:processing_queue').count
+      when :inactive
+        resque_workers(queue, :available) - resque_workers(queue, :active)
+      else
+        @redis.keys('resque:worker:*:processing_queue:started').count
+      end
+    end
+    
     def resques(pattern)
       @redis.smembers("resque:queues").grep(pattern)
     end

data/lib/cloudscopes/version.rb

@@ -1,3 +1,3 @@
 module Cloudscopes
-  VERSION = "0.9.4"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudscopes
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors:
 - Oded Arbel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby gem to report system statistics to web based monitoring services such