zcollective 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 181f139c7efb1dd070e2a14be960039dbd86b1ad
+  data.tar.gz: 2ed58c7810a4a50851e984943052f7ef7bd20f5c
+SHA512:
+  metadata.gz: 59c2c157fbdb4cb457a415e18e3bed14b5423d07dbf161e91167c450972f0fbbe1298da0536a60946c41e9ef7f503db6839a8d019576d2de03d6b5858cccbc1a
+  data.tar.gz: 0140666a8e3717506d3f82edf4e7a841b61e09295941bf2ca37bbfb20f2548177b14a88f774a04c0d8283080d4cf46c6b391fd738b2044c746f94266af1cea10

data/bin/zcollective

@@ -75,7 +75,7 @@ optparse = OptionParser.new do |opts|
     end
 
     options[:connect_by_ip] = 0
-    opts.on('--connect-by-ip','Configure newly added hosts to connect by IP address instead of DNS') do
+    opts.on('--connect-by-ip','Configure newly added hosts to connect by IP address instead of DNS. Not valid with --host.') do
         options[:connect_by_ip] = 1
     end
 
@@ -89,12 +89,34 @@ optparse = OptionParser.new do |opts|
         options[:timeout] = t.to_i
     end
 
+    options[:host]
+    opts.on('-h', '--host hostname', 'Skip mcollective host discovery, use the given host') do |h|
+        options[:host] = h
+    end
+
+    options[:template]
+    opts.on('-t', '--template template', 'Add the given template to the host specified with --host.') do |t|
+        options[:template] = t
+    end
+
 end
 
 begin
 
     optparse.parse!
 
+    if !options[:host] and options[:template]
+        $stderr.puts "Can't use --template without --host"
+        $stderr.puts optparse
+        exit 2
+    end
+
+    if options[:host] and options[:connect_by_ip] == 1
+        $stderr.puts "Can't use --connect-by-ip with --host"
+        $stderr.puts optparse
+        exit 2
+    end
+
 rescue OptionParser::InvalidOption, OptionParser::MissingArgument
 
     $stderr.puts $!.to_s
@@ -279,91 +301,106 @@ end
 
 
 ############################################################################
-# Iterate through MCollective hosts
+# Iterate through MCollective hosts, or 
 
-include MCollective::RPC
+if options[:host]
 
-mc = rpcclient("rpcutil", :debug => true)
-begin
-zt_mc = rpcclient("zabbix_template", :exit_on_failure => false)
-rescue Exception
-    log.warn("No zabbix_template mcollective rpc agent found")
-end
-if (!zt_mc.nil?)
-    zt_mc.progress = false
-end
-mc.progress = false
-mc.discover.sort.each do |host|
+    hosts[ options[:host] ][ :mcollective ][:ip] = ''
+    if options[:template]
+        hosts[ options[:host] ][ :mcollective ][:classes] = [ options[:template] ]
+    else
+        hosts[ options[:host] ][ :mcollective ][:classes] = []
+    end
+
+else
+
+    include MCollective::RPC
+
+    mc = rpcclient("rpcutil", :debug => true)
+    begin
+    zt_mc = rpcclient("zabbix_template", :exit_on_failure => false)
+    rescue Exception
+        log.warn("No zabbix_template mcollective rpc agent found")
+    end
+    if (!zt_mc.nil?)
+        zt_mc.progress = false
+    end
+    mc.progress = false
+    mc.discover.sort.each do |host|
 
-    # MCollective returns FQDN name, and we probably want to use the short
-    #  form name in zabbix.
+        # MCollective returns FQDN name, and we probably want to use the short
+        # form name in zabbix.
     
-    short_hostname = host.split('.').first
+        short_hostname = host.split('.').first
 
-    log.debug("Host: #{short_hostname} (#{host})")
+        log.debug("Host: #{short_hostname} (#{host})")
 
-    # Get inventory details for each host
-    inventory = mc.custom_request( "inventory", {}, host,
-        { "identity" => host }
-    ).first
+        # Get inventory details for each host
+        inventory = mc.custom_request( "inventory", {}, host,
+            { "identity" => host }
+        ).first
 
-    # Work through network interfaces reported by Facter and find the first
-    #  which matches the CIDR passed on the commandline.  Use that to talk
-    #  zabbix to.
+        # Work through network interfaces reported by Facter and find the first
+        # which matches the CIDR passed on the commandline.  Use that to talk
+        # zabbix to.
 
-    cidr_to_match = NetAddr::CIDR.create( options[:interface_cidr] )
-    ip = nil
+        cidr_to_match = NetAddr::CIDR.create( options[:interface_cidr] )
+        ip = nil
 
-    inventory[:data][:facts].sort.each do |key,value|
+        inventory[:data][:facts].sort.each do |key,value|
 
-        next unless key.match(/^ipaddress_/)
+            next unless key.match(/^ipaddress_/)
 
-        log.debug("Potential IP interface #{key} with IP #{value}")
+            log.debug("Potential IP interface #{key} with IP #{value}")
 
-        ip_cidr = NetAddr::CIDR.create( value )
-        if ip_cidr.is_contained?( cidr_to_match) 
+            ip_cidr = NetAddr::CIDR.create( value )
+            if ip_cidr.is_contained?( cidr_to_match) 
 
-           log.debug("IP matches CIDR #{options[:interface_cidr]}")
+                log.debug("IP matches CIDR #{options[:interface_cidr]}")
 
-           ip = value 
-           break
+                ip = value 
+                break
+
+            else
+                log.debug("IP doesn't match CIDR")
+            end
 
-        else
-            log.debug("IP doesn't match CIDR")
         end
 
-    end
+        unless ip
+            raise "Host #{host} has no IP matching the target CIDR #{options[:interface_cidr]}" 
+        end
 
-    unless ip
-        raise "Host #{host} has no IP matching the target CIDR #{options[:interface_cidr]}" 
-    end
+        log.debug("\tIP #{ip}")
 
-    log.debug("\tIP #{ip}")
+        # Find whether we have to use different or any extra templates in Zabbix
+        # for any of the modules on this host. Only do this if we were
+        # successfully able to create the zabbix_template mcollective rpcclient.
+        if (!zt_mc.nil?)
+            host_template_info = zt_mc.custom_request( "templates", {},
+                host,
+                {"identity" => host}
+            ).first
+        end
 
-    # Find whether we have to use different or any extra templates in Zabbix
-    # for any of the modules on this host. Only do this if we were
-    # successfully able to create the zabbix_template mcollective rpcclient.
-    if (!zt_mc.nil?)
-        host_template_info = zt_mc.custom_request( "templates", {},
-            host,
-            {"identity" => host}
-        ).first
-    end
+        if (!host_template_info.nil?)
+            hosts[ short_hostname ][:aliases]           = host_template_info[:data][:aliases]
+            hosts[ short_hostname ][:extras]            = host_template_info[:data][:extras]
+        end
 
-    if (!host_template_info.nil?)
-        hosts[ short_hostname ][:aliases]           = host_template_info[:data][:aliases]
-        hosts[ short_hostname ][:extras]            = host_template_info[:data][:extras]
-    end
+        hosts[ short_hostname ][:mcollective][:ip]      = ip
+        hosts[ short_hostname ][:mcollective][:classes] = inventory[:data][:classes]
+        hosts[ short_hostname ][:mcollective][:collectives] = inventory[:data][:collectives]
+
+        collectives << hosts[ short_hostname ][:mcollective][:collectives]
 
-    hosts[ short_hostname ][:mcollective][:ip]      = ip
-    hosts[ short_hostname ][:mcollective][:classes] = inventory[:data][:classes]
-    hosts[ short_hostname ][:mcollective][:collectives] = inventory[:data][:collectives]
+    end
 
-    collectives << hosts[ short_hostname ][:mcollective][:collectives]
+    mc.disconnect
 
 end
 
-mc.disconnect
+
 
 ###########################################################################
 # Fetch list of zabbix groups & Create hosts groups of discoverred

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zcollective
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors:
 - Jon Topper
@@ -13,15 +12,18 @@ date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
-  requirement: &70263403228180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70263403228180
+  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
   using MCollective.
 email: jon@scalefactory.com
@@ -34,27 +36,25 @@ files:
 - bin/zcollective
 homepage: http://github.com/scalefactory/zcollective
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Zabbix/MCollective integration
 test_files: []
-has_rdoc: