zbxapi 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c078a90f1aa2ae9df5568188547fe6140d5f16c
-  data.tar.gz: e9623098f38c3b9b9a180bff52347fadf09b710b
+  metadata.gz: 38a9412b166183c0bd43d087a9aaa9a5ad87b81e
+  data.tar.gz: 5fcd9d06059a7c9c66fc67e4c7daf6dde306e57a
 SHA512:
-  metadata.gz: b9c4da2662fbdb9c25288e840cb6af0892fbdf094a5eb75e796dd8b231e0917d8c8be7327e997d9bfde19cd45524cd58c25be61830fadc3aa8ec46d17f03ebeb
-  data.tar.gz: 9e45e6997e456fa25532fbfae9aa694a34a945980417675f657b675f4e85e6a76a9b471b2b33c113cfe0176105e40c19d039df4a13b1bcba21559874180ac8b0
+  metadata.gz: 31ff6131737c3746f8f02e5a4f189407d459070c307a7d5a5abdb7f7a24bb3ca3321222e4d36c8bc2c55c59e9ef496d07f0fdd4f079b6f50d9958a1706a3ef44
+  data.tar.gz: 6ec95b61956ef2f18a08a3b03c5fb9395bb9f70bc77e7910d0e96b3b61a98e74ba8a3c1769b92c43adef615ff7e6edcc86e4caa710331c9e2da90e3a9f250d4e

data/api_classes/dsl_host.rb

@@ -19,7 +19,6 @@
 require "api_classes/api_dsl"
 
 class Host < ZabbixAPI_Base
-  actions :update, :massAdd, :massUpdate, :massRemove
 
   action :get do
     #arg_processor "1.3" do |params|
@@ -46,6 +45,22 @@ class Host < ZabbixAPI_Base
       add "selectGroups"
     end
 
+    parameters "2.4" do
+      add "groupids","applicationids","dserviceids","graphids","hostids",
+          "httptestids","interfaceids","itemids","maintenanceids","monitored_hosts",
+          "proxy_hosts","proxyids","templated_hosts","templateids","triggerids",
+          "with_items","with_applications","with_graphs","with_httptests",
+          "with_monitored_httptests","with_monitored_items",
+          "with_monitored_triggers","with_simple_graph_items","with_triggers",
+          "withInventory","selectGroups","selectApplications","selectDiscoveries",
+          "selectDiscoveryRule","selectGraphs","selectHostDiscovery",
+          "selectHttpTests","selectInterfaces","selectInventory","selectItems",
+          "selectMacros","selectParentTemplates","selectScreens","selectTriggers",
+          "filter","limitSelects","search","searchInventory","sortfield",
+          "countOutput","editable","excludeSearch","limit","output","preservekeys",
+          "searchByAny","searchWildcardsEnabled","sortorder","startSearch"
+    end
+
     #parameters "3.0" do
     #  inherit from "2.0"
     #  remove "select_macros","preserve_keys","extendoutput"
@@ -73,6 +88,17 @@ class Host < ZabbixAPI_Base
       add "interfaces","macros"
       requires "interfaces"
     end
+
+    parameters "2.4" do
+      add "hostid","host","available","description","disable_until","error",
+      "errors_from","flags","ipmi_authtype","ipmi_available",
+      "ipmi_disable_until","ipmi_error","ipmi_errors_from","ipmi_password",
+      "ipmi_privilege","ipmi_username","jmx_available","jmx_disable_until",
+      "jmx_error","jmx_errors_from","maintenance_from","maintenance_status",
+      "maintenance_type","maintenanceid","name","proxy_hostid","snmp_available",
+      "snmp_disable_until","snmp_error","snmp_errors_from","status"
+      requires "host","groups","interfaces"
+    end
   end
 
   action :delete do
@@ -88,4 +114,48 @@ class Host < ZabbixAPI_Base
     end
   end
 
+  action :massadd do
+    parameters "2.4" do
+      add "hosts","groups","interfaces","macros","templates"
+      requires "hosts"
+    end
+  end
+
+  action :massremove do
+    parameters "2.4" do
+      add "hostids","groupids","interfaces","macros","templateids",
+      "templateids_clear"
+      requires "hostids"
+    end
+  end
+
+  action :update do
+    parameters "2.4" do
+      add "hostid","host","available","description","disable_until","error",
+      "errors_from","flags","ipmi_authtype","ipmi_available",
+      "ipmi_disable_until","ipmi_error","ipmi_errors_from","ipmi_password",
+      "ipmi_privilege","ipmi_username","jmx_available","jmx_disable_until",
+      "jmx_error","jmx_errors_from","maintenance_from","maintenance_status",
+      "maintenance_type","maintenanceid","name","proxy_hostid","snmp_available",
+      "snmp_disable_until","snmp_error","snmp_errors_from","status"
+      requires "host"
+    end
+  end
+
+  action :massupdate do
+    parameters "2.4" do
+      add "hostid","host","available","description","disable_until","error",
+      "errors_from","flags","ipmi_authtype","ipmi_available",
+      "ipmi_disable_until","ipmi_error","ipmi_errors_from","ipmi_password",
+      "ipmi_privilege","ipmi_username","jmx_available","jmx_disable_until",
+      "jmx_error","jmx_errors_from","maintenance_from","maintenance_status",
+      "maintenance_type","maintenanceid","name","proxy_hostid","snmp_available",
+      "snmp_disable_until","snmp_error","snmp_errors_from","status"
+      requires "host","hosts"
+    end
+  end
+
+  alias :massAdd :massadd
+  alias :massRemove :massremove
+  alias :massUpdate :massupdate
 end

data/api_classes/dsl_trigger.rb

@@ -27,15 +27,17 @@
 require "api_classes/api_dsl"
 
 class Trigger < ZabbixAPI_Base
