zabbixapi 0.4.1 → 0.4.2

data/.gitignore

@@ -0,0 +1,5 @@
+.rvmrc
+*.gem
+*.swp
+pkg
+test

data/.rspec

@@ -0,0 +1 @@
+--color --format nested

data/README.md

@@ -17,6 +17,8 @@ gem install zabbixapi
 
 ### Connect
 ```ruby
+require "zabbixapi"
+
 zbx = ZabbixApi.connect(
   :url => 'http://localhost/zabbix/api_jsonrpc.php',
   :user => 'Admin',
@@ -52,29 +54,119 @@ zbx.items.create(
   :hostid => zbx.templates.get_id(:host => "template"),
   :applications => [zbx.applications.get_id(:name => "application")]
 )
+# or use (lib merge json):
+zbx.items.create_or_update(
+  :description => "item",
+  :key_ => "proc.num[aaa]",
+  :type => 6,
+  :hostid => zbx.templates.get_id(:host => "template"),
+  :applications => [zbx.applications.get_id(:name => "application")]
+)
+```
+
+### Update Item
+```ruby
+zbx.items.update(
+  :itemid => zbx.items.get_id(:description => "item"),
+  :status => 0
+)
+#You can check item:
+puts zbx.items.get_full_data(:description => "item")
 ```
 
 ### Create host
 ```ruby
 zbx.hosts.add(
   :host => "hostname",
+  :usedns => 1,
   :groups => [ :groupid => zbx.hostgroups.get_id(:name => "hostgroup") ]
 )
+#or use:
+zbx.hosts.create_or_update(
+  :host => host,
+  :usedns => 0,
+  :ip => "10.20.48.89",
+  :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
+)
+```
+
+### Update host
+```ruby
+zbx.hosts.update(
+  :hostid => zbx.hosts.get_id(:host => "hostname"),
+  :status => 0
+)
+#You can check host:
+puts zbx.hosts.get_full_data(:host => "hostname")
+```
+
+### Delete host
+```ruby
+zbx.hosts.delete zbx.hosts.get_id(:host => "hostname")
+```
+
+### Create graph
+```ruby
+gitems = {
+  :itemid => zbx.items.get_id(:description => "item"), 
+  :calc_fnc => "2",
+  :type => "0",
+  :periods_cnt => "5"
+}
+
+zbx.graphs.create(
+  :gitems => [gitems],
+  :show_triggers => "0",
+  :name => "graph",
+  :width => "900",
+  :height => "200"
+)
+```
+
+### Update graph
+```ruby
+zbx.graphs.update(
+  :graphid => zbx.graphs.get_id( :name => "graph"), 
+  :ymax_type => 1
+)
+#Also you can use:
+gitems = {
+  :itemid => zbx.items.get_id(:description => item), 
+  :calc_fnc => "3",
+  :type => "0",
+  :periods_cnt => "5"
+}
+zbx.graphs.create_or_update(
+  :gitems => [gitems],
+  :show_triggers => "1",
+  :name => graph,
+  :width => "900",
+  :height => "200"
+)
+```
+
+### Delete graph
+```ruby
+zbx.graphs.delete(zbx.graphs.get_id(:name => "graph"))
 ```
 
 ### Get all templates linked with host
 ```ruby
 zbx.templates.get_ids_by_host( :hostids => [zbx.hosts.get_id(:host => "hostname")] )
-returned hash:
-{
-  "Templatename" => "10",
-  "Templatename" => "1021"
-}
+#returned hash:
+#{
+#  "Templatename" => "10",
+#  "Templatename" => "1021"
+#}
 ``` 
 
-### Link host with templates
+### Mass (Un)Link host with templates
 ```ruby
-zbx.hosts.unlink_templates(
+zbx.templates.mass_add(
+  :hosts_id => [zbx.hosts.get_id(:host => "hostname")],
+  :templates_id => [111, 214]
+)
+zbx.templates.mass_remove(
   :hosts_id => [zbx.hosts.get_id(:host => "hostname")],
   :templates_id => [111, 214]
 )
@@ -103,6 +195,16 @@ zbx.users.create(
 )
 ```
 
+### Update user
+```ruby
+zbx.users.update(:userid => zbx.users.get_id(:name => "user"), :name => "user2")
+```
+
+### Delete graph
+```ruby
+zbx.graphs.delete(zbx.graphs.get_id(:name => "graph"))
+```
+
 ### Custom queries
 ```ruby
 zbx.query(
@@ -117,7 +219,14 @@ zbx.query(
 * net/https
 * json
 
+## Contributing
+
+* Fork the project.
+* Make your feature addition or bug fix, write tests.
+* Commit, do not mess with rakefile, version.
+* Make a pull request.
+
 ## Zabbix documentation
 
-* Zabbix Project Homepage -> http://zabbix.com/
-* Zabbix Api docs -> http://www.zabbix.com/documentation/1.8/api
+* [Zabbix Project Homepage](http://zabbix.com/)
+* [Zabbix Api docs](http://www.zabbix.com/documentation/1.8/api) 

data/lib/zabbixapi/applications.rb

@@ -30,7 +30,11 @@ class ZabbixApi
 
     def get_id(data)
       result = get_full_data(data)
-      result.empty? ? nil : result[0]['applicationid'].to_i
+      applicationid = nil
+      result.each do |app|
+        applicationid = app['applicationid'].to_i if app['name'] == data[:name]
+      end
+      applicationid
     end
 
   end

data/lib/zabbixapi/graphs.rb

@@ -19,7 +19,7 @@ class ZabbixApi
       result = @client.api_request(:method => "graph.delete", :params => [data])
       case @client.api_version
         when "1.3"
-          result ? 1 : 0  #return "true" or "false" for this api version
+          result ? 1 : nil  #return "true" or "false" for this api version
         else
           result.empty? ? nil : result['graphids'][0].to_i
       end
@@ -33,14 +33,32 @@ class ZabbixApi
       @client.api_request(:method => "graph.get", :params => {:search => {:name => data}, :output => "extend"})
     end
 
+    def get_items(data)
+      @client.api_request(:method => "graphitem.get", :params => { :graphids => [data], :output => "extend" } )
+    end
+
     def get_id(data)
       result = @client.api_request(:method => "graph.get", :params => {:filter => {:name=> data[:name]}, :output => "extend"})
-      result.empty? ? nil : result[0]['graphid'].to_i
+      graphid = nil
+      result.each do |graph|
+        graphid = graph['graphid'].to_i if graph['name'] == data[:name]
+      end
+      graphid
+    end
+
+    def create_or_update(data)
+      graphid = get_id(:name => data[:name])
+      graphid ? update(data.merge(:graphid => graphid)) : create(data)
     end
 
     def update(data)
-      result = @client.api_request(:method => "graph.update", :params => data)
-      result.empty? ? nil : result['graphids'][0].to_i
+      case @client.api_version
+        when "1.2"
+          return -1
+        else
+          result = @client.api_request(:method => "graph.update", :params => data)
+          result.empty? ? nil : result['graphids'][0].to_i
+      end
     end
 
   end

data/lib/zabbixapi/hostgroups.rb

@@ -35,7 +35,11 @@ class ZabbixApi
 
     def get_id(data)
       result = get_full_data(data)
-      result.empty? ? nil : result[0]['groupid'].to_i
+      hostgroupid = nil
+      result.each do |hgroup|
+        hostgroupid = hgroup['groupid'].to_i if hgroup['name'] == data[:name]
+      end
+      hostgroupid
     end
 
   end

data/lib/zabbixapi/hosts.rb

@@ -71,9 +71,18 @@ class ZabbixApi
       @client.api_request(:method => "host.get", :params => {:filter => data, :output => "extend"})
     end
 
+    def create_or_update(data)
+      hostid = get_id(:host => data[:host])
+      hostid ? update(data.merge(:hostid => hostid)) : create(data)
+    end
+
     def get_id(data)
       result = get_full_data(data)
-      result.empty? ? nil : result[0]['hostid'].to_i
+      hostid = nil
+      result.each do |host|
+        hostid = host['hostid'].to_i if host['host'] == data[:host]
+      end
+      hostid
     end
 
   end

data/lib/zabbixapi/items.rb

@@ -60,7 +60,16 @@ class ZabbixApi
 
     def get_id(data)
       result = get_full_data(data)
-      result.empty? ? nil : result[0]['itemid'].to_i
+      itemid = nil
+      result.each do |item|
+        itemid = item['itemid'].to_i if item['name'] == data[:name]
+      end
+      itemid
+    end
+
+    def create_or_update(data)
+      itemid = get_id(:description => data[:description])
+      itemid ? update(data.merge(:itemid => itemid)) : create(data)
     end
 
     def update(data)

data/lib/zabbixapi/templates.rb

@@ -32,7 +32,7 @@ class ZabbixApi
       result
     end
 
-    def link_with_host(data)
+    def mass_add(data)
       result = @client.api_request(
         :method => "template.massAdd", 
         :params => {
@@ -43,6 +43,17 @@ class ZabbixApi
       result.empty? ? false : true
     end
 
+    def mass_remove(data)
+      result = @client.api_request(
+        :method => "template.massRemove", 
+        :params => {
+          :hosts => data[:hosts_id].map { |t| {:hostid => t} },
+          :templates => data[:templates_id].map { |t| {:templateid => t} }
+        }
+      )
+      result.empty? ? false : true      
+    end
+
     def all
       result = {}
       case @client.api_version
@@ -71,7 +82,11 @@ class ZabbixApi
 
     def get_id(data)
       result = get_full_data(data)
-      result.empty? ? nil : result[0]['templateid'].to_i
+      templateid = nil
+      result.each do |template|
+        templateid = template['templateid'].to_i if template['host'] == data[:host]
+      end
+      templateid
     end
 
   end

data/lib/zabbixapi/triggers.rb

@@ -29,13 +29,22 @@ class ZabbixApi
       result.empty? ? nil : result['triggerid'][0].to_i
     end
 
+    def create_or_update(data)
+      triggerid = get_id(:description => data[:description])
+      triggerid ? update(data.merge(:triggerid => triggerid)) : create(data)
+    end
+
     def get_full_data(data)
       @client.api_request(:method => "trigger.get", :params => {:filter => data, :output => "extend"})
     end
 
     def get_id(data)
       result = get_full_data(data)
-      result.empty? ? nil : result[0]['triggerid'].to_i
+      triggerid = nil
+      result.each do |template|
+        triggerid = template['triggerid'].to_i if template['name'] == data[:name]
+      end
+      triggerid
     end
 
   end

data/lib/zabbixapi/users.rb

@@ -38,16 +38,11 @@ class ZabbixApi
 
     def get_id(data)
       result = get_full_data(data)
-      userid = -1
-      case @client.api_version
-        when "1.2"
-          result.each do |usr|
-            userid = usr['userid'] if usr['name'] == data[:name]
-          end
-          userid
-        else
-          result.empty? ? nil : result[0]['userid']
+      userid = nil
+      result.each do |usr|
+        userid = usr['userid'].to_i if usr['name'] == data[:name]
       end
+      userid
     end
 
     def update(data)

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/localhost.rb

@@ -1,7 +1,10 @@
 require 'zabbixapi'
 
 # settings
-api_url = 'http://localhost/api_jsonrpc.php'
+#api_url = 'http://zabbix/zabbix12/api_jsonrpc.php'
+api_url = 'http://zabbix/zabbix13/api_jsonrpc.php'
+#api_url = 'http://zabbix/zabbix20/api_jsonrpc.php'
+
 api_login = 'Admin'
 api_password = 'zabbix'
 
@@ -22,6 +25,8 @@ user = "user____1"
 user2 = "user____2"
 graph = "graph___a"
 
+puts "### Zabbix API server version #{zbx.server.version} ###"
+
 describe ZabbixApi, "test_api" do
 
   it "SERVER: Get version api" do
@@ -84,7 +89,7 @@ describe ZabbixApi, "test_api" do
       :key_ => "proc.num[aaa]",
       :hostid => zbx.templates.get_id(:host => template),
       :applications => [zbx.applications.get_id(:name => application)]
-    )
+    ).should be_kind_of(Integer)
   end
 
   it "ITEM: Full info check" do
@@ -102,6 +107,16 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
+  it "ITEM: Create or update" do
+    zbx.items.create_or_update(
+      :description => item,
+      :key_ => "proc.num[aaa]",
+      :type => 6,
+      :hostid => zbx.templates.get_id(:host => template),
+      :applications => [zbx.applications.get_id(:name => application)]
+    ).should be_kind_of(Integer)
+  end
+
   it "ITEM: Get unknown" do
     zbx.items.get_id(:description => "#{item}_____")
   end
@@ -114,6 +129,14 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
+  it "HOST: Update or create" do
+    zbx.hosts.create_or_update(
+      :host => host,
+      :ip => "10.20.48.89",
+      :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
+    ).should be_kind_of(Integer)
+  end
+
   it "HOST: Find unknown" do
     zbx.hosts.get_id(:host => "#{host}___").should be_kind_of(NilClass)
   end
@@ -135,15 +158,18 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Array)
   end
 
-  it "HOSTS: Linked host with templates" do
-    zbx.hosts.unlink_templates(
+  it "TEMPLATE: Linked hosts with templates" do
+    zbx.templates.mass_add(
       :hosts_id => [zbx.hosts.get_id(:host => host)],
       :templates_id => [zbx.templates.get_id(:host => template)]
     ).should be_kind_of(TrueClass)
   end
 
-  it "TEMPLATE: Unlink host from templates" do
-
+  it "TEMPLATE: Unlink hosts from templates" do
+    zbx.templates.mass_remove(
+      :hosts_id => [zbx.hosts.get_id(:host => host)],
+      :templates_id => [zbx.templates.get_id(:host => template)]
+    ).should be_kind_of(TrueClass)
   end
 
   it "TEMPLATE: Get all" do 
@@ -180,7 +206,10 @@ describe ZabbixApi, "test_api" do
       :width => "900",
       :height => "200"
     ).should be_kind_of(Integer)
-    #
+  end
+
+  it "GRAPH: Find ugititems" do
+    zbx.graphs.get_items( zbx.graphs.get_id(:name => graph) )
   end
 
   it "GRAPH: Find" do
@@ -197,6 +226,22 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
+  it "GRAPH: Create or Update" do
+    gitems = {
+      :itemid => zbx.items.get_id(:description => item), 
+      :calc_fnc => "3",
+      :type => "0",
+      :periods_cnt => "5"
+    }
+  zbx.graphs.create_or_update(
+    :gitems => [gitems],
+    :show_triggers => "1",
+    :name => graph,
+    :width => "900",
+    :height => "200"
+  ).should be_kind_of(Integer)
+  end
+
   it "GRAPH: Delete" do
     zbx.graphs.delete(zbx.graphs.get_id(:name => graph)).should be_kind_of(Integer)
   end

data/spec/run.rb

@@ -22,8 +22,9 @@ user = "user"
 user2 = "user2"
 graph = "graph"
 
-describe ZabbixApi, "test_api" do
+puts "### Zabbix API server version #{zbx.server.version} ###"
 
+describe ZabbixApi, "test_api" do
 
   it "SERVER: Get version api" do
     zbx.server.version.should be_kind_of(String)
@@ -85,7 +86,7 @@ describe ZabbixApi, "test_api" do
       :key_ => "proc.num[aaa]",
       :hostid => zbx.templates.get_id(:host => template),
       :applications => [zbx.applications.get_id(:name => application)]
-    )
+    ).should be_kind_of(Integer)
   end
 
   it "ITEM: Full info check" do
@@ -103,6 +104,16 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
+  it "ITEM: Create or update" do
+    zbx.items.create_or_update(
+      :description => item,
+      :key_ => "proc.num[aaa]",
+      :type => 6,
+      :hostid => zbx.templates.get_id(:host => template),
+      :applications => [zbx.applications.get_id(:name => application)]
+    ).should be_kind_of(Integer)
+  end
+
   it "ITEM: Get unknown" do
     zbx.items.get_id(:description => "#{item}_____")
   end
@@ -115,6 +126,14 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
+  it "HOST: Update or create" do
+    zbx.hosts.create_or_update(
+      :host => host,
+      :ip => "10.20.48.89",
+      :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
+    ).should be_kind_of(Integer)
+  end
+
   it "HOST: Find unknown" do
     zbx.hosts.get_id(:host => "#{host}___").should be_kind_of(NilClass)
   end
@@ -136,15 +155,18 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Array)
   end
 
-  it "HOSTS: Linked host with templates" do
-    zbx.hosts.unlink_templates(
+  it "TEMPLATE: Linked hosts with templates" do
+    zbx.templates.mass_add(
       :hosts_id => [zbx.hosts.get_id(:host => host)],
       :templates_id => [zbx.templates.get_id(:host => template)]
     ).should be_kind_of(TrueClass)
   end
 
-  it "TEMPLATE: Unlink host from templates" do
-
+  it "TEMPLATE: Unlink hosts from templates" do
+    zbx.templates.mass_remove(
+      :hosts_id => [zbx.hosts.get_id(:host => host)],
+      :templates_id => [zbx.templates.get_id(:host => template)]
+    ).should be_kind_of(TrueClass)
   end
 
   it "TEMPLATE: Get all" do 
@@ -181,7 +203,10 @@ describe ZabbixApi, "test_api" do
       :width => "900",
       :height => "200"
     ).should be_kind_of(Integer)
-    #
+  end
+
+  it "GRAPH: Find ugititems" do
+    zbx.graphs.get_items( zbx.graphs.get_id(:name => graph) )
   end
 
   it "GRAPH: Find" do
@@ -198,6 +223,22 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
+  it "GRAPH: Create or Update" do
+    gitems = {
+      :itemid => zbx.items.get_id(:description => item), 
+      :calc_fnc => "3",
+      :type => "0",
+      :periods_cnt => "5"
+    }
+  zbx.graphs.create_or_update(
+    :gitems => [gitems],
+    :show_triggers => "1",
+    :name => graph,
+    :width => "900",
+    :height => "200"
+  ).should be_kind_of(Integer)
+  end
+
   it "GRAPH: Delete" do
     zbx.graphs.delete(zbx.graphs.get_id(:name => graph)).should be_kind_of(Integer)
   end
@@ -257,9 +298,9 @@ describe ZabbixApi, "test_api" do
 
   it "QUERY" do
     zbx.query(
-        :method => "apiinfo.version",
-        :params => {}
+      :method => "apiinfo.version", 
+      :params => {}
     ).should be_kind_of(String)
   end
 
-end
+end

data/zabbixapi.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/vadv/zabbixapi"
   s.summary     = %q{Realization for Zabbix API.}
   s.description = %q{Allows you to work with zabbix api from ruby.}
+  s.licenses    = ["MIT"]
 
   s.rubyforge_project = "zabbixapi"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies: []
 description: Allows you to work with zabbix api from ruby.
 email:
@@ -19,6 +19,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -41,7 +43,8 @@ files:
 - spec/run.rb
 - zabbixapi.gemspec
 homepage: https://github.com/vadv/zabbixapi
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -54,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2483481549934941207
+      hash: 4393999547783440369
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -67,6 +70,4 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Realization for Zabbix API.
-test_files:
-- spec/localhost.rb
-- spec/run.rb
+test_files: []