zabbixapi 0.4.2 → 0.4.3

data/Gemfile

@@ -1,4 +1,4 @@
 source :rubygems
 
 gem "rspec"
-gem "rake"
+gem "rake"

data/lib/zabbixapi/applications.rb

@@ -31,9 +31,7 @@ class ZabbixApi
     def get_id(data)
       result = get_full_data(data)
       applicationid = nil
-      result.each do |app|
-        applicationid = app['applicationid'].to_i if app['name'] == data[:name]
-      end
+      result.each { |app| applicationid = app['applicationid'].to_i if app['name'] == data[:name] }
       applicationid
     end
 

data/lib/zabbixapi/client.rb

@@ -25,6 +25,12 @@ class ZabbixApi
     def initialize(options = {})
       @options = options
       @auth_hash = auth
+      unless ENV['http_proxy'].nil?
+        @proxy_uri = URI.parse(ENV['http_proxy'])
+        @proxy_host = @proxy_uri.host
+        @proxy_port = @proxy_uri.port
+        @proxy_user, @proxy_pass = @proxy_uri.userinfo.split(/:/) if @proxy_uri.userinfo
+      end
     end
 
     def message_json(body)
@@ -40,7 +46,11 @@ class ZabbixApi
 
     def http_request(body)
       uri = URI.parse(@options[:url])
-      http = Net::HTTP.new(uri.host, uri.port)
+      unless @proxy_uri.nil? 
+        http = Net::HTTP.new(uri.host, uri.port)
+      else
+        http = Net::HTTP.Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_pass).new(uri.host, uri.port)
+      end
       request = Net::HTTP::Post.new(uri.request_uri)
       request.add_field('Content-Type', 'application/json-rpc')
       request.body = body

data/lib/zabbixapi/errors.rb

@@ -9,4 +9,7 @@ class ZabbixApi
   class HttpError < BaseError
   end
 
+  class SocketError < BaseError
+  end
+
 end

data/lib/zabbixapi/graphs.rb

@@ -40,9 +40,7 @@ class ZabbixApi
     def get_id(data)
       result = @client.api_request(:method => "graph.get", :params => {:filter => {:name=> data[:name]}, :output => "extend"})
       graphid = nil
-      result.each do |graph|
-        graphid = graph['graphid'].to_i if graph['name'] == data[:name]
-      end
+      result.each { |graph| graphid = graph['graphid'].to_i if graph['name'] == data[:name] }
       graphid
     end
 
@@ -54,7 +52,7 @@ class ZabbixApi
     def update(data)
       case @client.api_version
         when "1.2"
-          return -1
+          @client.api_request(:method => "graph.update", :params => data) 
         else
           result = @client.api_request(:method => "graph.update", :params => data)
           result.empty? ? nil : result['graphids'][0].to_i

data/lib/zabbixapi/hostgroups.rb

@@ -24,6 +24,11 @@ class ZabbixApi
       delete(data)
     end
 
+    def create_or_update(data)
+      hostgroupid = get_id(:name => data[:name])
+      hostgroupid ? update(data.merge(:groupid => hostgroupid)) : create(data)
+    end
+
     def get_full_data(data)
       case @client.api_version 
         when "1.2"
@@ -36,9 +41,7 @@ class ZabbixApi
     def get_id(data)
       result = get_full_data(data)
       hostgroupid = nil
-      result.each do |hgroup|
-        hostgroupid = hgroup['groupid'].to_i if hgroup['name'] == data[:name]
-      end
+      result.each { |hgroup| hostgroupid = hgroup['groupid'].to_i if hgroup['name'] == data[:name] }
       hostgroupid
     end
 

data/lib/zabbixapi/hosts.rb

@@ -79,9 +79,7 @@ class ZabbixApi
     def get_id(data)
       result = get_full_data(data)
       hostid = nil
-      result.each do |host|
-        hostid = host['hostid'].to_i if host['host'] == data[:host]
-      end
+      result.each { |host| hostid = host['hostid'].to_i if host['host'] == data[:host] }
       hostid
     end
 

