rackspace-monitoring 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/rackspace-monitoring.rb

@@ -19,21 +19,33 @@ module Fog
       collection  :checks
       model       :alarm
       collection  :alarms
+      model       :alarm_example
+      collection  :alarm_examples
 
       request_path 'rackspace-monitoring/monitoring/requests'
-      request      :list_entities
-      request      :list_checks
       request      :list_alarms
+      request      :list_alarm_examples
+      request      :list_checks
+      request      :list_entities
       request      :list_overview
-      request      :get_entity
-      request      :get_check
+
       request      :get_alarm
-      request      :create_entity
-      request      :create_check
+      request      :get_alarm_example
+      request      :get_check
+      request      :get_entity
+
       request      :create_alarm
+      request      :create_check
+      request      :create_entity
+
+      request      :update_check
       request      :update_entity
+
+      request      :delete_check
       request      :delete_entity
 
+      request      :evaluate_alarm_example
+
 
       class Mock
 

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

@@ -0,0 +1,26 @@
+require 'fog/core/model'
+require 'rackspace-monitoring/monitoring/models/base'
+
+module Fog
+  module Monitoring
+    class Rackspace
+      class AlarmExample < Fog::Monitoring::Rackspace::Base
+
+        identity :id
+
+        attribute :label
+        attribute :description
+        attribute :check_type
+        attribute :criteria
+        attribute :fields
+
+
+        attribute :bound_criteria
+
+        def bound?
+          !bound_criteria.nil?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+require 'fog/core/collection'
+require 'rackspace-monitoring/monitoring/models/alarm_example'
+
+module Fog
+  module Monitoring
+    class Rackspace
+      class AlarmExamples < Fog::Collection
+
+        model Fog::Monitoring::Rackspace::AlarmExample
+
+        def all
+          data = connection.list_alarm_examples.body['values']
+          load(data)
+        end
+
+        def get(alarm_example_id)
+          data = connection.get_alarm_example(alarm_example_id).body
+          new(data)
+        rescue Fog::Monitoring::Rackspace::NotFound
+          nil
+        end
+
+        def evaluate(alarm_example_id, options={})
+          data = connection.evaluate_alarm_example(alarm_example_id, options).body
+          new(data)
+        end
+
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Fog
         attribute :created_at
         attribute :updated_at
 
+        # Back to drawing board on this one I think
         def hash
           attrs = attributes.dup
           attrs.delete_if {|key, value| [:created_at, :updated_at, :id].include?(key)}
@@ -16,6 +17,14 @@ module Fog
           values = attrs.values.map{|sym| sym.to_s}.sort.join ''
           Digest::MD5.hexdigest(keys + values)
         end
+
+        def compare?(b)
+          a_o = prep
+          b_o = b.prep
+          remain = a_o.reject {|key, value| b_o[key] === value}
+          remain.empty?
+        end
+
       end
     end
   end

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

@@ -8,6 +8,7 @@ module Fog
 
         identity :id
         attribute :entity
+        attribute :entity_id
 
         attribute :label
         attribute :metadata
@@ -21,10 +22,7 @@ module Fog
         attribute :disabled
         attribute :monitoring_zones_poll
 
-        def save
-          raise Fog::Errors::Error.new('Update not implemented yet.') if identity
-          requires :type
-          requires :entity
+        def prep
           options = {
             'label'       => label,
             'metadata'    => metadata,
@@ -38,7 +36,24 @@ module Fog
             'disabled'=> disabled
           }
           options = options.reject {|key, value| value.nil?}
-          data = connection.create_check(entity.identity, type, options)
+          options
+        end
+
+        def save
+          begin
+            requires :entity
+            entity_id = entity.identity
+          rescue
+            requires :entity_id
+          end
+          options = prep
+          if identity then
+            data = connection.update_check(entity_id, identity, options)
+          else
+            requires :type
+            options['type'] = type
+            data = connection.create_check(entity_id, options)
+          end
           true
         end
 

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

@@ -59,12 +59,6 @@ module Fog
           connection.delete_entity(id)
         end
 
-        def compare?(b)
-          a_o = prep
-          b_o = b.prep
-          remain = a_o.reject {|key, value| b_o[key] === value}
-          remain.empty?
-        end
       end
     end
   end

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

@@ -3,55 +3,8 @@ module Fog
     class Rackspace
       class Real
 
-
-        def process_options(options) 
-          data = {}
-          if options['label'] then
-            data['label'] = options['label']
-          end
-          if options['metadata'] then
-            data['metadata'] = options['metadata']
-          end
-          if options['target_alias'] then
-            data['target_alias'] = options['target_alias']
-          end
-          if options['target_resolver'] then
-            data['target_resolver'] = options['target_resolver']
-          end
-          if options['target_hostname'] then
-            data['target_hostname'] = options['target_hostname']
-          end
-          if options['period'] then
-            data['period'] = options['period']
-          end
-          if options['timeout'] then
-            data['timeout'] = options['timeout']
-          end
-          if options['details'] then
-            data['details'] = options['details']
-          end
-          if options['monitoring_zones_poll'] then
-            data['monitoring_zones_poll'] = options['monitoring_zones_poll']
-          end
-          if options['disabled'] then
-            data['disabled'] = options['disabled']
-          end
-          data
-        end
-
-        def update_check(id, entity_id, options = {})
-          data = process_options options
-          request(
-            :body     => MultiJson.encode(data),
-            :expects  => [201],
-            :method   => 'PUT',
-            :path     => "entities/#{entity_id}/checks/#{id}"
-          )
-        end
-
-        def create_check(entity_id, type, options = {})
-          data = process_options options
-          data['type'] = type
+        def create_check(entity_id, options = {})
+          data = options.dup
           request(
             :body     => MultiJson.encode(data),
             :expects  => [201],

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

@@ -0,0 +1,17 @@
+module Fog
+  module Monitoring
+    class Rackspace
+      class Real
+
+        def delete_check(entity_id, check_id)
+          request(
+            :expects  => [204],
+            :method   => 'DELETE',
+            :path     => "entities/#{entity_id}/checks/#{check_id}"
+          )
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,20 @@
+module Fog
+  module Monitoring
+    class Rackspace
+      class Real
+
+        def evaluate_alarm_example(id, options = {})
+          data = {:values => options.dup}
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => [200],
+            :method   => 'POST',
+            :path     => "alarm_examples/#{id}"
+          )
+        end
+      end
+    end
+  end
+end
+
+

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

@@ -0,0 +1,19 @@
+module Fog
+  module Monitoring
+    class Rackspace
+      class Real
+
+        def get_alarm_example(id)
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "alarm_examples/#{id}"
+          )
+        end
+
+      end
+    end
+  end
+end
+
+

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

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

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

@@ -0,0 +1,18 @@
+module Fog
+  module Monitoring
+    class Rackspace
+      class Real
+
+        def update_check(entity_id, id, options)
+          request(
+            :body     => MultiJson.encode(options),
+            :expects  => [204],
+            :method   => 'PUT',
+            :path     => "entities/#{entity_id}/checks/#{id}"
+          )
+        end
+      end
+    end
+  end
+end
+

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

@@ -3,12 +3,12 @@ module Fog
     class Rackspace
       class Real
 
-        def update_entity(entity_id, options)
+        def update_entity(id, options)
           request(
             :body     => MultiJson.encode(options),
             :expects  => [204],
             :method   => 'PUT',
-            :path     => "entities/#{entity_id}"
+            :path     => "entities/#{id}"
           )
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rackspace-monitoring
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -107,6 +107,8 @@ files:
 - VERSION
 - lib/rackspace-monitoring.rb
 - lib/rackspace-monitoring/monitoring/models/alarm.rb
+- lib/rackspace-monitoring/monitoring/models/alarm_example.rb
+- lib/rackspace-monitoring/monitoring/models/alarm_examples.rb
 - lib/rackspace-monitoring/monitoring/models/alarms.rb
 - lib/rackspace-monitoring/monitoring/models/base.rb
 - lib/rackspace-monitoring/monitoring/models/check.rb
@@ -116,14 +118,19 @@ files:
 - lib/rackspace-monitoring/monitoring/requests/create_alarm.rb
 - lib/rackspace-monitoring/monitoring/requests/create_check.rb
 - lib/rackspace-monitoring/monitoring/requests/create_entity.rb
+- lib/rackspace-monitoring/monitoring/requests/delete_check.rb
 - lib/rackspace-monitoring/monitoring/requests/delete_entity.rb
+- lib/rackspace-monitoring/monitoring/requests/evaluate_alarm_example.rb
 - lib/rackspace-monitoring/monitoring/requests/get_alarm.rb
+- lib/rackspace-monitoring/monitoring/requests/get_alarm_example.rb
 - lib/rackspace-monitoring/monitoring/requests/get_check.rb
 - lib/rackspace-monitoring/monitoring/requests/get_entity.rb
+- lib/rackspace-monitoring/monitoring/requests/list_alarm_examples.rb
 - lib/rackspace-monitoring/monitoring/requests/list_alarms.rb
 - lib/rackspace-monitoring/monitoring/requests/list_checks.rb
 - lib/rackspace-monitoring/monitoring/requests/list_entities.rb
 - lib/rackspace-monitoring/monitoring/requests/list_overview.rb
+- lib/rackspace-monitoring/monitoring/requests/update_check.rb
 - lib/rackspace-monitoring/monitoring/requests/update_entity.rb
 - test/helper.rb
 - test/test_rackspace-monitoring.rb
@@ -142,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1039074049877710307
+      hash: -4565954568018538761
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: