zabbixapi 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd481b02c9223088ad234cbca2b81d51bcc5916b
-  data.tar.gz: 32641a4d6a3f436ae4fb521f78f6e55c10b159dd
+  metadata.gz: 0a6a333247a0c997c8ffc1b4baa56c2bd25db344
+  data.tar.gz: fce1d341dd272105dfe9464b23331dbf00974f17
 SHA512:
-  metadata.gz: 827a84f1bf076a63c25ef9c17d082e4e7d56290015023a7cfbf6e5e8efaacea67d88a35670079e59f77618eef59f371dbe6917f7238a8cbdcf6c16168e76c130
-  data.tar.gz: fa4c337f755a659da65cabca1bc598c063edc3fc25e63a4c021af04ce1e33497d38429fe00094c7a3e802d8f2779cd5b5b03c345dadb058e5de4d674a68a5fe3
+  metadata.gz: 2dc6235a82602dfae50a6073fce82ed54e1a833a4b15ec7fc559bdf6a653b11d8a64b32ba62f0fd43e47ee9c604731c12a1268d85f0a4f2f131584437f47bbb6
+  data.tar.gz: 67b659c1db208ad8765f6b441252abab8558092a73f9c3abf7198c3ddae66e2e8023a2e96e2d241f66017cbf581fadc574ef6ba3ffaffe54639421dc565cd063

data/lib/zabbixapi/basic/basic_func.rb

@@ -1,3 +1,9 @@
+class Hash
+  def <=> (other_hash)
+    self.keys.collect!{|key| key.to_s} <=> other_hash.keys.collect!{|key| key.to_s}
+  end
+end
+
 class ZabbixApi
   class Basic
 
@@ -6,8 +12,8 @@ class ZabbixApi
     end
 
     def hash_equals?(a, b)
-      a_new = normalize_hash(a)
-      b_new = normalize_hash(b)
+      a_new = normalize_obj(a)
+      b_new = normalize_obj(b)
       hash1 = a_new.merge(b_new)
       hash2 = b_new.merge(a_new)
       hash1 == hash2
@@ -19,17 +25,22 @@ class ZabbixApi
       obj
     end
 
-    def normalize_hash(hash)
-      result = hash.dup
-      result.delete(:hostid) #TODO remove to logig. TemplateID and HostID has different id 
-      result.each do |key, value|
-        case value
-          when Array
-            result.delete(key)
-          else
-            result[key] = value.to_s
-        end
+    def normalize_obj(obj)
+      result = nil
+      # obj.delete(:hostid) if obj.is_a? Hash #TODO remove to logig. TemplateID and HostID has different id
+      case obj
+        when Hash
+          result = obj.dup
+          result.each do |key,value|
+            result[key] = normalize_obj(value)
+          end
+        when Array
+          result = obj.dup
+          result.collect! {|item| normalize_obj(item)}
+        else
+          result = obj.to_s
       end
+      result.sort! if result.respond_to?(:sort!)
       result
     end
 

data/lib/zabbixapi/basic/basic_logic.rb

@@ -18,14 +18,14 @@ class ZabbixApi
       parse_keys result
     end
 
-    def create_or_update(data)
+    def create_or_update(data, force = false)
       log "[DEBUG] Call create_or_update with parametrs: #{data.inspect}"
 
       id = get_id(indentify.to_sym => data[indentify.to_sym])
-      id ? update(data.merge(key.to_sym => id.to_s)) : create(data)
+      id ? update(data.merge(key.to_sym => id.to_s), force) : create(data)
     end
 
-    def update(data)
+    def update(data, force = false)
       log "[DEBUG] Call update with parametrs: #{data.inspect}"
 
       dump = {}
@@ -34,10 +34,14 @@ class ZabbixApi
         dump = symbolize_keys(item) if item[key].to_i == data[key.to_sym].to_i
       end
 
-      if hash_equals?(dump, data) 
+      dump.delete(key.to_sym)
+      data.delete(key.to_sym)
+
+      if hash_equals?(dump, data) && !force
         log "[DEBUG] Equal keys #{dump} and #{data}, skip update"
         item_id
       else
+        data[key.to_sym] = item_id
         data_update = array_flag ? [data] : data
         result = @client.api_request(:method => "#{method_name}.update", :params => data_update)
         parse_keys result
@@ -89,7 +93,7 @@ class ZabbixApi
 
       result = symbolize_keys( get_full_data(data) )
       id = nil
-      result.each { |item| id = item[key.to_sym].to_i if item[indentify.to_sym] == data[indentify.to_sym] }
+      result.each { |item| id = item[key.to_sym].to_i if item[indentify.to_sym].to_s == data[indentify.to_sym].to_s }
       id
     end
 

