zinv 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8b18911f2c4dd6499f366ccecccf43b0cc068747
-  data.tar.gz: f82edf5715bba404551a4dd698820035ef2c84b5
+SHA256:
+  metadata.gz: 163b830fb516b396c3728b88f1e331a005a14baed783df3dcd2381714746b4ac
+  data.tar.gz: af33e4686ed1feaf9a283a17f11b50064dbd8df6806488bf076723217142b8e5
 SHA512:
-  metadata.gz: 521dca9dbd7d3df73b028bf68b65348a84b7ed90661ac69998d2821707831985deb1da80912ee2556a835783c1767939ef288695282b9a600e8e29cdfc779e0c
-  data.tar.gz: f7b13444e31dceb3becaa1991d833d2cfb34995cb717919e3a4c751817f41ec1d0dd0e9c94c3dcc3ca7514450c77c823025a484b641e53fc5d4fe00262be3de4
+  metadata.gz: 16af76981bea37da7d01baa2cfa6407242f1acb43e6cb5cd5d7cee47042828569ae3d7e4d9486e451d52a7d8db280d687d52a572e9e776f1bfd9e81d58ee2eb7
+  data.tar.gz: f4cd51c4369503021fb887640a1a83643c17f24f265fead6e33fa7e4311260af509f6afa341bf6f53ebf3ca994184b94cc802638e7467fd557dc66302f6a0f09

data/exe/zinv.rb

@@ -1,8 +1,8 @@
 #!/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'
 
@@ -11,10 +11,9 @@ require 'yaml'
 # ansible-playbook to have hosts not yet in zabbix listed in inventory
 runtimehostvar = 'ZINV_ADD_HOSTS'
 
-opts = Trollop::options do
+opts = Optimist::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
@@ -62,23 +61,18 @@ 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 }
+).collect
 
 
 ansibletemplates = roottemplates # This list is used by host gathering logic later on
@@ -87,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
@@ -96,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(/[ ]/,'_')
@@ -127,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),
@@ -150,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.
@@ -165,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
@@ -178,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.4"
+  VERSION = "0.2.0"
 end

data/zinv.gemspec

@@ -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.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Dave Parker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-05 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
@@ -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