cloudscopes 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ada32353df538d7e72569a50d31b5974adbbe8a9
-  data.tar.gz: e61a1366946ba68aa44fa829eca02323829c1fbe
+  metadata.gz: 12c28cff3b08f8a0d599ae7442e5480b0e5f9207
+  data.tar.gz: 449205b5ca33523bc9e860fa47268304de8b7e50
 SHA512:
-  metadata.gz: 8b43bb5e42ed3074aba77fa6bab03674f52b5654c33fdb6bc63176c0d71c552c201aaeeaebd63b41c8f951893c18d89ac1a915a9da4389ecbbdda5b699299930
-  data.tar.gz: 638a56d9681f519a284c70208cbe1f230e4c7959ef7f825eb7aca86d262957d364e4f428202bcff07d647e9198fb15f15fcccf269743f9662e302beec253fd01
+  metadata.gz: fac53ad9837c2b033693dd5a4be38c236bcbe98b64a7ef0ce019e834386e409f62c3b723f8a8faddbc84a6dfe731630949034be1c844f11c5f0b9ee81a7aeb4f
+  data.tar.gz: 8cd259ad6d2dac0e218b3770fa1c78715159cc1a2a50248e8e4e8270eab98c01e650687495331bcb1ba058179fb5b5516d6940d24c849bd581b393a0434659c0

data/bin/cloudscopes-setup

@@ -3,6 +3,5 @@
 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/monitor.conf'
+FileUtils.cp "#{basedir}/config/monitoring.yaml", '/etc/cloudscopes-monitoring.yaml'

data/config/cron.config

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

data/config/monitoring.yaml

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

data/lib/cloudscopes/system.rb

@@ -27,7 +27,9 @@ module Cloudscopes
     end
     
     def bluepill_ok?(name)
-      %x(/usr/local/bin/bluepill wfs status).split("\n").
+      bin = Dir['/usr/local/rvm/gems/ruby-*/bin/bluepill','/usr/local/bin/bluepill'].first
+      return false unless bin
+      %x(#{bin} #{name} status).split("\n").
         select { |ln| ln =~ /pid:/ }.
         collect { |ln| ln =~ /pid:(\d+).*:\s*(.*)/ and { pid: $1, status: $2 } }.
         all? { |proc| proc[:status] == "up"}

data/lib/cloudscopes/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudscopes
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Oded Arbel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk