cloudscopes 0.12.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13a8c1e4fd96446ee9cfb730470ffbd144b336a2
-  data.tar.gz: e19c5195b89ffaf6cda0805183bf61e3a6129ac4
+  metadata.gz: e6ef807ce48549ff5ec29abbffb020286f8d84d2
+  data.tar.gz: 13d1f5b6a0dd963ec5a7d50efe83f91675ec2d02
 SHA512:
-  metadata.gz: 211373e4fe776df95c5ac33283d43f85e4f579277e525d68ba039a0b22567215244aa6bf2c47e192b442bc0534ff667eb5cd6e07874dfc9076171ce9ae5eb8f6
-  data.tar.gz: 94479bbf4b7456bcd4c4314d4200c215f0855e3bc93bd670c0ae469a32968597b781aa1cb58c6c66ed88b918c45e06b5ad615854f19802f0588c6a256ce0cdc2
+  metadata.gz: 1e5e7a073fe7b08efc38a4274aeed76ec32ccacbb5d8bc4ad029317803c79cf7d6c9377e1edd718ceb8c4483c7a17b9426d27adbc726908bc38370d77376a0b9
+  data.tar.gz: f5e5c085f530292011c610ff48979eff7dd0a4832b74faa865c2b1688978c60ae1d90b8f6656e3526c9f80f716bdeb66267aab956d4530731b2a9b049be759c2

data/.gitignore

@@ -5,6 +5,7 @@
 /InstalledFiles
 /pkg/
 /spec/reports/
+/spec/examples.state
 /test/tmp/
 /test/version_tmp/
 /tmp/
@@ -26,7 +27,7 @@ build/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
+Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+ - 2.2
+ - 2.3
+script:
+ - bundle exec rspec spec
+ - bundle exec gem build cloudscopes.gemspec
+deploy:
+  provider: rubygems
+  api_key:
+    secure: v7NKtzbY0rS/ulmTNhrvuDI/dWiqVkOR4uknO351QUGgKDuhc/FrD8mDe/d5aRv4WhZAUymamTihafchY+L6hXTst9OrAAsVx267vGN4PkCFzxF5tpVSr0MWG2FM4C3ZZC6Ud34BZDzFKUKvVUTMOMKrwBeCYRkg2G4SzvzbeXts6/ndI6D/qb38oHQb9nKG3UO9DnA3wMJdPFY0JKIkOuGCGSyBqrHQa+3XkKCbxqswv23vBbrHycj6HN5DIhwGy5vGpjkTr1OZ9t0tBrqNg8SYzjlvMbpJlwVVfyqECbuYCfEmJesHlPkS/Wz2n3eMzV50wUyQMQ5ZSYbyvh2DrcLb3snLYGITPgcJ887IhnJGAiCHPVZFvujStjZiKG2WNCkpQdjqGLKQdV20w9at+sp5KruM7bVEz86CoS3my3tjRHsLz83jYW78Y6fb3OMbQ/5ZlhtDge7xDWLDlo4M8hEyfGyTzTb0P7Y/nUvLsunPzbJTNAYp9bGXMuHcyO0DofCd+64H830FE01xCr5QFLVezJ+lpQKIb+gneUjUvVNdUcohlwLt+EZsxNOPiz3s1lbvYazz/gLpX58slzXglopBB574CxaEODn71p5+2rAqxv+yofsSxjRYFRLPw0GKhIpLZZZOaAwxzL3trEfvMTbEaXzvMxhkXvZqUEeVjp0=
+  gem: cloudscopes
+  on:
+    tags: true
+    repo: guss77/cloudscopes

data/cloudscopes.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Ruby gem to report system statistics to web based monitoring services such as CloudWatch}
   spec.description   = %q{Ruby gem to report system statistics to web based monitoring services such as CloudWatch}
   spec.homepage      = "http://github.com/guss77/cloudscopes"
-  spec.license       = "GPLv3"
+  spec.license       = "GPL-3.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", '~> 0'
+  spec.add_development_dependency "rspec", '~> 3'
 end

data/config/monitoring.yaml

@@ -2,14 +2,14 @@ settings:
   configdir: /etc/cloudscopes/monitor.d
   interval: 60
   provider: cloudwatch
-  key: AWS_KEY_ID 
-  secret: AWS_SECRET_KEY
+  #key: AWS_KEY_ID
+  #secret: AWS_SECRET_KEY
   region: us-west-2
   dimensions:
     InstanceId: "#{ec2.availability_zone}.#{ec2.instance_id}"
 
 metrics:
-  Systems: 
+  Systems:
     - name: Load Per CPU
       unit: Percent
       value: 100 * system.loadavg5 / system.cpucount
@@ -26,16 +26,16 @@ metrics:
       unit: Count
       value: system.ps.select { |p| p.exe_name == 'myservice' }.size
 
-  Queues:      
+  Queues:
     - name: Pending Resque Items
       unit: Count
       value: redis.resque_size("some_queue")
       requires: system.service('redis-server')
-      
+
   Services:
     - name: My service status
       value: if system.service('my-service') then 1 else 0 end
-      requires: File.exists?('/usr/sbin/my-service')     
+      requires: File.exists?('/usr/sbin/my-service')
     - name: Nginx Running
       value: if network.port_open?(80) then 1 else 0 end
       requires: File.exists?(Dir.glob("/etc/nginx/sites-enabled/*").first || "")

data/lib/cloudscopes/configuration.rb

@@ -1,43 +1,32 @@
 module Cloudscopes
 
-  attr_reader :should_publish, :usage_requested
-
-  def self.init
-    @opts = Cloudscopes::Options.new
-    usage if usage_requested
-    configuration = {}
-    (@opts.files.empty?? [ STDIN ] : @opts.files.collect { |fn| File.new(fn) }).each do |configfile|
-      configuration.merge! YAML.load(configfile.read)
+  class << self
+    def init
+      @opts = Cloudscopes::Options.new
+      configuration = {}
+      (@opts.files.empty?? [ STDIN ] : @opts.files.collect { |fn| File.new(fn) }).each do |configfile|
+        configuration.merge! YAML.load(configfile.read)
+      end
+      @settings = configuration['settings']
+      configuration['metrics']
     end
-    @settings = configuration['settings']
-    configuration['metrics']
-  end
-
-  def self.usage_requested
-    @opts.usage
-  end
 
-  def self.should_publish
-    @opts.publish != false
-  end
-
-  def self.usage
-    puts "#{@opts}"
-    exit 5
-  end
+    def should_publish
+      @opts.publish
+    end
 
-  def self.client
-    @client ||= initClient
-  end
+    def client
+      @client ||= initClient
+    end
 
-  def self.initClient
-    AWS::CloudWatch.new access_key_id: @settings['aws-key'],
-                          secret_access_key: @settings['aws-secret'],
-                          region: @settings['region']
-  end
+    def initClient
+      AWS::CloudWatch.new access_key_id: @settings['aws-key'],
+                            secret_access_key: @settings['aws-secret'],
+                            region: @settings['region']
+    end
 
-  def self.data_dimensions
-    @settings['dimensions'] || ({ 'InstanceId' => '#{ec2.instance_id}' })
+    def data_dimensions
+      @settings['dimensions'] || ({ 'InstanceId' => '#{ec2.instance_id}' })
+    end
   end
-
-end
+end

data/lib/cloudscopes/ec2.rb

@@ -1,19 +1,34 @@
 require 'net/http'
 
 module Cloudscopes
-  
+
   class Ec2
-    
+
     @@baseurl = 'http://169.254.169.254/latest/meta-data'
-    
+
+    HYPERVISOR_UUID_PATH = '/sys/hypervisor/uuid'.freeze
+    DMI_PRODUCT_UUID_PATH = '/sys/devices/virtual/dmi/id/product_uuid'.freeze
+
+    # see https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/identify_ec2_instances.html for
+    # details
+    def self.runs_on_ec2?
+      path =
+          if File.exists?(HYPERVISOR_UUID_PATH)
+            HYPERVISOR_UUID_PATH
+          elsif File.exists?(DMI_PRODUCT_UUID_PATH)
+            DMI_PRODUCT_UUID_PATH
+          end
+      !!path && File.read(path).downcase.start_with?('ec2')
+    end
+
     def instance_id
       @@instanceid ||= Net::HTTP.get(URI("#{@@baseurl}/instance-id"))
     end
-    
+
     def availability_zone
       @@az ||= Net::HTTP.get(URI("#{@@baseurl}/placement/availability-zone"))
     end
-    
+
   end
-  
+
 end

data/lib/cloudscopes/filesystem.rb

@@ -1,5 +1,5 @@
 module Cloudscopes
-  
+
   module StatFs
     # The result of a statfs operation, see "man statfs" for more information
     # on each field.  We add some helper methods that deal in bytes.
@@ -8,13 +8,13 @@ module Cloudscopes
       def free; bfree * bsize; end
       def avail; bavail * bsize; end
     end
-    
+
     module Lib
       extend FFI::Library
       ffi_lib FFI::Library::LIBC
       attach_function 'statfs64', [:string, :pointer], :int
     end
-    
+
     # Drives the interface to the C library, returns a StatFs::Result object
     # to show filesystem information for the given path.
     #
@@ -29,19 +29,16 @@ module Cloudscopes
       end
     end
   end
-    
+
   class Filesystem
-    
-    @@mountpoints = File.read("/proc/mounts").split("\n").grep(/(?:xv|s)d/).collect { |l| l.split(/\s+/)[1] }
-    
     def mountpoints
-      @@mountpoints
+      @@mountpoints ||=
+          File.read("/proc/mounts").split("\n").grep(/(?:xv|s)d/).collect { |l| l.split(/\s+/)[1] }
     end
-    
+
     def df(path)
       StatFs.statfs(path)
     end
-    
   end
 
 end

data/lib/cloudscopes/globals.rb

@@ -3,12 +3,14 @@
 #
 
 def publish(samples)
-  raise "Not running in EC2, so won't publish!" unless File.executable?("/usr/bin/ec2metadata")
+  raise "Not running in EC2, so won't publish!" unless Cloudscopes::Ec2.runs_on_ec2?
   samples.each do |type,metric_samples|
     begin
       valid_data = metric_samples.select(&:valid)
       next if valid_data.empty?
-      valid_data.each_slice(4) do |slice| # slice metrics to chunks - the actual limit is 20, but CloudWatch starts misbehaving if I put too much data
+      # slice metrics to chunks
+      # put_metric_data is limited to 40KB per POST request
+      valid_data.each_slice(4) do |slice|
         Cloudscopes.client.put_metric_data namespace: type,
                                           metric_data: slice.collect(&:to_cloudwatch_metric_data)
       end

data/lib/cloudscopes/memory.rb

@@ -1,22 +1,29 @@
 module Cloudscopes
-  
   class Memory
+    def initialize
+      @@data ||= (
+        raw_meminfo = File.read('/proc/meminfo')
+        names_and_values = raw_meminfo.split("\n").
+            map {|line| line =~ /(\w+):\s+(\d+)/ and [$1, $2.to_i] }.compact
+        Hash[names_and_values]
+      )
+    end
 
-    File.read('/proc/meminfo').split("\n").collect do |line|
-      line =~ /(\w+):\s+(\d+)/ and { name: $1, value: $2.to_i } 
-    end.each do |data|
-      next if data.nil? 
-      define_method(data[:name]) { data[:value] }
+    def method_missing(method, *args)
+      method_name = method.to_s
+      if @@data.include?(method_name)
+        @@data[method_name]
+      else
+        super
+      end
     end
-    
+
     def MemAvailable
       return self.MemFree + self.Buffers + self.Cached
     end
-    
+
     def MemUsed
       return self.MemTotal - self.MemFree - self.Buffers - self.Cached
     end
-
   end
-  
 end

data/lib/cloudscopes/options.rb

@@ -1,17 +1,20 @@
 module Cloudscopes
-  
+
   class Options
 
-    attr_reader :publish, :usage, :files
-        
+    attr_reader :publish, :files
+
     def initialize
       @publish = true
       @files = OptionParser.new do |opts|
         opts.banner = "Usage: #{$0} [options] [<config.yaml>]\n\nOptions:"
         opts.on("-t", "dump samples to the console instead of publishing, for testing") { @publish = false }
-        opts.on_tail("-?", "-h", "--help", "Show this message") { @usage = true }
+        opts.on_tail("-?", "-h", "--help", "Show this message") do
+          puts(opts)
+          exit
+        end
       end.parse!
     end
   end
-  
+
 end

data/lib/cloudscopes/process.rb

@@ -1,22 +1,20 @@
 require 'etc'
 
 module Cloudscopes
-  
+
   class Process
-    
+
     class SystemProcess
-    
-      @@maxpid = File.read('/proc/sys/kernel/pid_max').to_i
-       
       def initialize(id)
         @id = id.to_i
+        @@maxpid ||= File.read('/proc/sys/kernel/pid_max').to_i
         raise "Invalid system process id #{id}" unless @id > 0 && @id < @@maxpid
       end
-      
+
       def procpath(field = nil)
         "/proc/#{@id}/#{field}"
       end
-      
+
       def method_missing(name, *args)
         raise ArgumentError.new("wrong number of arguments (#{args.length} for 0)") unless args.length == 0
         begin
@@ -28,7 +26,7 @@ module Cloudscopes
           ''
         end
       end
-      
+
       def exe
         begin
           File.readlink(procpath('exe'))
@@ -39,11 +37,11 @@ module Cloudscopes
           ''
         end
       end
-      
+
       def exe_name
         File.basename(exe)
       end
-      
+
       def uid
         begin
           File.stat(procpath('mem')).uid
@@ -51,11 +49,11 @@ module Cloudscopes
           nil
         end
       end
-      
+
       def user
         Etc.getpwuid(uid || 0).name
       end
-      
+
       def mem_usage_rss
         statm.strip.split(/\s+/)[1].to_i * Etc.sysconf(Etc::SC_PAGESIZE)
       end
@@ -64,7 +62,7 @@ module Cloudscopes
       end
       alias mem_usage mem_usage_virt
     end
-    
+
     def list
       list = Dir["/proc/[0-9]*[0-9]"].collect{|dir| SystemProcess.new(File.basename(dir).to_i) }
       list.define_singleton_method(:method_missing) do |name, *args|
@@ -72,7 +70,7 @@ module Cloudscopes
         when /^by_(.*)/
           field = $1.to_sym
           raise ArgumentError.new("wrong number of arguments (#{args.length} for 1)") unless args.length == 1
-          select do |ps| 
+          select do |ps|
             case ps.send(field)
             when args.first
               true
@@ -86,8 +84,8 @@ module Cloudscopes
       end
       list
     end
-    
+
   end
-  
+
 end
 

data/lib/cloudscopes/version.rb

@@ -1,3 +1,3 @@
 module Cloudscopes
-  VERSION = "0.12.5"
+  VERSION = "0.13.0"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,21 @@
+require 'cloudscopes'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  config.disable_monkey_patching!
+  config.example_status_persistence_file_path = File.expand_path("../examples.state", __FILE__)
+  config.default_formatter = 'doc' if config.files_to_run.one?
+  config.order = :random
+  Kernel.srand(config.seed)
+  # uncomment for profiling slow examples
+  #config.profile_examples = 10
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudscopes
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Oded Arbel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Ruby gem to report system statistics to web based monitoring services
   such as CloudWatch
 email:
@@ -86,6 +100,8 @@ files:
 - ".buildpath"
 - ".gitignore"
 - ".project"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -108,9 +124,10 @@ files:
 - lib/cloudscopes/sample.rb
 - lib/cloudscopes/system.rb
 - lib/cloudscopes/version.rb
+- spec/spec_helper.rb
 homepage: http://github.com/guss77/cloudscopes
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -128,9 +145,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby gem to report system statistics to web based monitoring services such
   as CloudWatch
-test_files: []
+test_files:
+- spec/spec_helper.rb