awsbix 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9c4cefcb09641182dee5a1809a1ccaca10fa503
-  data.tar.gz: 81b1cc338d11654ade97d1eeee44e7af81fdae72
+  metadata.gz: 9329db0807749656a85796aa07a9892348d77f04
+  data.tar.gz: 6a66f81a1c030c9655552671e9727e050fbed1d3
 SHA512:
-  metadata.gz: 537c549bc213fecddb175302d9f57fe873425557cd15c1657dca0714aa11127c2d345feecd402dd33ced9cab30339e8ecefd9089e55cb4962076ff43c1aabca0
-  data.tar.gz: 58003d3c27d0a08bc7408969f6b12055948bdfacbd9cc5f2b687db7d993cb60134356d2f01d06bc38324576207014883947d37eef1a73553538fbea74857f9f2
+  metadata.gz: 07c7a612078e52b396bcabd44417fdbc69f71c4356bae12464aab104781d4342ed8bdbe3301ba55175d94572f6dffecf769499fd98cd727205d5acab2e07c162
+  data.tar.gz: 4f005004cdb1bae93332c620df18cfbc75d2559378c1a85757f06f66c6fb393873cdbedb88f1a60827a0b03b806c548809cbebd3c3ff2d9b37d2d1999a311fb4

data/bin/config.yaml

@@ -3,12 +3,6 @@ log_level: 'debug'
 zbx_url: 'http://localhost/zabbix/api_jsonrpc.php'
 zbx_username: 'Admin'
 zbx_password: 'zabbix'
-# zbx_filter_model either include or exclude host based on the security group
-zbx_filter_model: 'include'
-zbx_include_security_group:
-    - 'only-this-security-group'
-zbx_exclude_security_group:
-    - 'do-not-use-this-security-group'
 zbx_default_templates:
     - 'Template OS Linux'
 

data/lib/awsbix/api.rb

@@ -115,6 +115,32 @@ class Awsbix
             end
         end
 
+        def zbx_enable_host(hostname)
+            # append hostname suffix if one is configured
+            if self.get_conf('aws_dns_suffix') then
+                self.debug_print("debug: appending #{self.get_conf('aws_dns_suffix')} to #{options[:hostname]}")
+                hostname = hostname + self.get_conf('aws_dns_suffix')
+            end
+
+            @zbx.hosts.update(
+                :hostid => @zbx.hosts.get_id(:host => hostname),
+                :status => 0
+            )
+        end
+
+        def zbx_disable_host(hostname)
+            # append hostname suffix if one is configured
+            if self.get_conf('aws_dns_suffix') then
+                self.debug_print("debug: appending #{self.get_conf('aws_dns_suffix')} to #{options[:hostname]}")
+                hostname = hostname + self.get_conf('aws_dns_suffix')
+            end
+
+            @zbx.hosts.update(
+                :hostid => @zbx.hosts.get_id(:host => hostname),
+                :status => 1
+            )
+        end
+
         def zbx_process_host(options = {})
             unless options[:hostname] and options[:group] and options[:port] and options[:ip] and options[:dns] and options[:useip] then
                 puts "error: not enough parameters"

data/lib/awsbix/aws.rb

@@ -50,6 +50,8 @@ class Awsbix
             options[:filter] ||= 'include'
             # if no regex is provided default to '.*' 
             options[:regex] ||= %r{.*}
+            # instance_status defaults to 'running' 
+            options[:instance_status] ||= 'running'
             @ec2_hosts = Array.new
 
             self.ec2_connect()
@@ -58,7 +60,7 @@ class Awsbix
                 self.debug_print("info: processing #{region}")
                 AWS.memoize do
                     @ec2.regions[region].instances.each do | inst |
-                        if inst.status.match(/running/) then
+                        if inst.status.match(/options[:instance_status]/) then
                             inst.security_groups.each do | sg |
                                 if options[:regex].is_a?(Regexp) then
                                     case options[:filter]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsbix
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tom Llewellyn-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: add/remove hosts to Zabbix