zabbixapi 0.5.8 → 0.5.9

data/README.md

@@ -1,13 +1,13 @@
 #Ruby Zabbix Api Module
 
-Simple and lightweight ruby module for work with zabbix api 
+Simple and lightweight ruby module for work with zabbix api
 
 [![Build Status](https://travis-ci.org/vadv/zabbixapi.png)](https://travis-ci.org/vadv/zabbixapi)
 
-#####Now worked with zabbix 
+#####Now worked with zabbix
 * 1.8.2 (api version 1.2)
 * 1.8.9 (api version 1.3)
-* 2.0.4 (api version 2.0.4) [unstable]
+* 2.0.x (api version 1.4 -> 2.0.6) [unstable]
 
 ## Installation
 ```
@@ -25,7 +25,7 @@ zbx = ZabbixApi.connect(
   :user => 'Admin',
   :password => 'zabbix'
 )
-# use basic_auth 
+# use basic_auth
 zbx = ZabbixApi.connect(
   :url => 'http://localhost/zabbix/api_jsonrpc.php',
   :user => 'Admin',
@@ -83,7 +83,7 @@ zbx.items.update(
 puts zbx.items.get_full_data(:description => "item")
 ```
 
-### Create host
+### Create host (1.8)
 ```ruby
 zbx.hosts.add(
   :host => "hostname",
@@ -99,6 +99,40 @@ zbx.hosts.create_or_update(
 )
 ```
 
+### Create host (2.0 and later)
+```ruby
+zbx.hosts.create(
+  :host => host.fqdn,
+  :interfaces => [
+    {
+      :type => 1,
+      :main => 1,
+      :ip => '10.0.0.1',
+      :dns => 'server.example.org',
+      :port => 10050,
+      :useip => 0
+    }
+  ],
+  :groups => [ :groupid => zbx.hostgroups.get_id(:name => "hostgroup") ]
+)
+
+#or use:
+zbx.hosts.create_or_update(
+  :host => host.fqdn,
+  :interfaces => [
+    {
+      :type => 1,
+      :main => 1,
+      :ip => '10.0.0.1',
+      :dns => 'server.example.org',
+      :port => 10050,
+      :useip => 0
+    }
+  ],
+  :groups => [ :groupid => zbx.hostgroups.get_id(:name => "hostgroup") ]
+)
+```
+
 ### Update host
 ```ruby
 zbx.hosts.update(
@@ -117,7 +151,7 @@ zbx.hosts.delete zbx.hosts.get_id(:host => "hostname")
 ### Create graph
 ```ruby
 gitems = {
-  :itemid => zbx.items.get_id(:description => "item"), 
+  :itemid => zbx.items.get_id(:description => "item"),
   :calc_fnc => "2",
   :type => "0",
   :periods_cnt => "5"
@@ -135,12 +169,12 @@ zbx.graphs.create(
 ### Update graph
 ```ruby
 zbx.graphs.update(
-  :graphid => zbx.graphs.get_id( :name => "graph"), 
+  :graphid => zbx.graphs.get_id( :name => "graph"),
   :ymax_type => 1
 )
 #Also you can use:
 gitems = {
-  :itemid => zbx.items.get_id(:description => item), 
+  :itemid => zbx.items.get_id(:description => item),
   :calc_fnc => "3",
   :type => "0",
   :periods_cnt => "5"
@@ -173,7 +207,7 @@ zbx.templates.get_ids_by_host( :hostids => [zbx.hosts.get_id(:host => "hostname"
 #  "Templatename" => "10",
 #  "Templatename" => "1021"
 #}
-``` 
+```
 
 ### Mass (Un)Link host with templates
 ```ruby
@@ -262,7 +296,7 @@ zbx.usergroups.set_perm(
 ```ruby
 zbx.mediatypes.create_or_update(
   :description => "mediatype",
-  :type => 0, # 0 - Email, 1 - External script, 2 - SMS, 3 - Jabber, 100 - EzTexting, 
+  :type => 0, # 0 - Email, 1 - External script, 2 - SMS, 3 - Jabber, 100 - EzTexting,
   :smtp_server => "127.0.0.1",
   :smtp_email => "zabbix@test.com"
 )
@@ -270,9 +304,9 @@ zbx.users.add_medias(
   :userids => [zbx.users.get_id(:name => "user")],
   :media => [
     {
-      :mediatypeid => zbx.mediatypes.get_id(:description => "mediatype"), 
-      :sendto => "test@test", 
-      :active => 0, 
+      :mediatypeid => zbx.mediatypes.get_id(:description => "mediatype"),
+      :sendto => "test@test",
+      :active => 0,
       :period => "1-7,00:00-24:00", # 1-7 days and 00:00-24:00 hours
       :severity => "56"
     }
@@ -283,7 +317,7 @@ zbx.users.add_medias(
 ### Custom queries
 ```ruby
 zbx.query(
-  :method => "apiinfo.version", 
+  :method => "apiinfo.version",
   :params => {}
 )
 ```
@@ -304,4 +338,4 @@ zbx.query(
 ## Zabbix documentation
 
 * [Zabbix Project Homepage](http://zabbix.com/)
-* [Zabbix Api docs](http://www.zabbix.com/documentation/1.8/api) 
+* [Zabbix Api docs](http://www.zabbix.com/documentation/1.8/api)

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", "2.0.5"
+      when "1.4", "2.0.4", "2.0.5", "2.0.6"
         apidir = "2.0"
       else
         raise "unknown Api version!"

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

@@ -16,11 +16,5 @@ class ZabbixApi
     def key
       "groupid"
     end
-
-    def delete(data)
-      result = @client.api_request(:method => "hostgroup.delete", :params => [:groupid => data])
-      result.empty? ? nil : result['groupids'][0].to_i
-    end
-
   end
 end

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

@@ -16,20 +16,10 @@ class ZabbixApi
     def default_options
       {
         :host => nil,
-        :port => 10050,
-        :status => 1,
-        :useip => 1,
-        :dns => '',
-        :ip => '0.0.0.0',
-        :proxy_hostid => 0,
+        :interfaces => [],
+        :status => 0,
+        :available => 1,
         :groups => [],
-        :useipmi => 0,
-        :ipmi_ip => '',
-        :ipmi_port => 623,
-        :ipmi_authtype => 0,
-        :ipmi_privilege => 0,
-        :ipmi_username => '',
-        :ipmi_password => ''
       }
     end
 
@@ -45,18 +35,8 @@ class ZabbixApi
     end
 
     def create_or_update(data)
-      # 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
-      puts "#{data_new.inspect}"
-      hostid = get_id(:host => data_new[:host])
-      hostid ? update(data_new.merge(:hostid => hostid)) : create(data_new)
+      hostid = get_id(:host => data[:host])
+      hostid ? update(data.merge(:hostid => hostid)) : create(data)
     end
 
   end

data/lib/zabbixapi/version.rb

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

metadata

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