cloudscopes 0.8.11 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70aaeb8bd42c38505955f3a28360a62bffb9eae6
-  data.tar.gz: 8fa7a39022e6fe06dc471aadbf021a15fc1a2e39
+  metadata.gz: c10cf3fdfa70ce1de5a02adb3bf4efd0d96804da
+  data.tar.gz: 88d6da877e73a5d78c51bd375c7b083512cfe212
 SHA512:
-  metadata.gz: 56fd20839e1b6cc4782102068b46a8a597e6f3792f43155a958357c8325d6890287c069fff2f767a993a7e6d55d981f357cd0bbf3a5a029293f3d4f77b560f2d
-  data.tar.gz: 590ff8e64743d371d9ebe4c52f2e2472b3a17eb54c7ec760d65a576e18dbc5c6fa4840d72013cb6e6b876eeb9e8de7b16a4137244a9f637d88e05376aa5bc66b
+  metadata.gz: be20dacf290f31e39a3bf7360317adcf9a2eb7d568d5453eb45b2098585ba372911acd146e4b5ebb73aa0cb8d692c1c71a5cfb287b24232a9d6d132f6f6730e0
+  data.tar.gz: 0ca2172ae69b6afd2a2f605ff6aee2f5adadddcc6c07094b4091dd9a457c85931fbbeaee1c59273b1a31ce99ed9f21bc02b3463cc14645522e1e19106b657b8e

data/config/monitoring.yaml

@@ -3,6 +3,8 @@ settings:
   key: AWS_KEY_ID 
   secret: AWS_SECRET_KEY
   region: us-west-2
+  dimensions:
+    InstanceId: "#{ec2.availability_zone}.#{ec2.instance_id}"
 
 metrics:
   Systems: 
@@ -15,7 +17,6 @@ metrics:
     - name: Memory Utilization
       unit: Percent
       value: 100 * memory.MemUsed / memory.MemTotal
-      
     - name: Available Space on System
       unit: Gigabytes
       value: filesystem.df("/").avail / 1024 / 1024 / 1024

data/lib/cloudscopes/configuration.rb

@@ -36,4 +36,8 @@ module Cloudscopes
                           region: @settings['region']
   end
 
+  def self.data_dimensions
+    @settings['dimensions'] || ({ 'InstanceId' => '#{ec2.instance_id}' })
+  end
+
 end

data/lib/cloudscopes/ec2.rb

@@ -0,0 +1,19 @@
+require 'net/http'
+
+module Cloudscopes
+  
+  class Ec2
+    
+    @@baseurl = 'http://169.254.169.254/latest/meta-data'
+    
+    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/sample.rb

@@ -4,8 +4,19 @@ module Cloudscopes
     
     attr_reader :name, :value, :unit
     
-    ec2_instanceid_file = "/var/lib/cloud/data/previous-instance-id"
-    @@instanceid = File.exists?(ec2_instanceid_file) ? File.read(ec2_instanceid_file).chomp : nil
+    def dimensions
+      Cloudscopes.data_dimensions.collect do |key,value|
+        begin
+          if ! value.start_with?('"') and value.include?('#') # user wants to expand a string expression, but can't be bothered with escaping double quotes
+            { name: key, value: Cloudscopes.get_binding.eval('"' + value + '"') }
+          else
+            { name: key, value: Cloudscopes.get_binding.eval(value) }
+          end
+        rescue NameError # assume the user meant to send the static text
+          { name: key, value: value }
+        end
+      end
+    end
     
     def initialize(namespace, metric)
       @name = metric['name']
@@ -29,7 +40,7 @@ module Cloudscopes
       return nil if @value.nil?
       data = { metric_name: @name, value: @value }
       data[:unit] = @unit if @unit
-      data[:dimensions] = [ { name: "InstanceId", value: @@instanceid } ] unless @@instanceid.nil?
+      data[:dimensions] = dimensions
       data
     end
     

data/lib/cloudscopes/version.rb

@@ -1,3 +1,3 @@
 module Cloudscopes
-  VERSION = "0.8.11"
+  VERSION = "0.9.0"
 end

data/lib/cloudscopes.rb

@@ -16,6 +16,7 @@ require 'cloudscopes/system'
 require 'cloudscopes/filesystem'
 require 'cloudscopes/redis'
 require 'cloudscopes/network'
+require 'cloudscopes/ec2'
 
 module Cloudscopes
 

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: cloudscopes
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.9.0
 platform: ruby
 authors:
 - Oded Arbel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.40'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.40'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby gem to report system statistics to web based monitoring services
@@ -83,9 +83,9 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .buildpath
-- .gitignore
-- .project
+- ".buildpath"
+- ".gitignore"
+- ".project"
 - Gemfile
 - LICENSE
 - README.md
@@ -97,6 +97,7 @@ files:
 - config/monitoring.yaml
 - lib/cloudscopes.rb
 - lib/cloudscopes/configuration.rb
+- lib/cloudscopes/ec2.rb
 - lib/cloudscopes/filesystem.rb
 - lib/cloudscopes/globals.rb
 - lib/cloudscopes/memory.rb
@@ -116,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby gem to report system statistics to web based monitoring services such