zcollective 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56fd9cc0f29641fe1054333a39830ac21c984ef6
-  data.tar.gz: 51cc1c6d4b4b6313999506d8f21d9328edb847fb
+  metadata.gz: 2b248c41ffe0cffdb85ef264f9318624e2e73236
+  data.tar.gz: ce6a45137a8c5e94fd01ebef6d4213dc4ca47f74
 SHA512:
-  metadata.gz: 9b50a79c8a10d9938077364100b8c3492c31cd91738edb8419e224c8fdb060d3305fc5579ea887ccff3dfe3a8e60858329f938fd8b1808cf4294a586baa607eb
-  data.tar.gz: 692ad58709df457ed72a62ff36e6104df21a9c8f2e6014be5b9ccbe48c09e038dfe2f8b457600e8736041752989a962db6eb8c6a6d50473856bc4e88eeed078c
+  metadata.gz: a63ea1f38c40b7cbdf76476599a21d82c1eeb4d5f2dc0f960ac9e25710e4a59a52d9388ea431fd530ebaa5807932e7d679de51a6d871f19f1dc58c355188fc9e
+  data.tar.gz: 94d26534356b3b87d35e9a7f9737e2886224c71a06c8fd74bf938ad43b0896770e5b639110bce0ccbd0c1c012177f2767bc2d3df500525fd4e66d40e24ae090d

data/bin/zcollective

@@ -115,6 +115,15 @@ optparse = OptionParser.new do |opts|
         options[:hostgroup_facts] = f
     end
 
+    options[:insecure_https] = false
+    opts.on('--insecure-https', 'Don\'t validate the SSL cert') do
+        options[:insecure_https] = true
+    end
+
+    options[:auto_zabbix_inventory] = false
+    opts.on('--auto-zabbix-inventory', 'Enable Zabbix auto-inventory mode for the discovered hosts') do
+        options[:auto_zabbix_inventory] = true
+    end
 end
 
 begin
@@ -181,11 +190,12 @@ end
 log.debug( "Connecting to Zabbix RPC service" )
 
 zabbix_client = ZCollective::ZabbixClient.new(
-    :url          => options[:zabbix_api_url],
-    :user         => options[:zabbix_user],
-    :password     => options[:zabbix_pass],
-    :debug        => options[:debug],
-    :http_timeout => options[:http_timeout],
+    :url            => options[:zabbix_api_url],
+    :user           => options[:zabbix_user],
+    :password       => options[:zabbix_pass],
+    :debug          => options[:debug],
+    :http_timeout   => options[:http_timeout],
+    :insecure_https => options[:insecure_https],
 )
 
 log.debug( "Connected and authenticated" )
@@ -600,7 +610,7 @@ hosts.each do |host,data|
             #  we're just adding a Zabbix agent interface), and need
             #  to be in a group.
 
-            resp = zabbix_client.request( 'host.create',
+            host_create_hash = {
                 'host'       => host,
                 'interfaces' => [
                     {
@@ -612,9 +622,23 @@ hosts.each do |host,data|
                         'port'  => '10050'
                     }
                 ],
-                'groups' => groups_by_id,
+                'groups'    => groups_by_id,
                 'templates' => templates_to_add
-            )
+            }
+
+            # If we've asked or auto-zabbix-inventory mode, set that. Otherwise
+            # leave it unset.
+            # We also set a note on the host saying when it was discovered.
+            # This is needed, otherwise Zabbix will ignore the request to
+            # enable the auto inventory mode.
+            if options[:auto_zabbix_inventory]
+                host_create_hash['inventory_mode'] = '1'
+                host_create_hash['inventory'] = {
+                    'notes' => "Discovered by ZCollective at #{Time.now}",
+                }
+            end
+
+            resp = zabbix_client.request('host.create', host_create_hash)
 
             # This call returns the created host id
 

data/lib/zcollective/zabbixclient.rb

@@ -100,6 +100,8 @@ module ZCollective
             http = Net::HTTP::Proxy(proxy.host, proxy.port).new( uri.host, uri.port )
             http_timeout = @options[:http_timeout]
             http.read_timeout = http_timeout.to_i unless http_timeout.nil?
+            http.use_ssl = true if uri.to_s.start_with?("https")
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @options[:insecure_https]
 
             request = Net::HTTP::Post.new( uri.request_uri )
             request.add_field( 'Content-Type', 'application/json-rpc' )

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: zcollective
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Jon Topper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
 description: ZCollective is a tool used to configure Zabbix using data discovered
@@ -32,8 +32,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/zcollective/zabbixclient.rb
 - bin/zcollective
+- lib/zcollective/zabbixclient.rb
 homepage: http://github.com/scalefactory/zcollective
 licenses: []
 metadata: {}
@@ -43,17 +43,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Zabbix/MCollective integration