medium.rb in rubix-0.5.2

- old
+ new

@@ -6,22 +6,21 @@
     # priority greater than or equal to that listed.  More fine
     # grained control is possible, i.e. - accepting :not_classified
     # and :warning triggers but rejecting :information triggers.  In
     # the interests of simplicity, we avoid exposing that degree of
     # freedom here.
-    PRIORITY_CODES = {
+    zabbix_define :PRIORITY, {
       :none           => 0,
       :not_classified => 63,
       :information    => 62,
       :warning        => 60,
       :average        => 56,
       :high           => 48,
       :disaster       => 32,
       :all            => 63,
       nil             => 63
-    }.freeze
-    PRIORITY_NAMES = PRIORITY_CODES.invert.freeze
+    }
 
     #
     # == Properties & Finding ==
     #
     
@@ -30,11 +29,11 @@
     zabbix_attr :timeframe, :required => true, :default => '1-7,00:00-23:59'
     zabbix_attr :enabled,   :required => true, :default => true
 
     attr_writer :severity
     def severity
-      @severity ||= self.class::PRIORITY_CODES[priority]
+      @severity ||= self.class::PRIORITY_CODES[(priority || :all)]
     end
 
     def self.id_field
       'mediaid'
     end
@@ -63,10 +62,10 @@
       {
         :mediatypeid => media_type_id,
         :userid      => user_id,
         :sendto      => address,
         :active      => (enabled ? 0 : 1),
-        :severity    => (severity || self.class::PRIORITY_CODES[priority]),
+        :severity    => (severity || self.class::PRIORITY_CODES[(priority || :all)]),
         :period      => timeframe
       }
     end
 
     def self.build medium