awsbix 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc1caca23d77bdc4951be5218e77a717c76bfe55
-  data.tar.gz: ea5acdf3444d5145c2cf648f43bf93fbbed3f24c
+  metadata.gz: af625bd36e6a9ec9c71a8bfd73eec8ae9215a203
+  data.tar.gz: d7d2bba45d0f77bd29727116ad8c3552762410dd
 SHA512:
-  metadata.gz: 1fb9e03b11027680dbdfc3bf2c90146e9b75cf9437bc20aaab6b68752db4ed469ff85fc7f9f65e11eb3028ce08375a1974dc4b36f23dc03aaf52ee2769de0903
-  data.tar.gz: f15719e109b373f80783f7c8ccfb236a7eec6c7100b8a7137a0a95b6e4635a2ba923dcf704628299a582f8fd1a6cd6c4a46926d2a17b6a5bd981f46e16cb2da1
+  metadata.gz: b22f69a4a6f474d83326d5b70601526840b0584d2f11f45e9bd0377d9dec35a53dd49d4036dd34b17752252678dc52fdd50d89a455b8402dee6d73244e38d09d
+  data.tar.gz: 60b527a875b6809dfaa1497ffd9cc695f7ade9f41583101778215e22300c9fe332b7c909589d8eb84fa557e566901c78ce24f7f5f03f9d375fa9cd115c47df10

data/lib/awsbix/api.rb

@@ -21,11 +21,21 @@ class Awsbix
         require 'zabbixapi'
 
         def zbx_connect()
-            if self.get_conf('zbx_username') and self.get_conf('zbx_password') and self.get_conf('zbx_url') then
+            # if an http auth credential pair are set in the config use them
+            if self.get_conf('zbx_http_user') and self.get_conf('zbx_http_password') and self.get_conf('zbx_username') and self.get_conf('zbx_password') and self.get_conf('zbx_url') then
                 @zbx = ZabbixApi.connect(
-                    :url => self.get_conf('zbx_url'),
-                    :user => self.get_conf('zbx_username'),
-                    :password => self.get_conf('zbx_password')
+                    :url            => self.get_conf('zbx_url'),
+                    :user           => self.get_conf('zbx_username'),
+                    :password       => self.get_conf('zbx_password'),
+                    :http_user      => self.get_conf('zbx_http_user'),
+                    :http_password  => self.get_conf('zbx_http_password')
+                )
+            # fall back to no http auth
+            elsif self.get_conf('zbx_username') and self.get_conf('zbx_password') and self.get_conf('zbx_url') then
+                @zbx = ZabbixApi.connect(
+                    :url            => self.get_conf('zbx_url'),
+                    :user           => self.get_conf('zbx_username'),
+                    :password       => self.get_conf('zbx_password')
                 )
             else
             	raise ErrorZabbixAuthentication

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsbix
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Tom Llewellyn-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -57,7 +57,7 @@ files:
 - lib/awsbix/error.rb
 homepage: https://github.com/brahman81/awsbix
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []