rackspace-monitoring 0.2.15 → 0.2.18

data/VERSION

@@ -1 +1 @@
-0.2.15
+0.2.18

data/lib/rackspace-monitoring.rb

@@ -22,6 +22,12 @@ module Fog
       collection  :alarm_examples
       model       :agent_token
       collection  :agent_tokens
+      model       :metric
+      collection  :metrics
+      model       :data_point
+      collection  :data_points
+      model       :check_type
+      collection  :check_types
 
       request_path 'rackspace-monitoring/monitoring/requests'
       request      :list_agent_tokens
@@ -29,6 +35,9 @@ module Fog
       request      :list_alarm_examples
       request      :list_checks
       request      :list_entities
+      request      :list_metrics
+      request      :list_data_points
+      request      :list_check_types
       request      :list_overview
 
       request      :get_agent_token

data/lib/rackspace-monitoring/monitoring/models/agent_tokens.rb

@@ -9,7 +9,14 @@ module Fog
         model Fog::Monitoring::Rackspace::AgentToken
 
         def all
-          data = connection.list_agent_tokens.body['values']
+          data = []
+          opts = {}
+          begin
+            new_tokens = connection.list_agent_tokens(opts)
+            data.concat(new_tokens.body['values'])
+            opts = {:marker => new_tokens.body['metadata']['next_marker']}
+          end until opts[:marker].nil?
+
           load(data)
         end
 

data/lib/rackspace-monitoring/monitoring/models/check.rb

@@ -57,6 +57,15 @@ module Fog
           true
         end
 
+        def metrics
+          @metrics ||= begin
+            Fog::Monitoring::Rackspace::Metrics.new(
+              :check      => self,
+              :connection => connection
+            )
+          end
+        end
+
       end
 
     end

data/lib/rackspace-monitoring/monitoring/models/check_type.rb

@@ -0,0 +1,15 @@
+require 'rackspace-fog/core/model'
+require 'rackspace-monitoring/monitoring/models/base'
+
+module Fog
+  module Monitoring
+    class Rackspace
+      class CheckType < Fog::Monitoring::Rackspace::Base
+        identity :id
+        attribute :type
+        attribute :fields
+        attribute :channel
+      end
+    end
+  end
+end

data/lib/rackspace-monitoring/monitoring/models/check_types.rb

@@ -0,0 +1,23 @@
+require 'rackspace-fog/core/collection'
+require 'rackspace-monitoring/monitoring/models/check_type'
+
+module Fog
+  module Monitoring
+    class Rackspace
+      class CheckTypes < Fog::Collection
+
+        model Fog::Monitoring::Rackspace::CheckType
+
+        def all
+          data = connection.list_check_types.body['values']
+          load(data)
+        end
+
+        def new(attributes = {})
+          super({ }.merge!(attributes))
+        end
+
+      end
+    end
+  end
+end

data/lib/rackspace-monitoring/monitoring/models/data_point.rb

@@ -0,0 +1,18 @@
+require 'rackspace-fog/core/model'
+require 'rackspace-monitoring/monitoring/models/base'
+
+module Fog
+  module Monitoring
+    class Rackspace
+      class DataPoint < Fog::Monitoring::Rackspace::Base
+        attribute :num_points, :aliases => "numPoints"
+        attribute :average
+        attribute :variance
+        attribute :min
+        attribute :max
+        attribute :timestamp
+        attribute :metric
+      end
+    end
+  end
+end

data/lib/rackspace-monitoring/monitoring/models/data_points.rb

