zbxapi 0.1.386 → 0.1.397

data/api_classes/item.rb

@@ -67,6 +67,15 @@ class ZbxAPI_Item < ZbxAPI_Sub
     return obj['result']
   end
 
+  def update(options)
+    debug(8,:var=>options)
+    checkauth
+    checkversion(1,1)
+
+    obj=do_request(json_obj('item.update', options))
+    return obj['result']
+  end
+
   # Alias function for code written against 1.0 API
   def add(options)
     puts "WARNING API Function Item.add is deprecated and will be removed in the future without further warning"

data/zbxapi.rb

@@ -19,8 +19,8 @@
 #--
 ##########################################
 # Subversion information
-# $Id: zbxapi.rb 386 2012-04-23 07:01:49Z nelsonab $
-# $Revision: 386 $
+# $Id: zbxapi.rb 397 2012-05-21 17:20:37Z nelsonab $
+# $Revision: 397 $
 ##########################################
 #++
 
@@ -46,6 +46,7 @@ require 'json'
 require 'pp'
 
 require "api_classes/application"
+require "api_classes/graph"
 require "api_classes/history"
 require "api_classes/host"
 require "api_classes/host_group"
@@ -75,7 +76,7 @@ class ZabbixAPI
   #subordinate class
   attr_accessor :user # [User#new]
   #subordinate class
-  attr_accessor :usergroup, :host, :item, :hostgroup, :application, :trigger, :sysmap, :history, :proxy
+  attr_accessor :usergroup, :host, :item, :hostgroup, :application, :trigger, :sysmap, :history, :proxy, :graph
   @id=0
   @auth=''
   @url=nil
@@ -110,8 +111,9 @@ class ZabbixAPI
     @trigger = ZbxAPI_Trigger.new(self)
     @sysmap = ZbxAPI_Sysmap.new(self)
     @history = ZbxAPI_History.new(self)
+    @graph = ZbxAPI_Graph.new(self)
     @id=0
-    @proxy=nil
+    @http_proxy=nil
 
     debug(6,:msg=>"protocol: #{@url.scheme}, host: #{@url.host}")
     debug(6,:msg=>"port: #{@url.port}, path: #{@url.path}")
@@ -119,7 +121,7 @@ class ZabbixAPI
   end
 
   def set_proxy(address,port,user=nil,password=nil)
-    @proxy={:address=>address, :port=>port,
+    @http_proxy={:address=>address, :port=>port,
             :user=>user, :password=>password}
   end
 
@@ -186,7 +188,7 @@ class ZabbixAPI
       @auth=result['result']
 
       #setup the version variables
-      @major,@minor=do_request(json_obj('APIInfo.version',{}))['result'].split('.')
+      @major,@minor=do_request(json_obj('apiinfo.version',{}))['result'].split('.')
       @major=@major.to_i
       @minor=@minor.to_i
     rescue ZbxAPI_ExceptionLoginPermission => e
@@ -273,9 +275,9 @@ class ZabbixAPI
   end
 
   def get_http_obj
-    if @proxy
-      http = Net::HTTP::Proxy(@proxy[:address],@proxy[:port],
-            @proxy[:user],@proxy[:password]).new(@url.host,@url.port)
+    if @http_proxy
+      http = Net::HTTP::Proxy(@http_proxy[:address],@http_proxy[:port],
+            @http_proxy[:user],@http_proxy[:password]).new(@url.host,@url.port)
     else
       http = Net::HTTP.new(@url.host, @url.port)
     end
@@ -333,7 +335,7 @@ class ZabbixAPI
 		  redirects+=1
 			retry if redirects<=5
 			raise ZbxAPI_GeneralError, "Too many redirects"
-    rescue NoMethodError
+    rescue NoMethodError => e
       raise ZbxAPI_GeneralError.new("Unable to connect to #{@url.host} : \"#{e}\"", :retry=>false)
     end
   end

data/zbxapi/revision.rb

@@ -4,4 +4,4 @@
 #the rakefile was run
 
 ZBXAPI_VERSION="0.1"
-ZBXAPI_REVISION="386"
+ZBXAPI_REVISION="397"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zbxapi
 version: !ruby/object:Gem::Version 
-  version: 0.1.386
+  version: 0.1.397
 platform: ruby
 authors: 
 - A. Nelson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 -04:00
+date: 2012-05-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency