rackspace-monitoring 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

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

@@ -0,0 +1,37 @@
+require 'fog/core/model'
+require 'rackspace-monitoring/monitoring/models/base'
+
+module Fog
+  module Monitoring
+    class Rackspace
+      class AgentToken < Fog::Monitoring::Rackspace::Base
+
+        identity :id
+
+        attribute :label
+        attribute :token
+
+        def prep
+          options = {
+            'label'                => label,
+            'token'                => token
+          }
+          options = options.reject {|key, value| value.nil?}
+          options
+        end
+
+        def save
+          options = prep
+          if identity then
+            data = connection.update_agent_token(identity, options)
+          else
+            data = connection.create_agent_token(options)
+          end
+          true
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require 'fog/core/collection'
+require 'rackspace-monitoring/monitoring/models/agent_token'
+
+module Fog
+  module Monitoring
+    class Rackspace
+      class AgentTokens < Fog::Collection
+
+        model Fog::Monitoring::Rackspace::AgentToken
+
+        def all
+          data = connection.list_agent_tokens.body['values']
+          load(data)
+        end
+
+        def get(id)
+          data = connection.get_agent_token(id).body
+          new(data)
+        rescue Fog::Monitoring::Rackspace::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Fog
 
         identity :id
         attribute :entity
+        attribute :entity_id
 
         attribute :label
         attribute :criteria
@@ -15,18 +16,26 @@ module Fog
         attribute :check_id
         attribute :notification_plan_id
 
-        def save
-          raise Fog::Errors::Error.new('Update not implemented yet.') if identity
-          requires :notification_plan_id
-          requires :entity
+        def prep
           options = {
-            'label'       => label,
-            'criteria'    => criteria,
-            'check_type'  => check_type,
-            'check_id'    => check_id,
+            'label'                => label,
+            'criteria'             => criteria,
+            'notification_plan_id' => notification_plan_id,
           }
           options = options.reject {|key, value| value.nil?}
-          data = connection.create_alarm(entity.identity, notification_plan_id, options)
+          options
+        end
+
+        def save
+          requires :notification_plan_id
+          options = prep
+          if identity then
+            data = connection.update_alarm(get_entity_id, identity, options)
+          else
+            options['check_type'] = check_type if check_type
+            options['check_id'] = check_id if check_id
+            data = connection.create_alarm(get_entity_id, options)
+          end
           true
         end
 

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

@@ -25,6 +25,17 @@ module Fog
           remain.empty?
         end
 
+        def get_entity_id
+          requires :entity
+          begin
+            requires :entity
+            entity_id = entity.identity
+          rescue
+            requires :entity_id
+          end
+          entity_id
+        end
+
       end
     end
   end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Monitoring
+    class Rackspace
+      class Real
+
+        def create_agent_token(options = {})
+          data = options.dup
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => [201],
+            :method   => 'POST',
+            :path     => 'agent_tokens'
+          )
+        end
+      end
+    end
+  end
+end
+

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

@@ -3,22 +3,10 @@ module Fog
     class Rackspace
       class Real
 
-        # attribute :label
-        # attribute :criteria
-        # attribute :check_type
-        # attribute :check_id
-        # attribute :notification_plan_id
-
-
-        def create_alarm(entity_id, notification_plan_id, options = {})
-          data = {}
-          data['label'] = options['label'] if options['label']
-          data['criteria'] = options['criteria'] if options['criteria']
-          data['check_type'] = options['check_type'] if options['check_type']
-          data['check_id'] = options['check_id'] if options['check_id']
-          data['notification_plan_id'] = notification_plan_id
+        def create_alarm(entity_id, options = {})
+          data = options.dup
           request(
-            :body     => MultiJson.encode(options),
+            :body     => MultiJson.encode(data),
             :expects  => [201],
             :method   => 'POST',
             :path     => "entities/#{entity_id}/alarms"

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

@@ -4,6 +4,7 @@ module Fog
       class Real
 
         def evaluate_alarm_example(id, options = {})
+          options ||= {}
           data = {:values => options.dup}
           request(
             :body     => MultiJson.encode(data),

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

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

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

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

data/lib/rackspace-monitoring.rb

@@ -21,19 +21,24 @@ module Fog
       collection  :alarms
       model       :alarm_example
       collection  :alarm_examples
+      model       :agent_token
+      collection  :agent_tokens
 
       request_path 'rackspace-monitoring/monitoring/requests'
+      request      :list_agent_tokens
       request      :list_alarms
       request      :list_alarm_examples
       request      :list_checks
       request      :list_entities
       request      :list_overview
 
+      request      :get_agent_token
       request      :get_alarm
       request      :get_alarm_example
       request      :get_check
       request      :get_entity
 
+      request      :create_agent_token
       request      :create_alarm
       request      :create_check
       request      :create_entity

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rackspace-monitoring
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -106,6 +106,8 @@ files:
 - Rakefile
 - VERSION
 - lib/rackspace-monitoring.rb
+- lib/rackspace-monitoring/monitoring/models/agent_token.rb
+- lib/rackspace-monitoring/monitoring/models/agent_tokens.rb
 - lib/rackspace-monitoring/monitoring/models/alarm.rb
 - lib/rackspace-monitoring/monitoring/models/alarm_example.rb
 - lib/rackspace-monitoring/monitoring/models/alarm_examples.rb
@@ -115,16 +117,19 @@ files:
 - lib/rackspace-monitoring/monitoring/models/checks.rb
 - lib/rackspace-monitoring/monitoring/models/entities.rb
 - lib/rackspace-monitoring/monitoring/models/entity.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
 - 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_agent_token.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_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_checks.rb
@@ -149,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4565954568018538761
+      hash: -2125588216297176347
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: