zabcon 0.0.370 → 0.0.392

data/libs/revision.rb

@@ -1 +1 @@
-REVISION=370
+REVISION=392

data/libs/utility_items.rb

@@ -17,8 +17,8 @@
 
 ##########################################
 # Subversion information
-# $Id: utility_items.rb 361 2011-12-19 00:21:52Z richlv $
-# $Revision: 361 $
+# $Id: utility_items.rb 379 2012-04-21 03:43:19Z nelsonab $
+# $Revision: 379 $
 ##########################################
 
 require "zbxapi/zdebug"
@@ -27,8 +27,27 @@ Object.class_eval do
   def env
     EnvVars.instance
   end
+
+  def vars
+    GlobalVars.instance
+  end
 end
 
+Hash.class_eval do
+  def select_keys(keys)
+    result={}
+    keys.each {|k|
+      result.merge!({k=>self[k]})
+    }
+    result
+  end
+
+  def delete_keys(keys)
+    keys.each {|k|
+      self.delete(k)
+    }
+  end
+end
 
 String.class_eval do
 # String::split2(*options)

data/libs/zabbix_server.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabbix_server.rb 370 2011-12-22 05:51:45Z nelsonab $
-# $Revision: 370 $
+# $Id: zabbix_server.rb 384 2012-04-23 04:50:17Z nelsonab $
+# $Revision: 384 $
 ##########################################
 
 require 'yaml'
@@ -60,57 +60,72 @@ class ZabbixServer
     end
   end
 
-  attr_accessor :server_url, :username, :password
+#  attr_accessor :server_url, :username, :password
   attr_reader :version, :connected, :connection
 
   def initialize
-    @server_url=nil
-    @username=nil
-    @password=nil
+    @credentials={}
+    #@server_url=nil
+    #@username=nil
+    #@password=nil
     @connected=false
     @version=nil
     @connection=nil
   end
 
+  def server_url
+    @credentials["server"]
+  end
+
+  def server_url=(server)
+    @credentials["server"]=server
+  end
+
+  def username
+    @credentials["username"]
+  end
+
+  def username=(username)
+    @credentials["username"]=username
+  end
+
+  def password
+    @credentials["password"]
+  end
+
+  def password=(password)
+    @credentials["password"]=password
+  end
+
   #login
   # Perform the actual login to the Zabbix server
   # If the object variables url, username, and password have not been
   # set previously, an attempt will be made to use the global environment
   # variables.  If that does not work an exception will be raised.
-  def login
-    @server_url = @server_url.nil? ? env["server"] : @server_url
-    @username = @username.nil? ? env["username"] : @username
-    @password = @password.nil? ? env["password"] : @password
+  def login(server={})
+    @credentials.merge!(server)
 
     error_msg=[]
-    error_msg<<"Url not set" if @server_url.nil?
-    error_msg<<"Username not set" if @username.nil?
-    error_msg<<"Password not set" if @password.nil?
+    error_msg<<"Url not set" if !@credentials["server"]
+    error_msg<<"Username not set" if !@credentials["username"]
+    error_msg<<"Password not set" if !@credentials["password"]
 
     raise ConnectionProblem.new(error_msg.join(", ")) if !error_msg.empty?
 
-    @connection = ZabbixServer_overload.new(@server_url,env["debug"])
-    if env["proxy_server"]
-      puts "proxy server"
-      p env["proxy_server"],env["proxy_port"],env["proxy_user"],env["proxy_password"]
-      @connection.set_proxy(env["proxy_server"],env["proxy_port"],
-            env["proxy_user"],env["proxy_password"])
+    @connection = ZabbixServer_overload.new(@credentials["server"],env["debug"])
+    if @credentials["proxy_server"]
+      @connection.set_proxy(@credentials["proxy_server"],@credentials["proxy_port"],
+            @credentials["proxy_user"],@credentials["proxy_password"])
     end
-    @connection.login(@username,@password)
+    @connection.login(@credentials["username"],@credentials["password"])
     @connected=true
-    GlobalVars.instance["auth"]=@connection.auth
+    ServerCredentials.instance[@credentials["name"]]["auth"]=
+        @connection.auth
     @version=@connection.API_version
     puts "#{@server_url} connected"  if env["echo"]
     puts "API Version: #{@version}"  if env["echo"]
 
-    if env["session_file"] && !env["session_file"].empty?
-      path=File.expand_path(env["session_file"])
-      File.open(path,"w") do |f|
-        f.write({"auth"=>@connection.auth}.to_yaml)
-      end
-      #Enforce that the auth cache file isn't world readable
-      File.chmod(0600,path)
-    end
+    save_auth
 
   end
 
@@ -124,16 +139,46 @@ class ZabbixServer
       @connection=nil
       @connected=false
       @version=nil
+
+      if @credentials["name"]
+        ServerCredentials.instance[@credentials["name"]].delete("auth")
+      end
       GlobalVars.instance.delete("auth")
-      puts "Logout complete from #{@server_url}" if env["echo"]
+      save_auth
+      puts "Logout complete from #{server_url}" if env["echo"]
+    end
+  end
+
+  def save_auth
+    if env["session_file"] && !env["session_file"].empty?
+      path=File.expand_path(env["session_file"])
+      creds={}
+      ServerCredentials.instance.each {|name,values|
+        creds[name]=values["auth"] if values["auth"]
+      }
+      File.open(path,"w") do |f|
+        f.write({"auth"=>creds}.to_yaml)
+      end
+      #Enforce that the auth cache file isn't world readable
+      File.chmod(0600,path)
     end
+
   end
 
-  def use_auth(auth)
-    @server_url = @server_url.nil? ? env["server"] : @server_url
+  def use_auth(server)
+    debug(6,:msg=>"Server",:var=>server)
+    @credentials.merge!(server)
+    debug(6,:msg=>"credentials",:var=>@credentials)
+
+#    @server_url = server["server"] || @server_url
+
+    @connection = ZabbixServer_overload.new(server_url,env["debug"])
+    @connection.auth=@credentials["auth"]
+    if @credentials["proxy_server"]
+      @connection.set_proxy(@credentials["proxy_server"],@credentials["proxy_port"],
+            @credentials["proxy_user"],@credentials["proxy_password"])
+    end
 
-    @connection = ZabbixServer_overload.new(@server_url,env["debug"])
-    @connection.auth=auth
     major,minor=@connection.do_request(@connection.json_obj('APIInfo.version',{}))['result'].split('.')
     @connection.major=major.to_i
     @connection.minor=minor.to_i
@@ -163,107 +208,6 @@ class ZabbixServer
     @connection.login(@user,@password)
   end
 
-#  def getuser(parameters)
-#    debug(6,parameters)
-#
-#    result=@connection.user.get(parameters)
-#    {:class=>:user, :result=>result}
-#  end
-#
-#  def gethost(parameters)
-#    debug(6,parameters)
-#
-#    result=@connection.host.get(parameters)
-#    {:class=>:host, :result=>result}
-#  end
-
-#  def addhost(parameters)
-#    debug(6,parameters)
-#    result=@connection.host.create(parameters)
-#    {:class=>:host, :message=>"The following host was created: #{result['hostids']}", :result=>result}
-#  end
-
-#  def deletehost(parameters)
-#    debug(6,parameters)
-#    result=@connection.host.delete(parameters)
-#    {:class=>:host, :message=>"The following host(s) was/were deleted: #{result['hostids']}", :result=>result}
-#  end
-
-#  def getitem(parameters)
-#    debug(6,parameters)
-#
-#    result=@connection.item.get(parameters)
-#    {:class=>:item, :result=>result}
-#  end
-
-#  def additem(parameters)
-#    debug(6,parameters)
-#    {:class=>:item, :result=>@connection.item.create(parameters)}
-#  end
-
-#  def deleteitem(parameters)
-#    debug(6,parameters)
-#    {:class=>:item, :result=>@connection.item.delete(parameters)}
-#  end
-
-#  def adduser(parameters)
-#    debug(6,parameters)
-#    begin
-#      uid=@connection.user.create(parameters)
-#      puts "Created userid: #{uid["userids"]}"
-#    rescue ZbxAPI_ParameterError => e
-#      puts "Add user failed, error: #{e.message}"
-#    end
-#  end
-
-#  def deleteuser(parameter)
-#    debug(6,parameter)
-#    id=0  #id to delete
-##    if parameters.nil? then
-##      puts "User id required"
-##      return
-##    end
-#
-#    if !parameter["name"].nil?
-#      users=@connection.user.get({"pattern"=>parameter["name"], "extendoutput"=>true})
-#      users.each { |user| id=user["userid"] if user["alias"]==parameter }
-#    else
-#      id=parameter["id"]
-#    end
-#    result=@connection.user.delete(id)
-#    if !result.empty?
-#      puts "Deleted user id #{result["userids"]}"
-#    else
-#      puts "Error deleting #{parameter.to_a[0][1]}"
-#    end
-#  end
-
-#  def updateuser(parameters)
-#    debug(6,parameters)
-#    valid_parameters=['userid','name', 'surname', 'alias', 'passwd', 'url', 'autologin',
-#                      'autologout', 'lang', 'theme', 'refresh', 'rows_per_page', 'type',]
-#    if parameters.nil? or parameters["userid"].nil? then
-#      puts "Edit User requires arguments, valid fields are:"
-#      puts "name, surname, alias, passwd, url, autologin, autologout, lang, theme, refresh"
-#      puts "rows_per_page, type"
-#      puts "userid is a required field"
-#      puts "example:  edit user userid=<id> name=someone alias=username passwd=pass autologout=0"
-#      return false
-#    else
-#      p_keys = parameters.keys
-#
-#      valid_parameters.each {|key| p_keys.delete(key)}
-#      if !p_keys.empty? then
-#        puts "Invalid items"
-#        p p_keys
-#        return false
-#      elsif parameters["userid"].nil?
-#        puts "Missing required userid statement."
-#      end
-#      p @connection.user.update([parameters])  #TODO: remove print statement or comment if needed
-#    end
-#  end
-
   def addusermedia(parameters)
     debug(6,:var=>parameters)
     valid_parameters=["userid", "mediatypeid", "sendto", "severity", "active", "period"]

data/libs/zabcon_commands.rb

@@ -17,8 +17,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon_commands.rb 370 2011-12-22 05:51:45Z nelsonab $
-# $Revision: 370 $
+# $Id: zabcon_commands.rb 392 2012-05-17 22:24:15Z nelsonab $
+# $Revision: 392 $
 ##########################################
 
 require "zbxapi/zdebug"
@@ -64,10 +64,18 @@ end
 ZabconCommand.add_command "login" do
   set_method do |params|
 #    login server username password
-    server.server_url=params[0]
-    server.username=params[1]
-    server.password=params[2]
-    server.login
+    servers=ServerCredentials.instance
+    if servers[params[0]]
+      creds=servers[params[0]]
+    elsif params.length==0
+      creds=servers["global"]
+    else
+      creds=servers["global"].select_keys(["proxy_server",
+                "proxy_port","proxy_user","proxy_password"])
+      creds.merge!({"server"=>params[0],"username"=>params[1],
+          "password"=>params[2]})
+    end
+    server.login(creds)
   end
   set_help_tag :help
 #  set_flag :array_params
@@ -93,11 +101,11 @@ end
 ZabconCommand.add_command "logout" do
   set_method do
     server.logout
-    path=File.expand_path(env["session_file"])
-    begin
-      File.delete(path)
-    rescue Errno::ENOENT
-    end
+    #path=File.expand_path(env["session_file"])
+    #begin
+    #  File.delete(path)
+    #rescue Errno::ENOENT
+    #end
   end
   set_help_tag :logout
 end
@@ -229,6 +237,30 @@ ZabconCommand.add_command "show env" do
   tokenizer SimpleTokenizer
 end
 
+ZabconCommand.add_command "show credentials" do
+  set_method do |params|
+    if params.empty?
+      if ServerCredentials.instance.empty?
+        puts "No Server Credentials Defined"
+      else
+        ServerCredentials.instance.each{|k,v|
+          puts "#{k} : #{v.inspect}"
+        }
+      end
+    else
+      params.each {|item|
+        if ServerCredentials.instance[item].nil?
+          puts "#{item} is not a valid server name"
+        else
+          puts "#{item} : #{ServerCredentials.instance[item].inspect}"
+        end
+      }
+    end
+  end
+  set_help_tag :show_credentials
+  tokenizer(SimpleTokenizer.options(:remove_whitespace))
+end
+
 ZabconCommand.add_command "set var" do
   set_method do |params|
     params.each { |key,val|
@@ -305,8 +337,7 @@ ZabconCommand.add_command "raw api" do
   set_flag :print_output
   set_help_tag :raw_api
   result_type :raw_api
-  tokenizer CommandTokenizer
-#  tokenizer SimpleTokenizer
+  tokenizer ExpressionTokenizer
 end
 
 ZabconCommand.add_command "raw json" do
@@ -331,7 +362,7 @@ ZabconCommand.add_command "raw json" do
   #arg_processor do |params,args,flags|
   #  params
   #end
-  set_flag :login_required
+#  set_flag :login_required
   set_flag :print_output
   set_help_tag :raw_api
   result_type :raw_api
@@ -451,6 +482,45 @@ end
 #Item                                                                     Item#
 ###############################################################################
 
+#  Item types
+#  0 Zabbix agent             - Passive
+#  1 SNMPv1 agent             - SNMP
+#  2 Zabbix trapper           - Trapper
+#  3 Simple check             - Simple
+#  4 SNMPv2 agent             - SNMP2
+#  5 Zabbix internal          - Internal
+#  6 SNMPv3 agent             - SNMP3
+#  7 Zabbix agent (active)    - Active
+#  8 Zabbix aggregate         - Aggregate
+# 10 External check           - External
+# 11 Database monitor         - Database
+# 12 IPMI agent               - IPMI
+# 13 SSH agent                - SSH
+# 14 TELNET agent             - Telnet
+# 15 Calculated               - Calculated
+
+#value types
+# 0 Numeric (float)
+# 1 Character
+# 2 Log
+# 3 Numeric (unsigned)
+# 4 Text
+
+# Data Types
+# 0 Decimal
+# 1 Octal
+# 2 Hexadecimal
+
+# Status Types
+# 0 Active
+# 1 Disabled
+# 2 Not Supported
+
+# Delta Types
+# 0 As is
+# 1 Delta (Speed per second)
+# 2 Delta (simple change)
+
 
 ZabconCommand.add_command "add item" do
   set_method do |params|
@@ -478,8 +548,14 @@ ZabconCommand.add_command "get item" do
     server.connection.item.get(params)
   end
   set_valid_args 'itemids','hostids','groupids', 'triggerids','applicationids',
-                  'status','templated_items','editable','count','pattern','limit',
-                  'order', 'show'
+                  'editable','pattern','limit','search','nodeids','templateids',
+                  'proxyids','graphids','webitems','inherited','templated','host',
+                  'monitored','filter','group','application','belongs',
+                  'with_triggers','startSearch','excludeSearch','searchWildcardsEnabled',
+                  'output','select_hosts','select_triggers','select_graphs',
+                  'select_applications','countOutput','groupOutput','preservekeys',
+                  'sortfield','sortorder','show'
+
   default_show ["itemid", "key_", "description"]
   set_flag :login_required
   set_flag :print_output