zabbixapi 2.2.4 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a6a333247a0c997c8ffc1b4baa56c2bd25db344
-  data.tar.gz: fce1d341dd272105dfe9464b23331dbf00974f17
+  metadata.gz: 9d821fad6072067f4fcfb5a664165e19624b661f
+  data.tar.gz: 1f1a9adde080dbabc46a9333cd88bdf0d7328944
 SHA512:
-  metadata.gz: 2dc6235a82602dfae50a6073fce82ed54e1a833a4b15ec7fc559bdf6a653b11d8a64b32ba62f0fd43e47ee9c604731c12a1268d85f0a4f2f131584437f47bbb6
-  data.tar.gz: 67b659c1db208ad8765f6b441252abab8558092a73f9c3abf7198c3ddae66e2e8023a2e96e2d241f66017cbf581fadc574ef6ba3ffaffe54639421dc565cd063
+  metadata.gz: c451bf0f57555ddda1827d8b73851614b7b04a2cd657788f30b7919a2d571ca468c9f90ff48922d316a9d7c7678e78c6888fbc5a492445568bc8eca3f848fb6f
+  data.tar.gz: 658565fe62621c59b5ed9d742b36cb71c1f11f8306c97f9715e2e4957e21a840587d5d0d81dbb4ea6cda4d1fef2cf7525672e8b1602b8073b23be720d93aa8bc

data/.travis.yml

@@ -5,8 +5,8 @@ rvm:
   - 2.0.0
   - 2.1.1
 before_script:
-  - wget -qO - http://obs.express42.com/project_root:/zabbix2.2/precise/Release.key | sudo apt-key add -
-  - echo "deb http://obs.express42.com/project_root:/zabbix2.2/precise/ ./" | sudo tee /etc/apt/sources.list.d/zabbix.list
+  - wget -qO - http://obs.express42.com/project_root:/zabbix2.4/precise/Release.key | sudo apt-key add -
+  - echo "deb http://obs.express42.com/project_root:/zabbix2.4/precise/ ./" | sudo tee /etc/apt/sources.list.d/zabbix.list
   - sudo apt-get update
   - sudo apt-get install libiodbc2
   - sudo apt-get install zabbix-server-pgsql zabbix-frontend-php

data/README.md

@@ -9,6 +9,7 @@ Simple and lightweight ruby module for work with zabbix api
 * 1.8.9 (api version 1.3) /zabbixapi 0.6.x [branch zabbix1.8](https://github.com/express42/zabbixapi/tree/zabbix1.8)
 * 2.0.x (api version 1.4 -> 2.0.10) /zabbixapi 2.0.x [branch zabbix2.0](https://github.com/express42/zabbixapi/tree/zabbix2.0)
 * 2.2.x (api version 2.2.x) /zabbixapi 2.2.x [master or branch zabbix2.2](https://github.com/express42/zabbixapi/tree/master)
+* 2.4.x (api version 2.2.x) /zabbixapi 2.4.x [branch zabbix2.4](https://github.com/express42/zabbixapi/tree/zabbix2.4)
 
 Because Zabbix 2.2 is a main branch of Zabbix, so master of zabbixapi supports this version of zabbix.
 
@@ -18,15 +19,16 @@ Zabbixapi has next version policy:
 * for zabbix 1.8.9 and below you should use zabbixapi 0.6.x
 * for zabbix 2.0.x you should use zabbixapi 2.0.y
 * for zabbix 2.2.x you should use zabbixapi 2.2.y
+* for zabbix 2.4.x you should use zabbixapi 2.4.y
 
 The PATCH (third digit) version of zabbixapi should not correspond to PATCH version of zabbix, for example
 zabbixapi-2.0.x should works with all version of zabbix 2.0.y
 
-We support only two last versions of zabbix (2.0 and 2.2), so you should consider zabbixapi 0.6.x depricated.
+We support only three last versions of zabbix (2.0, 2.2 and 2.4), so you should consider zabbixapi 0.6.x depricated.
 
 ## Installation
 ```
-gem install zabbixapi -v 2.2.0
+gem install zabbixapi -v 2.4.0
 ```
 
 ## Getting Started
@@ -341,36 +343,6 @@ zbx.proxies.create(
 )
 ```
 
-### Export object
-
-```ruby
-zbx.configurations.export(
-    :format => "xml",
-    :options => {
-        :templates => [zbx.templates.get_id(:host => "template")]
-    }
-)
-```
-
-### Import object
-
-```ruby
-zbx.configurations.import(
-    :format => "xml",
-    :rules => {
-        :templates => {
-            :createMissing => true,
-            :updateExisting => true
-        },
-        :items => {
-            :createMissing => true,
-            :updateExisting => true
-        }
-    },
-    :source => "<!--?xml version=\"1.0\" encoding=\"UTF-8\"?--><zabbix_export><version>2.0</version><date>2012-04-18T11:20:14Z</date><groups><group><name>Zabbix servers</name></group></groups><hosts><host><host>Export host</host><name>Export host</name><proxyid>0</proxyid><status>0</status><ipmi_authtype>-1</ipmi_authtype><ipmi_privilege>2</ipmi_privilege><ipmi_username></ipmi_username><ipmi_password></ipmi_password><templates></templates><groups><group><name>Zabbix servers</name></group></groups><interfaces><interface><default>1</default><type>1</type><useip>1</useip><ip>127.0.0.1</ip><dns></dns><port>10050</port><interface_ref>if1</interface_ref></interface></interfaces><applications><application><name>Application</name></application></applications><items><item><name>Item</name><type>0</type><snmp_community></snmp_community><multiplier>0</multiplier><snmp_oid></snmp_oid><key>item.key</key><delay>30</delay><history>90</history><trends>365</trends><status>0</status><value_type>3</value_type><allowed_hosts></allowed_hosts><units></units><delta>0</delta><snmpv3_securityname></snmpv3_securityname><snmpv3_securitylevel>0</snmpv3_securitylevel><snmpv3_authpassphrase></snmpv3_authpassphrase><snmpv3_privpassphrase></snmpv3_privpassphrase><formula>1</formula><delay_flex></delay_flex><params></params><ipmi_sensor></ipmi_sensor><data_type>0</data_type><authtype>0</authtype><username></username><password></password><publickey></publickey><privatekey></privatekey><port></port><description></description><inventory_link>0</inventory_link><applications><application><name>Application</name></application></applications><valuemap></valuemap><interface_ref>if1</interface_ref></item></items><discovery_rules></discovery_rules><macros></macros><inventory></inventory></host></hosts><triggers><trigger><expression>{Export host:item.key.last(0)}=0</expression><name>Trigger</name><url></url><status>0</status><priority>2</priority><description>Host trigger</description><type>0</type><dependencies></dependencies></trigger></triggers><graphs><graph><name>Graph</name><width>900</width><height>200</height><yaxismin>0.0000</yaxismin><yaxismax>100.0000</yaxismax><show_work_period>1</show_work_period><show_triggers>1</show_triggers><type>0</type><show_legend>1</show_legend><show_3d>0</show_3d><percent_left>0.0000</percent_left><percent_right>0.0000</percent_right><ymin_type_1>0</ymin_type_1><ymax_type_1>0</ymax_type_1><ymin_item_1>0</ymin_item_1><ymax_item_1>0</ymax_item_1><graph_items><graph_item><sortorder>0</sortorder><drawtype>0</drawtype><color>C80000</color><yaxisside>0</yaxisside><calc_fnc>7</calc_fnc><type>0</type><item><host>Export host</host><key>item.key</key></item></graph_item></graph_items></graph></graphs></zabbix_export>"
-)
-```
-
 ### User and global macros
 ```ruby
 zbx.usermacros.create(
@@ -404,4 +376,4 @@ zbx.query(
 ## Zabbix documentation
 
 * [Zabbix Project Homepage](http://zabbix.com/)
-* [Zabbix Api docs](https://www.zabbix.com/documentation/2.2/manual/api/reference)
+* [Zabbix Api docs](https://www.zabbix.com/documentation/2.4/manual/api/reference)

data/lib/zabbixapi.rb

@@ -22,8 +22,6 @@ require "zabbixapi/classes/unusable"
 require "zabbixapi/classes/usergroups"
 require "zabbixapi/classes/usermacros"
 require "zabbixapi/classes/users"
-require "zabbixapi/classes/configurations"
-require "zabbixapi/classes/hostinterfaces"
 
 class ZabbixApi
 
@@ -43,9 +41,6 @@ class ZabbixApi
 
   def initialize(options = {})
     @client = Client.new(options)
-    unless @client.api_version =~ /2\.2\.\d+/
-      raise "Zabbix API version: #{@client.api_version} is not support by this version of zabbixapi"
-    end
   end
 
   def server
@@ -90,7 +85,7 @@ class ZabbixApi
 
   def screens
     @screens ||= Screens.new(@client)
-  end
+  end  
 
   def usergroups
     @usergroups ||= Usergroups.new(@client)
@@ -104,12 +99,6 @@ class ZabbixApi
     @mediatypes ||= Mediatypes.new(@client)
   end
 
-  def configurations
-    @configurations ||= Configurations.new(@client)
-  end
-
-  def hostinterfaces
-    @hostinterfaces ||= Hostinterfaces.new(@client)
-  end
 end
 
+

data/lib/zabbixapi/basic/basic_func.rb

@@ -1,9 +1,3 @@
-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
 
@@ -12,8 +6,8 @@ class ZabbixApi
     end
 
     def hash_equals?(a, b)
-      a_new = normalize_obj(a)
-      b_new = normalize_obj(b)
+      a_new = normalize_hash(a)
+      b_new = normalize_hash(b)
       hash1 = a_new.merge(b_new)
       hash2 = b_new.merge(a_new)
       hash1 == hash2
@@ -25,22 +19,17 @@ class ZabbixApi
       obj
     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
+    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
       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, force = false)
+    def create_or_update(data)
       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), force) : create(data)
+      id ? update(data.merge(key.to_sym => id.to_s)) : create(data)
     end
 
-    def update(data, force = false)
+    def update(data)
       log "[DEBUG] Call update with parametrs: #{data.inspect}"
 
       dump = {}
@@ -34,14 +34,10 @@ class ZabbixApi
         dump = symbolize_keys(item) if item[key].to_i == data[key.to_sym].to_i
       end
 
-      dump.delete(key.to_sym)
-      data.delete(key.to_sym)
-
-      if hash_equals?(dump, data) && !force
+      if hash_equals?(dump, data) 
         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
@@ -50,25 +46,22 @@ class ZabbixApi
     end
 
     def get_full_data(data)
-      log "[DEBUG] Call get_full_data with parametrs: #{data.inspect} and params #{data[:params]}"
+      log "[DEBUG] Call get_full_data with parametrs: #{data.inspect}"
 
-      data[:params] ||= {}
-      res = @client.api_request(
+      @client.api_request(
         :method => "#{method_name}.get",
         :params => {
           :filter => {
             indentify.to_sym => data[indentify.to_sym]
           },
           :output => "extend"
-        }.merge(data[:params])
+        }
       )
-      res
     end
 
     def dump_by_id(data)
-      log "[DEBUG] Call dump_by_id with parametrs: #{data.inspect} and params #{data[:params]}"
+      log "[DEBUG] Call dump_by_id with parametrs: #{data.inspect}"
 
-      data[:params] ||= {}
       @client.api_request(
         :method => "#{method_name}.get",
         :params => {
@@ -76,7 +69,7 @@ class ZabbixApi
             key.to_sym => data[key.to_sym]
           },
           :output => "extend"
-        }.merge(data[:params])
+        }
       )
     end
 
@@ -93,7 +86,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].to_s == data[indentify.to_sym].to_s }
+      result.each { |item| id = item[key.to_sym].to_i if item[indentify.to_sym] == data[indentify.to_sym] }
       id
     end
 

data/lib/zabbixapi/classes/applications.rb

@@ -1,8 +1,6 @@
 class ZabbixApi
   class Applications
 
-    API_PARAMETERS = %w(applicationids groupids hostids inherited itemids templated templateids expandData selectHosts selectItems)
-
     def initialize(client)
       @client = client
     end
@@ -33,11 +31,7 @@ class ZabbixApi
     end
 
     def get_full_data(data)
-      filter_params = {}
-      request_data = data.dup # Duplicate data, as we modify it. Otherwise methods that use data after calling get_full_data (such as get_id) will fail.
-
-      request_data.each { |key, value| filter_params[key] = request_data.delete(key) unless API_PARAMETERS.include?(key) }
-      @client.api_request(:method => "application.get", :params => request_data.merge({:filter => filter_params, :output => "extend"}))
+      @client.api_request(:method => "application.get", :params => {:filter => data, :output => "extend"})
     end
 
     def get_id(data)

data/lib/zabbixapi/classes/hosts.rb

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

data/lib/zabbixapi/classes/triggers.rb

@@ -49,13 +49,10 @@ 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/client.rb

@@ -17,7 +17,7 @@ class ZabbixApi
 
     def auth
       api_request(
-        :method => 'user.authenticate',
+        :method => 'user.login',
         :params => {
           :user      => @options[:user],
           :password  => @options[:password],
@@ -33,6 +33,9 @@ class ZabbixApi
         @proxy_port = @proxy_uri.port
         @proxy_user, @proxy_pass = @proxy_uri.userinfo.split(/:/) if @proxy_uri.userinfo
       end
+      unless api_version =~ /2\.4\.\d+/
+        raise "Zabbix API version: #{api_version} is not support by this version of zabbixapi"
+      end
       @auth_hash = auth
     end
 
@@ -40,10 +43,12 @@ class ZabbixApi
       message = {
         :method  => body[:method],
         :params  => body[:params],
-        :auth    => @auth_hash,
         :id      => id,
         :jsonrpc => '2.0'
       }
+
+      message[:auth] = @auth_hash unless body[:method] == 'apiinfo.version'
+
       JSON.generate(message)
     end
 
@@ -92,3 +97,4 @@ class ZabbixApi
 
   end
 end
+

data/lib/zabbixapi/version.rb

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

data/spec/host.rb

@@ -5,9 +5,7 @@ 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
@@ -38,15 +36,15 @@ describe 'host' do
         @hostgroupid2 = zbx.hostgroups.create(:name => gen_name('hostgroup'))
         host = gen_name('host')
         hostid = zbx.hosts.create(
-          :host => host,
-          :interfaces => [{ :type => 1, :main => 1, :ip => '192.168.0.1', :dns => 'server.example.org', :port => 10050, :useip => 0 }],
-          :groups => [
-            {:groupid => @hostgroupid},
-            {:groupid => @hostgroupid2}
+          host: host,
+          interfaces: [{ type: 1, main: 1, ip: '192.168.0.1', dns: 'server.example.org', port: 10050, useip: 0 }],
+          groups: [
+            {groupid: @hostgroupid},
+            {groupid: @hostgroupid2}
           ])
 
         expect(hostid).to be_kind_of Integer
-        host = zbx.query(:method => 'host.get', :params => { :hostids => [hostid], :selectGroups => 'extend' }).first
+        host = zbx.query(method: 'host.get', params: { hostids: [hostid], selectGroups: 'extend' }).first
 
         expect(host['hostid'].to_i).to eq hostid
         expect(host['groups'].size).to eq 2
@@ -92,11 +90,6 @@ describe 'host' do
       it "should contains created host" do
         expect(zbx.hosts.get_full_data(:host => @host)[0]).to include("host" => @host)
       end
-
-      it "shoulld dump interfaces" do
-        expect(zbx.hosts.get_full_data(:host => @host, :params => {:selectInterfaces => "extend"})[0]["interfaces"][0]).to include("type" => "1")
-        expect(zbx.hosts.get_full_data(:host => @host, :params => {:selectInterfaces => "extend"})[0]["interfaces"][0]).to include("ip" => "10.20.48.88")
-      end
     end
 
     describe 'get_id' do
@@ -122,30 +115,6 @@ 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/query.rb

@@ -5,9 +5,14 @@ require 'spec_helper'
 describe "query" do
   it "should works" do
     zbx.query(
-      :method => "apiinfo.version",
-      :params => {}
-    ).should be_kind_of(String)
+      method: 'host.get',
+      params: {
+        filter: {
+            host: 'asdf'
+        },
+        selectInterfaces: 'refer'
+      }
+    ).should be_kind_of(Array)
   end
 end
 

data/spec/server.rb

@@ -8,8 +8,8 @@ describe 'server' do
       zbx.server.version.should be_kind_of(String)
     end
 
-    it "should be 2.2.x" do
-      zbx.server.version.should match(/2\.2\.\d+/)
+    it "should be 2.4.x" do
+      zbx.server.version.should match(/2\.4\.\d+/)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.4.0
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,26 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
 description: Allows you to work with zabbix api from ruby.
@@ -39,9 +39,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -52,11 +52,9 @@ files:
 - lib/zabbixapi/basic/basic_init.rb
 - lib/zabbixapi/basic/basic_logic.rb
 - lib/zabbixapi/classes/applications.rb
-- lib/zabbixapi/classes/configurations.rb
 - lib/zabbixapi/classes/errors.rb
 - lib/zabbixapi/classes/graphs.rb
 - lib/zabbixapi/classes/hostgroups.rb
-- lib/zabbixapi/classes/hostinterfaces.rb
 - lib/zabbixapi/classes/hosts.rb
 - lib/zabbixapi/classes/items.rb
 - lib/zabbixapi/classes/mediatypes.rb
@@ -73,11 +71,9 @@ files:
 - lib/zabbixapi/version.rb
 - spec/application.rb
 - spec/basic_func.rb
-- spec/configuration.rb
 - spec/graph.rb
 - spec/host.rb
 - spec/hostgroup.rb
-- spec/hostinterface.rb
 - spec/item.rb
 - spec/mediatype.rb
 - spec/query.rb
@@ -99,28 +95,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: zabbixapi
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Realization for Zabbix API.
 test_files:
 - spec/application.rb
 - spec/basic_func.rb
-- spec/configuration.rb
 - spec/graph.rb
 - spec/host.rb
 - spec/hostgroup.rb
-- spec/hostinterface.rb
 - spec/item.rb
 - spec/mediatype.rb
 - spec/query.rb

data/lib/zabbixapi/classes/configurations.rb

@@ -1,36 +0,0 @@
-class ZabbixApi
-  class Configurations < Basic
-
-    def array_flag
-      true
-    end
-
-    def method_name
-      "configuration"
-    end
-
-    def indentify
-      "host"
-    end
-
-    # Export configuration data as a serialized string
-    # * *Args*    :
-    # see available parameters: https://www.zabbix.com/documentation/2.2/manual/api/reference/configuration/export
-    # * *Returns* :
-    #   - String
-    def export(data)
-      @client.api_request(:method => "configuration.export", :params => data)
-    end
-
-    # Import configurations data from a serialized string
-    # * *Args*    :
-    # see available parameters: https://www.zabbix.com/documentation/2.2/manual/api/reference/configuration/import
-    # * *Returns* :
-    #   - Boolean
-    def import(data)
-      @client.api_request(:method => "configuration.import", :params => data)
-    end
-
-  end
-end
-

data/lib/zabbixapi/classes/hostinterfaces.rb

@@ -1,19 +0,0 @@
-class ZabbixApi
-  class Hostinterfaces < Basic
-    def array_flag
-      true
-    end
-
-    def method_name
-      "hostinterface"
-    end
-
-    def indentify
-      "interfaceid"
-    end
-
-    def key
-      "interfaceid"
-    end
-  end
-end

data/spec/configuration.rb

@@ -1,122 +0,0 @@
-#encoding: utf-8
-
-require "spec_helper"
-
-describe "configuration" do
-  before :all do
-    @hostgroup = gen_name "hostgroup"
-    @hostgroup_id = zbx.hostgroups.create(:name => @hostgroup)
-    @template    = gen_name "template"
-    @template_id = zbx.templates.create(
-      :host   => @template,
-      :groups => [:groupid => @hostgroup_id]
-    )
-    @source = zbx.configurations.export(
-      :format  => "xml",
-      :options => {
-        :templates => [@template_id]
-      }
-    )
-    @item = gen_name "item"
-    @item_id = zbx.items.create(
-      :name         => @item,
-      :description  => "item",
-      :key_         => "proc.num[aaa]",
-      :type         => 0,
-      :value_type   => 3,
-      :hostid       => zbx.templates.get_id(:host => @template),
-    )
-  end
-
-  after :all do
-    zbx.items.delete(zbx.items.get_id(:name => @item))
-    zbx.templates.delete(zbx.templates.get_id(:host => @template))
-    zbx.hostgroups.delete(zbx.hostgroups.get_id(:name => @hostgroup))
-  end
-
-  context "when object not exists" do
-    describe "import with createMissing" do
-      before do
-        zbx.items.delete(@item_id)
-        zbx.templates.delete(@template_id)
-        zbx.hostgroups.delete(@hostgroup_id)
-        zbx.configurations.import(
-          :format => "xml",
-          :rules  => {
-            :groups => {
-              :createMissing => true
-            },
-            :templates => {
-              :createMissing => true
-            }
-          },
-          :source => @source
-        )
-      end
-
-      it "should create object" do
-        expect(zbx.hostgroups.get_id(:name => @hostgroup)).to be_kind_of(Integer)
-        expect(zbx.templates.get_id(:host => @template)).to be_kind_of(Integer)
-      end
-    end
-  end
-
-  context "when object exists" do
-
-    describe "export" do
-      before do
-        zbx.items.create(
-          :name         => @item,
-          :description  => "item",
-          :key_         => "proc.num[aaa]",
-          :type         => 0,
-          :value_type   => 3,
-          :hostid       => zbx.templates.get_id(:host => @template),
-        )
-      end
-
-      it "should export updated object" do
-        expect(zbx.configurations.export(
-          :format  => "xml",
-          :options => {
-            :templates => [zbx.templates.get_id(:host => @template)]
-          }
-        )).to match(/#{@item}/)
-      end
-    end
-
-    describe "import with updateExisting" do
-      before do
-        @source_updated = zbx.configurations.export(
-          :format  => "xml",
-          :options => {
-            :templates => [zbx.templates.get_id(:host => @template)]
-          }
-        )
-        zbx.items.delete(zbx.items.get_id(:name => @item))
-        zbx.configurations.import(
-          :format  => "xml",
-          :rules   => {
-            :templates => {
-              :updateExisting => true
-            },
-            :items => {
-              :createMissing => true
-            }
-          },
-          :source => @source_updated
-        )
-      end
-
-      it "should update object" do
-        expect(zbx.configurations.export(
-          :format  => "xml",
-          :options => {
-            :templates => [zbx.templates.get_id(:host => @template)]
-          }
-        )).to match(/#{@item}/)
-      end
-    end
-  end
-end
-

data/spec/hostinterface.rb

@@ -1,88 +0,0 @@
-#encoding: utf-8
-
-require 'spec_helper'
-
-describe "hostinterface" do
-  before :all do
-    @hostgroup = gen_name 'hostgroup'
-    @hostgroupid = zbx.hostgroups.create(:name => @hostgroup)
-  end
-
-  context 'when interface not exists' do
-    before do
-      @host = gen_name 'host'
-    end
-
-    describe 'create' do
-      it 'should return integer id' do
-        @hostid = zbx.hosts.create(:host => @host,
-                                   :interfaces => [
-                                       {
-                                           :type => 1,
-                                           :main => 1,
-                                           :ip => "10.20.48.88",
-                                           :dns => "",
-                                           :port => 10050,
-                                           :useip => 1
-                                       }
-                                   ],
-                                   :groups => [:groupid => @hostgroupid]
-        )
-        interfaceid = zbx.hostinterfaces.create(
-            :hostid => @hostid,
-            :dns => "",
-            :ip => "1.1.1.1",
-            :main => 0,
-            :port => '10050',
-            :type => 1,
-            :useip => 1
-        )
-        interfaceid.should be_kind_of(Integer)
-      end
-
-      describe 'get_id' do
-        it "should return nil" do
-          random_id = gen_name('')
-          expect(zbx.hosts.get_id(:hostids => [random_id])).to be_kind_of(NilClass)
-        end
-      end
-    end
-  end
-
-  context 'when interface exists' do
-    before :all do
-      @host = gen_name 'host'
-      @hostid = zbx.hosts.create(
-          :host => @host,
-          :interfaces => [
-              {
-                  :type => 1,
-                  :main => 1,
-                  :ip => "10.20.48.88",
-                  :dns => "",
-                  :port => 10050,
-                  :useip => 1
-              },
-          ],
-          :groups => [:groupid => @hostgroupid]
-      )
-      @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(: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