zinv 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4c535421a13c6d4073b24e1ac9fe232596f4a981
-  data.tar.gz: 300830bd15285c4bb3c4c87ebb270c340f3c82ea
+SHA256:
+  metadata.gz: 9ccc5cb8c66fa65febb2ac8f2885c2ac701ae57dc6c32c8f1a25a5676ad2f389
+  data.tar.gz: 137a98b0121bf95ad46a99412110a1a67d4be0643cb521d280276e300891fd01
 SHA512:
-  metadata.gz: 1c82d0c48a8dc7b6c63f2df23707b8573186cf7521a3282483e355d32bc460a26c74efa6f6d69ddbf679b9b9e9415bc639f88edb1dc7c4cda4f408f419085929
-  data.tar.gz: f84f6f96870327cad8e21a2b8810d3c2dd8577576f688868599bc2f706318818f07476b71b48356c9ecd311940e9c07268e8046b9c540674e190ee7e39819c3f
+  metadata.gz: 1040487875e6b618a2c1b688442cbc2f7f11fdb6b46acd1cf730b1d513e95b429a566a2a6fdbbe2c470769993cf0ef68ddc27fefccd93bd6ee9251b7e7186daa
+  data.tar.gz: f97e4472fafae1e3e70f4de65fd2f069c4a04a7d89f2ba67ca158fabe416f89717572b306f6783ef69c1536405e591c5ca035cd3e93c078fd8f48c7fea5bdeab

data/README.md

@@ -20,6 +20,17 @@ Or install it yourself as:
 
 ## Usage
 
+```
+$ zinv.rb --help
+Options:
+  -l, --list         List entire inventory (Ansible convention)
+  -h, --host=<s>     List a single host (Ansible convention)
+  -d, --debug        Debugging verbosity
+  -g, --groups       Dump groups list
+  -t, --templates    Dump templates list
+  -e, --help         Show this message
+```
+
 To use zinv.rb you must (by one of the several methods available) tell Ansible to use zinv.rb as its inventory.   Having done that, define the following environment variables for zinv.rb to work properly:
 
 * ZINV_ZABBIX_URL = your zabbix web interface URL
@@ -58,12 +69,6 @@ kilroy: was here
 
 Variables defined in this way will be available to to ansible when it processes the host in question.
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/svdasein/zinv. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/exe/zinv.rb

@@ -1,13 +1,22 @@
 #!/usr/bin/env ruby
-require 'zabbixapi'
+require 'zabbix/api'
 require 'json'
-require 'trollop'
-require 'awesome_print'
+require 'optimist'
+require 'amazing_print'
 require 'set'
 require 'yaml'
 
 
+# Assign a comma separated list of host names to this before running
+# ansible-playbook to have hosts not yet in zabbix listed in inventory
+runtimehostvar = 'ZINV_ADD_HOSTS'
 
+opts = Optimist::options do
+    opt :list, "List entire inventory" # required by ansible
+    opt :host, "List a single host", :type => :string  # required by ansible
+    opt :groups, "Dump groups list"
+    opt :templates, "Dump templates list"
+end
 
 if not (ENV['ZINV_ZABBIX_URL'] and ENV['ZINV_ZABBIX_USER'] and ENV['ZINV_ZABBIX_PASS'])
 	puts "\nYou *must* define the following environment variables for zinv.rb to work properly:\n\n"
@@ -21,9 +30,6 @@ if not (ENV['ZINV_ZABBIX_URL'] and ENV['ZINV_ZABBIX_USER'] and ENV['ZINV_ZABBIX_
 	exit(1)
 end
 
-
-
-
 # This list forms the basis for the collection of hosts and
 # templates included in inventory.  Any template directly or
 # indirectly derived from these will be included.  Any host
@@ -34,22 +40,10 @@ roottemplatenames = [
                 'Template OS Linux Active',
                 'Template SNMP OS Linux'
 ]
-
 if ENV['ZINV_ROOT_TEMPLATES']
    roottemplatenames = ENV['ZINV_ROOT_TEMPLATES'].split(',')
 end
 
-# Assign a comma separated list of host names to this before running
-# ansible-playbook to have hosts not yet in zabbix listed in inventory
-runtimehostvar = 'ZINV_ADD_HOSTS'
-
-opts = Trollop::options do
-    opt :list, "List entire inventory" # required by ansible
-    opt :host, "List a single host", :type => :string  # required by ansible
-    opt :debug, "Debugging verbosity"
-    opt :groups, "Dump groups list"
-    opt :templates, "Dump templates list"
-end
 
 # Generate an in-memory host group with the comma delim list in this env var
 if ENV[runtimehostvar]
@@ -67,22 +61,17 @@ if opts[:host]
 end
 
 # Connect to zabbix.
-zbx = ZabbixApi.connect(
-  :url => "#{ENV['ZINV_ZABBIX_URL']}/api_jsonrpc.php",
-  :user => ENV['ZINV_ZABBIX_USER'],
-  :password => ENV['ZINV_ZABBIX_PASS'],
-  :debug => opts[:debug]
+zbx = Zabbix::Api::Client.new(url: ENV['ZINV_ZABBIX_URL'])
+
+zbx.login(
+  user: ENV['ZINV_ZABBIX_USER'],
+  pass: ENV['ZINV_ZABBIX_PASS'],
 )
 
 
 # Get all the root template objects
-roottemplates = zbx.query(
-    :method => 'template.get',
-    :params => {
-        :filter => {
-            :host =>  roottemplatenames
-        }
-    }
+roottemplates = zbx.template.get(
+    filter: { host: roottemplatenames }
 )
 
 
@@ -92,7 +81,7 @@ prevchunk = roottemplates # this is for the "walking the tree" logic
 
 # Set up template groups for the root templates
 prevchunk.each {|template|
-    name = template['name'].gsub(/[ ]/,'_')
+    name = template.name.gsub(/[ ]/,'_')
     if not ansibletemplategroups.has_key?(name)
         ansibletemplategroups[name] = {'hosts' => Set.new}
     end
@@ -101,11 +90,8 @@ prevchunk.each {|template|
 # Find all templates that derive from the root ones, adding to ansibletemplates
 # and ansibletemplategroups as we go
 begin
-    nextchunk = zbx.query(
-        :method => 'template.get',
-        :params => {
-            :parentTemplateids => prevchunk.collect {|each| each['templateid']}
-        }
+    nextchunk = zbx.template.get(
+        parentTemplateids: prevchunk.collect {|each| each['templateid']}
     )
     nextchunk.each {|template|
         name = template['name'].gsub(/[ ]/,'_')
@@ -132,21 +118,17 @@ ansiblehostgroups['New_Hosts'] = {'hosts' => newhostnamelist}
 metadata = Hash.new
 
 
+
 # Gather all the hosts that use the templates we've collected.  We'll put them in
 # two types of hashes: host group hashes and template group hashes.
-zbx.hostgroups.all.each { |name,id|
+zbx.hostgroup.get().each { |hostgroup|
     hostlist = Array.new
     # Gather hosts using our templates, ensuring we also grab inventory for this host
-    hosts = zbx.query(
-        :method => 'host.get',
-        :params => {
-            :groupids => [id],
-            :templateids => ansibletemplates.collect {|each| each['templateid']},
-            :selectParentTemplates => [
-                'name'
-            ],
-            :selectInventory => 'extend'
-        }
+    hosts = zbx.host.get(
+         groupids: [hostgroup.groupid],
+         templateids: ansibletemplates.collect {|each| each['templateid']},
+         selectParentTemplates: [ 'name' ],
+         selectInventory: 'extend'
     )
 
     # For each host we've collected, add it to each group it belongs in (both host and template),
@@ -155,12 +137,12 @@ zbx.hostgroups.all.each { |name,id|
     hosts.each { |host|
         # You can put the string DONOTMANAGE anywhere in the zabbix host description
         # If you do that the node in question will be excluded from inventory
-        if host['description']  !~ /DONOTMANAGE/
-            hostlist.push(host['host'])
-            host['parentTemplates'].each { |template|
+        if host.description  !~ /DONOTMANAGE/
+            hostlist.push(host.host)
+            host.parentTemplates.each { |template|
                 templatename = template['name'].gsub(/[ ]/,'_')
                 if ansibletemplategroups.has_key?(templatename)
-                    ansibletemplategroups[templatename]['hosts'].add(host['name'])
+                    ansibletemplategroups[templatename]['hosts'].add(host.name)
                 end
             }
             # If you need to define host variables, in the zabbix host definition select "Inventory" and put yaml in the Notes field.
@@ -170,11 +152,11 @@ zbx.hostgroups.all.each { |name,id|
             # ereiamjh: The ghost in the machine
             # youshouldwatch: Brazil
             #
-            if host.has_key?('inventory') and host['inventory'].class == Hash and host['inventory'].has_key?('notes') and host['inventory']['notes'].size > 0
+            if host.respond_to?(:inventory) and host.inventory.class == Hash and host.inventory.has_key?('notes') and host.inventory['notes'].size > 0
                 begin
-                    metadata[host['name']] = YAML.load(host['inventory']['notes'])
+                    metadata[host.name] = YAML.load(host.inventory['notes'])
                 rescue Exception => e
-                    puts "Error parsing inventory notes field for host #{host['name']} - SKIPPING"
+                    puts "Error parsing inventory notes field for host #{host.name} - SKIPPING"
                     ap e
                 end
             end
@@ -183,11 +165,12 @@ zbx.hostgroups.all.each { |name,id|
     }
 
     if hostlist.size > 0
-        ansiblehostgroups[name.gsub(/[ ]/,'_')] = {'hosts'=>hostlist}
+        ansiblehostgroups[hostgroup.name.gsub(/[ ]/,'_')] = {'hosts'=>hostlist}
         ansiblehostgroups['All_Hosts']['hosts'].merge(hostlist) # probably don't need this
     end
 }
 
+
 # These are just for more informative dumps...
 hostgroupcount = ansiblehostgroups.keys.size
 if opts[:groups]

data/lib/zinv/version.rb

@@ -1,3 +1,3 @@
 module Zinv
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/zinv.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["david.parker _AT_ nsight.com"]
 
   spec.summary       = %q{Ansible dynamic inventory script for hosts monitored by zabbix}
-  spec.homepage      = "https://github.com/svdasein/zinv"
+  spec.homepage      = "https://gitlab.com/svdasein/zinv"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
@@ -26,9 +26,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency "zabbixapi", '~> 3.1'
-  spec.add_runtime_dependency "trollop", '~> 2.1'
-  spec.add_runtime_dependency "awesome_print", '~> 1.8'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_runtime_dependency "zabbix-api-simple"
+  spec.add_runtime_dependency "optimist"
+  spec.add_runtime_dependency "amazing_print"
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: zinv
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Dave Parker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: zabbixapi
+  name: zabbix-api-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: amazing_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 description: 
 email:
 - david.parker _AT_ nsight.com
@@ -88,6 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -100,7 +101,7 @@ files:
 - lib/zinv.rb
 - lib/zinv/version.rb
 - zinv.gemspec
-homepage: https://github.com/svdasein/zinv
+homepage: https://gitlab.com/svdasein/zinv
 licenses:
 - MIT
 metadata:
@@ -120,8 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ansible dynamic inventory script for hosts monitored by zabbix