data/lib/zabbixapi/classes/hostinterfaces.rb

@@ -9,7 +9,7 @@ class ZabbixApi
     end
 
     def indentify
-      "hostid"
+      "interfaceid"
     end
 
     def key

data/lib/zabbixapi/classes/hosts.rb

@@ -35,9 +35,9 @@ class ZabbixApi
       result.empty? ? false : true
     end
 
-    def create_or_update(data)
+    def create_or_update(data, force = false)
       hostid = get_id(:host => data[:host])
-      hostid ? update(data.merge(:hostid => hostid)) : create(data)
+      hostid ? update(data.merge(:hostid => hostid), force) : create(data)
     end
 
     # to make delete call idempotent for all resources

data/lib/zabbixapi/classes/triggers.rb

@@ -49,10 +49,13 @@ class ZabbixApi
 
       log "[DEBUG] expression: #{dump[:expression]}\n data: #{data[:expression]}"
 
+      dump.delete(key.to_sym)
+      data.delete(key.to_sym)
       if hash_equals?(dump, data)
         log "[DEBUG] Equal keys #{dump} and #{data}, skip update"
         item_id
       else
+        data[key.to_sym] = item_id
         data[:expression] = old_expression
         # disable old trigger
         log "[DEBUG] disable :" + @client.api_request(:method => "#{method_name}.update", :params => [{:triggerid=> data[:triggerid], :status => "1" }]).inspect

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

data/spec/host.rb

@@ -5,7 +5,9 @@ require 'spec_helper'
 describe 'host' do
   before :all do
     @hostgroup = gen_name 'hostgroup'
+    @hostgroup3 = gen_name 'hostgroup'
     @hostgroupid = zbx.hostgroups.create(:name => @hostgroup)
+    @hostgroupid3 = zbx.hostgroups.create(:name => @hostgroup3)
   end
 
   context 'when name not exists' do
@@ -120,6 +122,30 @@ describe 'host' do
           :groups => [:groupid => @hostgroupid]
         ).should eq @hostid
       end
+
+      it "should add ghostgroup" do
+        zbx.hosts.create_or_update( {
+            :host => @host,
+            :interfaces => [
+                {
+                    :type => 1,
+                    :main => 1,
+                    :ip => "10.20.48.89",
+                    :port => 10050,
+                    :useip => 1,
+                    :dns => ''
+                }
+            ],
+            :groups => [{:groupid => @hostgroupid},
+                        {:groupid => @hostgroupid3}]
+                                    }, true)
+        zbx.hosts.get_full_data(
+            :host => @host,
+            :params => {
+                :selectGroups => "extend"
+            }
+        )[0]["groups"].collect { |group| group["groupid"].to_s }.sort.should eq [@hostgroupid, @hostgroupid3].collect{|item| item.to_s}.sort
+      end
     end
 
     describe 'update' do

data/spec/hostinterface.rb

@@ -62,18 +62,27 @@ describe "hostinterface" do
                   :dns => "",
                   :port => 10050,
                   :useip => 1
-              }
+              },
           ],
           :groups => [:groupid => @hostgroupid]
       )
-      @interfaceid = zbx.hostinterfaces.create(:hostid => @hostid, :type => 1, :main => 0, :ip => "10.20.48.88", :dns => "", :port => 10050, :useip => 1)
+      @interfaceid1 = zbx.hostinterfaces.create(:hostid => @hostid, :type => 1, :main => 0, :ip => "10.20.48.88", :dns => "", :port => 10050, :useip => 1)
+      @interfaceid2 = zbx.hostinterfaces.create(:hostid => @hostid, :type => 1, :main => 0, :ip => "10.20.48.88", :dns => "", :port => 10050, :useip => 1)
     end
 
     describe 'get_full_data' do
       it "should contains created host" do
-        expect(zbx.hostinterfaces.get_full_data(:hostid => "#{@hostid}")[0]).to include("hostid" => "#{@hostid}")
+        expect(zbx.hostinterfaces.get_full_data(:params => {:filter =>  {:hostid => "#{@hostid}"}})[0]).to include("hostid" => "#{@hostid}")
       end
     end
 
+    describe 'get_id' do
+      it "should update existing interface" do
+        zbx.hostinterfaces.create_or_update(:interfaceid => @interfaceid1, :type => 2, :ip => "8.8.8.8")
+        dump = zbx.hostinterfaces.get_full_data(:interfaceid => @interfaceid1)
+        dump[0]["type"].to_s.should eq 2.to_s
+        dump[0]["ip"].to_s.should eq "8.8.8.8"
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json