data/lib/zabbixapi/items.rb

@@ -61,9 +61,7 @@ class ZabbixApi
     def get_id(data)
       result = get_full_data(data)
       itemid = nil
-      result.each do |item|
-        itemid = item['itemid'].to_i if item['name'] == data[:name]
-      end
+      result.each { |item| itemid = item['itemid'].to_i if item['name'] == data[:name] }
       itemid
     end
 

data/lib/zabbixapi/templates.rb

@@ -6,24 +6,46 @@ class ZabbixApi
       @options = options
     end
 
+    # Create template
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :host => "Template_Name" and :groups => array with hostgroup ids
+    # * *Returns* :
+    #   - Nil or Integer
     def create(data)
       result = @client.api_request(:method => "template.create", :params => [data])
       result.empty? ? nil : result['templateids'][0].to_i
     end
 
+    # Add template
+    # Synonym create
     def add(data)
       create(data)
     end
 
+    # Delete template
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :host => "Template_Name"
+    # * *Returns* :
+    #   - Nil or Integer
     def delete(data)
       result = @client.api_request(:method => "template.delete", :params => [:templateid => data])
       result.empty? ? nil : result['templateids'][0].to_i
     end
 
+    # Destroy template
+    # Synonym delete
     def destroy(data)
       delete(data)
     end
 
+    # Return templateids linked with host 
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :hostids => [hostid]
+    # * *Returns* :
+    #   - Array with templateids
     def get_ids_by_host(data)
       result = []
       @client.api_request(:method => "template.get", :params => data).each do |tmpl|
@@ -32,6 +54,12 @@ class ZabbixApi
       result
     end
 