@@ -0,0 +1,49 @@
+require 'rackspace-fog/core/collection'
+require 'rackspace-monitoring/monitoring/models/data_point'
+
+module Fog
+  module Monitoring
+    class Rackspace
+      class DataPoints < Fog::Collection
+
+        attribute :metric
+
+        model Fog::Monitoring::Rackspace::DataPoint
+
+        def all
+          self.fetch(:resolution => :full)
+        end
+
+        # Fetch the datapoints for a metric
+        # ==== Parameters
+        #
+        # * options<~Hash> - optional paramaters
+        #   * from<~Integer> - timestamp in milliseconds
+        #   * to<~Integer> - timestamp in milliseconds
+        #   * points<~Integer> - Number of points to fetch
+        #   * resolution<~String> - Should be one of :full, :min5, :min20, :min60, :min240, :min1440
+        #   * select<~Array> - Should be an array of :average, :max, :min, :variance
+        #
+        # ==== Returns
+        # * datapoints<~Fog::Monitoring::Rackspace::Datapoints>:
+        def fetch(options={})
+          requires :metric
+          options[:from] ||= (Time.now.to_i * 1000) - (3600 * 1000)
+          options[:to] ||= Time.now.to_i * 1000
+          options[:points] ||= 1 unless options[:resolution]
+          if options[:resolution]
+            options[:resolution] = options[:resolution].upcase
+          end
+          data = connection.list_data_points(metric.check.entity.id, metric.check.id, metric.name, options).body['values']
+          load(data)
+        end
+
+        def new(attributes = {})
+          requires :metric
+          super({ :metric => metric }.merge!(attributes))
+        end
+
+      end
+    end
+  end
+end

data/lib/rackspace-monitoring/monitoring/models/metric.rb

@@ -0,0 +1,25 @@
+require 'rackspace-fog/core/model'
+require 'rackspace-monitoring/monitoring/models/base'
+
+module Fog
+  module Monitoring
+    class Rackspace
+      class Metric < Fog::Monitoring::Rackspace::Base
+
+        identity  :name
+        attribute :check
+
+        def datapoints(options={})
+          @datapoints ||= begin
+            Fog::Monitoring::Rackspace::DataPoints.new(
+              :metric        => self,
+              :connection    => connection
+            )
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/rackspace-monitoring/monitoring/models/metrics.rb

@@ -0,0 +1,27 @@
+require 'rackspace-fog/core/collection'
+require 'rackspace-monitoring/monitoring/models/metric'
+
+module Fog
+  module Monitoring
+    class Rackspace
+      class Metrics < Fog::Collection
+
+        attribute :check
+
+        model Fog::Monitoring::Rackspace::Metric
+
+        def all
+          requires :check
+          data = connection.list_metrics(check.entity.id, check.id).body['values']
+          load(data)
+        end
+
+        def new(attributes = {})
+          requires :check
+          super({ :check => check }.merge!(attributes))
+        end
+
+      end
+    end
+  end
+end

data/lib/rackspace-monitoring/monitoring/requests/list_agent_tokens.rb

@@ -3,11 +3,12 @@ module Fog
     class Rackspace
       class Real
 
-        def list_agent_tokens
+        def list_agent_tokens(options={})
           request(
             :expects  => [200, 203],
             :method   => 'GET',
-            :path     => "agent_tokens"
+            :path     => 'agent_tokens',
+            :query    => options
           )
         end
 

data/lib/rackspace-monitoring/monitoring/requests/list_check_types.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Monitoring
+    class Rackspace
+      class Real
+
+        def list_check_types
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "check_types"
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/rackspace-monitoring/monitoring/requests/list_data_points.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Monitoring
+    class Rackspace
+      class Real
+
+        def list_data_points(entity_id, check_id, metric_name, options)
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "entities/#{entity_id}/checks/#{check_id}/metrics/#{metric_name}/plot",
+            :query    => options
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/rackspace-monitoring/monitoring/requests/list_metrics.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Monitoring
+    class Rackspace
+      class Real
+
+        def list_metrics(entity_id, check_id)
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "entities/#{entity_id}/checks/#{check_id}/metrics"
+          )
+        end
+
+      end
+    end
+  end
+end
+

