zabcon 0.0.366 → 0.0.370

data/libs/revision.rb

@@ -1 +1 @@
-REVISION=366
+REVISION=370

data/libs/zabbix_server.rb

@@ -18,8 +18,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabbix_server.rb 325 2011-09-26 08:57:00Z nelsonab $
-# $Revision: 325 $
+# $Id: zabbix_server.rb 370 2011-12-22 05:51:45Z nelsonab $
+# $Revision: 370 $
 ##########################################
 
 require 'yaml'
@@ -90,6 +90,12 @@ class ZabbixServer
     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"])
+    end
     @connection.login(@username,@password)
     @connected=true
     GlobalVars.instance["auth"]=@connection.auth

data/libs/zabcon_commands.rb

@@ -17,8 +17,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon_commands.rb 364 2011-12-22 04:21:13Z nelsonab $
-# $Revision: 364 $
+# $Id: zabcon_commands.rb 370 2011-12-22 05:51:45Z nelsonab $
+# $Revision: 370 $
 ##########################################
 
 require "zbxapi/zdebug"
@@ -79,6 +79,17 @@ ZabconCommand.add_command "login" do
   #end
 end
 
+ZabconCommand.add_command "set proxy" do
+  set_method do |params|
+    env["proxy_server"]=params[0]
+    env["proxy_port"]=params[1] || env["proxy_port"] || 3128
+    env["proxy_user"]=params[2]
+    env["proxy_password"]=params[3]
+  end
+  set_help_tag :set_proxy
+  tokenizer(SimpleTokenizer.options(:remove_whitespace))
+end
+
 ZabconCommand.add_command "logout" do
   set_method do
     server.logout

data/libs/zabcon_core.rb

@@ -20,8 +20,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon_core.rb 365 2011-12-22 04:26:54Z nelsonab $
-# $Revision: 365 $
+# $Id: zabcon_core.rb 370 2011-12-22 05:51:45Z nelsonab $
+# $Revision: 370 $
 ##########################################
 
 #require 'libs/utility_items'
@@ -235,30 +235,18 @@ class ZabconCore
         ZbxAPI_ParameterError, Command::LoginRequired => e
       puts e.message
       retry
-    #rescue Command::NonFatalError => e
-    #  puts e.message
-    #  retry
-    #rescue Command::ParameterError => e
-    #  puts e.message
-    #  retry
-    #rescue ZabbixServer::ConnectionProblem => e
-    #  puts e.message
-    #  retry
     rescue ParseError => e  #catch the base exception class
       e.show_message
       retry if e.retry?
-    #rescue ZbxAPI_ExceptionVersion => e
-    #  puts e
-    #  retry  # We will allow for graceful recover from Version exceptions
-    #rescue ZbxAPI_ExceptionBadAuth => e
-    #  puts e.message
-    #  retry
     rescue ZbxAPI_ExceptionLoginPermission
       puts "No login permissions"
       retry
     rescue ZbxAPI_ExceptionPermissionError
       puts "You do not have permission to perform that operation"
       retry
+    rescue ZbxAPI_ExceptionBadServerUrl
+      puts "A Zabbix server was not found at that url"
+      retry
     rescue ZbxAPI_GeneralError => e
       puts "An error was received from the Zabbix server"
       if e.message.class==Hash

data/revision_information

@@ -34,3 +34,6 @@
 *** 12/21/11 nelsonab
 * Fixed Bug #89
 * Fixed Bug #88
+
+*** 12/22/11 nelsonab
+* Added proxy server support

data/zabcon.conf.default

@@ -2,6 +2,14 @@ server=http://localhost
 username=Admin
 password=zabbix
 
+#Use the following to enable proxy server support
+#Only "proxy_server" is required to enable proxy support
+#default values are shown
+#proxy_server=
+#proxy_port=3128
+#proxy_user=
+#proxy_password=
+
 # The following is a list of user editable config file options, the following
 # values are the defaults.  These can be changed as needed.
 

data/zabcon.rb

@@ -20,8 +20,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zabcon.rb 361 2011-12-19 00:21:52Z richlv $
-# $Revision: 361 $
+# $Id: zabcon.rb 370 2011-12-22 05:51:45Z nelsonab $
+# $Revision: 370 $
 ##########################################
 
 #setup our search path or libraries
@@ -42,7 +42,7 @@ DEPENDENCIES={
   "parseconfig"=>true,
   "json"=>true,
   "highline"=>true,
-  "zbxapi"=>Gem::Version.new("0.1.352")
+  "zbxapi"=>Gem::Version.new("0.1.369")
 }
 
 
@@ -175,6 +175,10 @@ class ZabconApp
     env["server"]=nil
     env["username"]=nil
     env["password"]=nil
+    env["proxy_server"]=nil
+    env["proxy_port"]=3128
+    env["proxy_user"]=nil
+    env["proxy_password"]=nil
     env["lines"]=24
     env["language"]="english"
     env["logged_in"]=false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zabcon
 version: !ruby/object:Gem::Version 
-  hash: 707
+  hash: 763
   prerelease: false
   segments: 
   - 0
   - 0
-  - 366
-  version: 0.0.366
+  - 370
+  version: 0.0.370
 platform: ruby
 authors: 
 - A. Nelson
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2011-12-21 00:00:00 -05:00
+date: 2011-12-22 00:00:00 -05:00
 default_executable: zabcon
 dependencies: 
 - !ruby/object:Gem::Dependency