+    # Analog Zabbix api call massAdd 
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :hosts_id => [hostid1, hostid2 ...], and :templates_id => [templateid1, templateid2 ...]
+    # * *Returns* :
+    #   - True or False
     def mass_add(data)
       result = @client.api_request(
         :method => "template.massAdd", 
@@ -43,6 +71,12 @@ class ZabbixApi
       result.empty? ? false : true
     end
 
+    # Analog Zabbix api call massRemove
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :hosts_id => [hostid1, hostid2 ...], and :templates_id => [templateid1, templateid2 ...]
+    # * *Returns* :
+    #   - True or False
     def mass_remove(data)
       result = @client.api_request(
         :method => "template.massRemove", 
@@ -54,6 +88,10 @@ class ZabbixApi
       result.empty? ? false : true      
     end
 
+    # Return all templates
+    # 
+    # * *Returns* :
+    #   - Hash with {"Template_Name1" => "templateid1", "Template_Name2" => "templateid2"}
     def all
       result = {}
       case @client.api_version
@@ -69,6 +107,12 @@ class ZabbixApi
       result
     end
 
+    # Return info about template
+    # 
+    # * *Args*    : 
+    #   - +data+ -> Hash with :host => "Template name"
+    # * *Returns* :
+    #   - Hash with template info
     def get_full_data(data)
       case @client.api_version
         when "1.2"
@@ -80,12 +124,15 @@ class ZabbixApi
       end
     end
 
+    # Return info about template
+    # 
+    # * *Args*    : 
+    #   - +data+ -> Hash with :host => "Template name"
+    # * *Returns* :
+    #   - Nil or Integer
     def get_id(data)
-      result = get_full_data(data)
       templateid = nil
-      result.each do |template|
-        templateid = template['templateid'].to_i if template['host'] == data[:host]
-      end
+      get_full_data(data).each { |template| templateid = template['templateid'].to_i if template['host'] == data[:host] }
       templateid
     end
 

data/lib/zabbixapi/triggers.rb

@@ -26,7 +26,7 @@ class ZabbixApi
 
     def update(data)
       result = @client.api_request(:method => "trigger.update", :params => data)
-      result.empty? ? nil : result['triggerid'][0].to_i
+      result.empty? ? nil : result['triggerids'][0].to_i
     end
 
     def create_or_update(data)
@@ -41,9 +41,7 @@ class ZabbixApi
     def get_id(data)
       result = get_full_data(data)
       triggerid = nil
-      result.each do |template|
-        triggerid = template['triggerid'].to_i if template['name'] == data[:name]
-      end
+      result.each { |template| triggerid = template['triggerid'].to_i if template['name'] == data[:name] }
       triggerid
     end
 

data/lib/zabbixapi/users.rb

@@ -39,9 +39,7 @@ class ZabbixApi
     def get_id(data)
       result = get_full_data(data)
       userid = nil
-      result.each do |usr|
-        userid = usr['userid'].to_i if usr['name'] == data[:name]
-      end
+      result.each { |usr| userid = usr['userid'].to_i if usr['name'] == data[:name] }
       userid
     end
 

data/lib/zabbixapi/version.rb

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

data/spec/localhost.rb

@@ -45,6 +45,10 @@ describe ZabbixApi, "test_api" do
     zbx.hostgroups.get_id(:name => "#{hostgroup}______").should be_kind_of(NilClass)
   end
 
+  it "HOSTGROUP: Create or update" do
+    zbx.hostgroups.create_or_update(:name => hostgroup).should be_kind_of(Integer)
+  end
+
   it "TEMPLATE: Create" do
     zbx.templates.create(
       :host => template,
@@ -208,7 +212,7 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
-  it "GRAPH: Find ugititems" do
+  it "GRAPH: Find gititems" do
     zbx.graphs.get_items( zbx.graphs.get_id(:name => graph) )
   end
 

data/spec/run.rb

@@ -169,7 +169,7 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(TrueClass)
   end
 
-  it "TEMPLATE: Get all" do 
+  it "TEMPLATE: Get all" do
     zbx.templates.all.should be_kind_of(Hash)
   end
 
@@ -189,12 +189,12 @@ describe ZabbixApi, "test_api" do
     zbx.triggers.get_id(:description => trigger).should be_kind_of(Integer)
   end
 
-  it "GRAPH: Create" do 
+  it "GRAPH: Create" do
     gitems = {
-        :itemid => zbx.items.get_id(:description => item), 
-        :calc_fnc => "2",
-        :type => "0",
-        :periods_cnt => "5"
+      :itemid => zbx.items.get_id(:description => item),
+      :calc_fnc => "2",
+      :type => "0",
+      :periods_cnt => "5"
     }
     zbx.graphs.create(
       :gitems => [gitems],
@@ -205,7 +205,7 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(Integer)
   end
 
-  it "GRAPH: Find ugititems" do
+  it "GRAPH: Find gititems" do
     zbx.graphs.get_items( zbx.graphs.get_id(:name => graph) )
   end
 
@@ -218,25 +218,25 @@ describe ZabbixApi, "test_api" do
       :graphid => zbx.graphs.get_id(
         :name => graph,
         :hostid => zbx.hosts.get_id(:host => host)
-      ), 
+      ),
       :ymax_type => 1
     ).should be_kind_of(Integer)
   end
 
   it "GRAPH: Create or Update" do
     gitems = {
-      :itemid => zbx.items.get_id(:description => item), 
+      :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)
+    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
@@ -298,9 +298,9 @@ describe ZabbixApi, "test_api" do
 
   it "QUERY" do
     zbx.query(
-      :method => "apiinfo.version", 
+      :method => "apiinfo.version",
       :params => {}
     ).should be_kind_of(String)
   end
-
-end
+  
+end

data/zabbixapi.gemspec

@@ -10,7 +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.licenses    = %w(MIT)
 
   s.rubyforge_project = "zabbixapi"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies: []
 description: Allows you to work with zabbix api from ruby.
 email:
@@ -57,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4393999547783440369
+      hash: -2337601613432576299
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -70,4 +70,6 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Realization for Zabbix API.
-test_files: []
+test_files:
+- spec/localhost.rb
+- spec/run.rb