data/rackspace-monitoring.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rackspace-monitoring"
-  s.version = "0.2.15"
+  s.version = "0.2.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Di Spaltro"]
-  s.date = "2013-03-17"
+  s.date = "2013-04-12"
   s.description = "Rackspace Cloud Monitoring Ruby Bindings, built on top of fog."
   s.email = "dan.dispaltro@gmail.com"
   s.extra_rdoc_files = [
@@ -32,9 +32,15 @@ Gem::Specification.new do |s|
     "lib/rackspace-monitoring/monitoring/models/alarms.rb",
     "lib/rackspace-monitoring/monitoring/models/base.rb",
     "lib/rackspace-monitoring/monitoring/models/check.rb",
+    "lib/rackspace-monitoring/monitoring/models/check_type.rb",
+    "lib/rackspace-monitoring/monitoring/models/check_types.rb",
     "lib/rackspace-monitoring/monitoring/models/checks.rb",
+    "lib/rackspace-monitoring/monitoring/models/data_point.rb",
+    "lib/rackspace-monitoring/monitoring/models/data_points.rb",
     "lib/rackspace-monitoring/monitoring/models/entities.rb",
     "lib/rackspace-monitoring/monitoring/models/entity.rb",
+    "lib/rackspace-monitoring/monitoring/models/metric.rb",
+    "lib/rackspace-monitoring/monitoring/models/metrics.rb",
     "lib/rackspace-monitoring/monitoring/requests/create_agent_token.rb",
     "lib/rackspace-monitoring/monitoring/requests/create_alarm.rb",
     "lib/rackspace-monitoring/monitoring/requests/create_check.rb",
@@ -50,8 +56,11 @@ Gem::Specification.new do |s|
     "lib/rackspace-monitoring/monitoring/requests/list_agent_tokens.rb",
     "lib/rackspace-monitoring/monitoring/requests/list_alarm_examples.rb",
     "lib/rackspace-monitoring/monitoring/requests/list_alarms.rb",
+    "lib/rackspace-monitoring/monitoring/requests/list_check_types.rb",
     "lib/rackspace-monitoring/monitoring/requests/list_checks.rb",
+    "lib/rackspace-monitoring/monitoring/requests/list_data_points.rb",
     "lib/rackspace-monitoring/monitoring/requests/list_entities.rb",
+    "lib/rackspace-monitoring/monitoring/requests/list_metrics.rb",
     "lib/rackspace-monitoring/monitoring/requests/list_overview.rb",
     "lib/rackspace-monitoring/monitoring/requests/update_alarm.rb",
     "lib/rackspace-monitoring/monitoring/requests/update_check.rb",
@@ -63,7 +72,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/racker/rackspace-monitoring-rb"
   s.licenses = ["APACHE"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.23"
   s.summary = "Rackspace Cloud Monitoring Ruby Bindings"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rackspace-monitoring
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rackspace-fog
@@ -114,9 +114,15 @@ files:
 - lib/rackspace-monitoring/monitoring/models/alarms.rb
 - lib/rackspace-monitoring/monitoring/models/base.rb
 - lib/rackspace-monitoring/monitoring/models/check.rb
+- lib/rackspace-monitoring/monitoring/models/check_type.rb
+- lib/rackspace-monitoring/monitoring/models/check_types.rb
 - lib/rackspace-monitoring/monitoring/models/checks.rb
+- lib/rackspace-monitoring/monitoring/models/data_point.rb
+- lib/rackspace-monitoring/monitoring/models/data_points.rb
 - lib/rackspace-monitoring/monitoring/models/entities.rb
 - lib/rackspace-monitoring/monitoring/models/entity.rb
+- lib/rackspace-monitoring/monitoring/models/metric.rb
+- lib/rackspace-monitoring/monitoring/models/metrics.rb
 - lib/rackspace-monitoring/monitoring/requests/create_agent_token.rb
 - lib/rackspace-monitoring/monitoring/requests/create_alarm.rb
 - lib/rackspace-monitoring/monitoring/requests/create_check.rb
@@ -132,8 +138,11 @@ files:
 - lib/rackspace-monitoring/monitoring/requests/list_agent_tokens.rb
 - lib/rackspace-monitoring/monitoring/requests/list_alarm_examples.rb
 - lib/rackspace-monitoring/monitoring/requests/list_alarms.rb
+- lib/rackspace-monitoring/monitoring/requests/list_check_types.rb
 - lib/rackspace-monitoring/monitoring/requests/list_checks.rb
+- lib/rackspace-monitoring/monitoring/requests/list_data_points.rb
 - lib/rackspace-monitoring/monitoring/requests/list_entities.rb
+- lib/rackspace-monitoring/monitoring/requests/list_metrics.rb
 - lib/rackspace-monitoring/monitoring/requests/list_overview.rb
 - lib/rackspace-monitoring/monitoring/requests/update_alarm.rb
 - lib/rackspace-monitoring/monitoring/requests/update_check.rb
@@ -154,9 +163,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2447514613286196878
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rackspace Cloud Monitoring Ruby Bindings