zabbixapi 0.5.1 → 0.5.2a

data/lib/zabbixapi/classes/triggers.rb

@@ -13,5 +13,59 @@ class ZabbixApi
       "description"
     end
 
+    def dump_by_id(data)
+      log "[DEBUG] Call dump_by_id with parametrs: #{data.inspect}"
+
+      @client.api_request(
+        :method => "trigger.get",
+        :params => {
+          :filter => {
+            key.to_sym => data[key.to_sym]
+          },
+          :output => "extend",
+          :select_items => "extend",
+          :select_functions => "extend",
+          :templated => 0
+          #:selectParentTemplates => "extend"
+        }
+      )
+    end
+
+    def update(data)     
+      log "[DEBUG] Call update with parametrs: #{data.inspect}"
+      
+      dump = {}
+      item_id = data[key.to_sym].to_i
+      dump_by_id(key.to_sym => data[key.to_sym]).each do |item|
+        dump = symbolize_keys(item) if item[key].to_i == data[key.to_sym].to_i
+      end
+
+      expression = dump[:items][0][:key_]+"."+dump[:functions][0][:function]+"("+dump[:functions][0][:parameter]+")"
+      dump[:expression] = dump[:expression].gsub(/{(\d*)}/,"{#{expression}}") #TODO ugly regexp
+      dump.delete(:functions)
+      dump.delete(:items)
+
+      old_expression = data[:expression]
+      data[:expression] = data[:expression].gsub(/{.*\:/,"{") #TODO ugly regexp
+      data.delete(:templateid)
+      
+      log "[DEBUG] expression: #{expression}\n data: #{data[:expression]}"
+
+      if hash_equals?(dump, data) 
+        log "[DEBUG] Equal keys #{dump} and #{data}, skip update"
+        item_id
+      else
+        data[:expression] = old_expression
+        data_update = array_flag ? [data] : data
+        data_update.delete(:triggerid)
+        # disable old trigger
+        log "[DEBUG] disable :" + @client.api_request(:method => "#{method_name}.update", :params => [{:triggerid=> data[:triggerid], :status => "1" }]).inspect
+        # create new trigger
+        result = @client.api_request(:method => "#{method_name}.update", :params => data_update)
+        parse_keys result
+      end
+
+    end
+
   end
 end

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.1"
+  VERSION = "0.5.2a"
 end

data/spec/localhost.rb

@@ -13,7 +13,7 @@ zbx = ZabbixApi.connect(
   :url => api_url,
   :user => api_login,
   :password => api_password,
-  :debug => true
+  :debug => false
 )
 
 hostgroup = "hostgroup______1"
@@ -248,6 +248,36 @@ describe ZabbixApi do
     triggerid.should be_kind_of(Integer)
   end
 
+  it "TRIGGER: Create or update (not realy update)" do
+    zbx.triggers.create_or_update(
+      :description => trigger,
+      :expression => "{#{template}:proc.num[aaa].last(0)}<1",
+      :comments => "Bla-bla is faulty (disaster)",
+      :priority => 5,
+      :status     => 0,
+      :templateid => 0,
+      :type => 0
+    ).should eq triggerid + 1
+  end
+
+
+  it "TRIGGER: Create or update (realy update)" do
+    zbx.triggers.create_or_update(
+      :description => trigger,
+      :expression => "{#{template}:proc.num[aaa].last(2)}<1",
+      :comments => "Bla-bla (2) is faulty (disaster)",
+      :priority => 5,
+      :status     => 0,
+      :templateid => 0,
+      :type => 0
+    ).should eq triggerid + 1
+  end
+
+  it "TRIGGER: Get full data" do
+    dump = zbx.triggers.get_full_data(:description => trigger)
+    puts "dump: #{dump}"
+  end
+
   it "TRIGGER: Find" do
     zbx.triggers.get_id(:description => trigger).should eq triggerid + 1 # вау блять
   end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.5.2a
+  prerelease: 5
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -79,13 +79,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3727156722468348692
+      hash: 4597790080164486813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: zabbixapi
 rubygems_version: 1.8.24