-end
+  action :create do
+    parameters "2.4" do
+      add "triggerid","description","expression","comments","error","flags",
+      "lastchange","priority","state","status","templateid","type","url",
+      "value","dependencies"
+      requires "description","expression"
+    end
+  end
 
-Trigger.addDependencies
-Trigger.create
-Trigger.delete
-Trigger.deleteDependencies
-Trigger.exists
-Trigger.get do
-  parameters "1.3",
+  action :get do
+    parameters "1.3",
       'triggerids', "select_functions", "nodeids", "groupids", "templateids",
       "hostids", "itemids", "applicationids", "functions", "inherited", "templated", "monitored",
       "active", "maintenance", "withUnacknowledgedEvents", "withAcknowledgedEvents",
@@ -44,6 +46,43 @@ Trigger.get do
       "startSearch", "excludeSearch", "searchWildcardsEnabled", "output", "expandData",
       "expandDescription", "select_groups", "select_hosts", "select_items", "select_dependencies",
       "countOutput", "groupOutput", "preservekeys", "sortfield", "sortorder", "limit"
+
+    parameters "2.4" do
+      add "triggerids","groupids","templateids","hostids","itemids",
+      "applicationids","functions","group","host","inherited","templated",
+      "monitored","active","maintenance","withUnacknowledgedEvents",
+      "withAcknowledgedEvents","withLastEventUnacknowledged","skipDependent",
+      "lastChangeSince","lastChangeTill","only_true","min_severity",
+      "expandComment","expandDescription","expandExpression","selectGroups",
+      "selectHosts","selectItems","selectFunctions","selectDependencies",
+      "selectDiscoveryRule","selectLastEvent","filter","limitSelects",
+      "sortfield","countOutput","editable","excludeSearch","limit","output",
+      "preservekeys","search","searchByAny","searchWildcardsEnabled",
+      "sortorder","startSearch"
+      #deprecate "expandData"
+    end
+  end
+
+  action :adddependencies do
+    parameters "2.4" do
+      add       "triggerid","dependsOnTriggerid"
+      requires "triggerid","dependsOnTriggerid"
+    end
+  end
+
+  action :update do
+    parameters "2.4" do
+      add       "triggerid","description","expression","comments","error","flags",
+      "lastchange","priority","state","status","templateid","type","url",
+      "value","dependencies"
+      requires "description","expression"
+    end
+  end
+
+  alias :addDependencies :adddependencies
 end
-Trigger.update
+
+Trigger.delete
+Trigger.deleteDependencies
+Trigger.exists
 

data/zbxapi.rb

@@ -70,20 +70,8 @@ class ZabbixAPI
 
   attr_accessor :method, :params, :debug_level, :auth, :verify_ssl, :proxy_server
 
-  @id=0
-  @auth=''
-  @url=nil
-  @verify_ssl=true
-  @proxy_server=nil
-  @custom_headers={}
-
-  private
-    @user_name=''
-    @password=''
-
-
-    class Redirect < Exception #:nodoc: all
-    end
+  class Redirect < Exception #:nodoc: all
+  end
 
   public
 
@@ -112,6 +100,16 @@ class ZabbixAPI
       options={:debug=>0,:returntype=>:result}
     end
 
+    #intialization of instance variables must happen inside of instantiation
+    @id=0
+    @auth=''
+    @url=nil
+    @verify_ssl=true
+    @proxy_server=nil
+    @custom_headers={}
+    @user_name=''
+    @password=''
+
     set_debug_level(options[:debug] || 0)
     @returntype=options[:returntype] || :result
     @orig_url=url  #save the original url
@@ -167,7 +165,6 @@ class ZabbixAPI
     debug(6,:msg=>"query: #{@url.query}, fragment: #{@url.fragment}")
 
     if block_given?
-      puts "block"
       yield(self)
     end
   end
@@ -197,6 +194,12 @@ class ZabbixAPI
         'auth'=>@auth,
         'id'=>@id
       }
+
+    # Zabbix Doc(2.4): This method is available to unauthenticated
+    #  users and must be called without the auth parameter
+    #  in the JSON-RPC request.
+    obj.delete("auth") if method =~ /APIInfo/i
+
     debug(10, :msg=>"json_obj:  #{obj}")
     return obj.to_json
   end
@@ -254,7 +257,7 @@ class ZabbixAPI
         raise ZbxAPI_ExceptionBadAuth.new('Invalid User or Password',:error_code=>e.error_code)
       end
     rescue SocketError
-      raise ZbxAPI_ExceptionBadServerUrl
+      raise ZbxAPI_ExceptionBadServerUrl.new("Socket Error")
     rescue JSON::ParserError
       raise ZbxAPI_ExceptionBadServerUrl
     rescue Errno::ECONNREFUSED
@@ -399,7 +402,6 @@ class ZabbixAPI
       http=select_http_obj
       response = nil
 #    http.set_debug_output($stderr)                                  #Uncomment to see low level HTTP debug
-
       headers={
         'Content-Type'=>'application/json-rpc',
         'User-Agent'=>'Zbx Ruby CLI'
@@ -435,12 +437,12 @@ class ZabbixAPI
         end
       end
 
-		  return resp
+      return resp
 
-		rescue Redirect
-		  redirects+=1
-			retry if redirects<=5
-			raise ZbxAPI_GeneralError, "Too many redirects"
+    rescue Redirect
+      redirects+=1
+      retry if redirects<=5
+      raise ZbxAPI_GeneralError, "Too many redirects"
     rescue NoMethodError
       raise ZbxAPI_GeneralError.new("Unable to connect to #{@url.host}: \"#{e}\"", :retry=>false)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zbxapi
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - A. Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json