zabbixapi 0.5.7 → 0.5.8

data/lib/zabbixapi.rb

@@ -23,7 +23,7 @@ class ZabbixApi
     case @client.api_version
       when "1.3", "1.2"
         apidir = "1.8"
-      when "1.4", "2.0.4"
+      when "1.4", "2.0.4", "2.0.5"
         apidir = "2.0"
       else
         raise "unknown Api version!"

data/lib/zabbixapi/2.0/classes/hosts.rb

@@ -35,7 +35,7 @@ class ZabbixApi
 
     def unlink_templates(data)
       result = @client.api_request(
-        :method => "host.massRemove", 
+        :method => "host.massRemove",
         :params => {
           :hostids => data[:hosts_id],
           :templates => data[:templates_id]
@@ -48,6 +48,9 @@ class ZabbixApi
       # https://www.zabbix.com/documentation/2.2/manual/api/reference/host/create
       # interfaces :(
       data_new = data.clone
+
+      data_new[:interfaces] = {}
+
       %w( type main useip ip dns port ).each do |key|
         data_new[:interfaces][key.to_sym] = data_new[key.to_sym]
       end

data/lib/zabbixapi/2.0/classes/triggers.rb

@@ -1,6 +1,6 @@
 class ZabbixApi
   class Triggers < Basic
-    
+
     def array_flag
       true
     end
@@ -29,9 +29,9 @@ class ZabbixApi
       )
     end
 
-    def safe_update(data)     
+    def safe_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|
@@ -39,17 +39,17 @@ class ZabbixApi
       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[: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[:expression] = data[:expression].gsub(/\{.*\:/,"{") #TODO ugly regexp
       data.delete(:templateid)
-      
+
       log "[DEBUG] expression: #{dump[:expression]}\n data: #{data[:expression]}"
 
-      if hash_equals?(dump, data) 
+      if hash_equals?(dump, data)
         log "[DEBUG] Equal keys #{dump} and #{data}, skip update"
         item_id
       else

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json