zcollective 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43468c3bdb39ac2bad1c415283ca2f179746330
-  data.tar.gz: f3c693754e9cb7701dc35bff9d11160fb14283cb
+  metadata.gz: 08f265b096412fb3b523d050552aaeef9d8803d3
+  data.tar.gz: 1f571024229a1e8df68602ee74305dbe070174ca
 SHA512:
-  metadata.gz: 390bcfafbc5d7289f777b61482cb6fcc7ca31b2e356b88d96212ff7ca353a9cfcda9730eb31e59d69526ec67f9a70b706f010d7af96c75aabe76e91f16cd89ec
-  data.tar.gz: dfd833d3089049ee5789f46d1bf259e24e11f84dc217d7968987a840b52384863bae6022e59a08aad6689890e5f0bbf89e985c95754696d222e241c5a672cf8c
+  metadata.gz: 88ba7dbca7361865084fa580accbc803f2c804edfcd4363c046b116f166130227c39ff6892e156defcdb7cd95cf1db97372793957f14f5b955fe2e0928d6dc5f
+  data.tar.gz: 278143ee71691f1f428eb6b5ac0684fc5992c1d8cf98913ac4fbda439eee21c3a05ac3acc6352445b01ff53fd2f6bbd2eff264d510103849a34c7973d6f033a3

data/bin/zcollective

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright (c) 2012, 2013, The Scale Factory Ltd.
+# Copyright (c) 2012 - 2016, The Scale Factory Ltd.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -104,6 +104,10 @@ optparse = OptionParser.new do |opts|
         options[:ignore_classes] = i
     end
 
+    options[:hostgroup_facts] = []
+    opts.on('-f', '--hostgroup-facts fact1,fact2', Array, 'Create hostgroups and link hosts for given facts.') do |f|
+        options[:hostgroup_facts] = f
+    end
 
 end
 
@@ -205,9 +209,9 @@ end
 nested_hash = lambda {|hash, key| hash[key] = Hash.new(&nested_hash)}
 hosts = Hash.new(&nested_hash)
 
-# An array of collectives to create hostgroups of:
+# Arrays of collectives and facts to create hostgroups of:
 collectives = Array.new
-
+facts = Array.new
 
 ############################################################################
 # Fetch list of zabbix groups
@@ -399,6 +403,15 @@ else
         hosts[ short_hostname ][:mcollective][:classes] = inventory[:data][:classes]
         hosts[ short_hostname ][:mcollective][:collectives] = inventory[:data][:collectives]
 
+        # Filter facts based on --hostgroup-facts argument, return a list of fact values
+        filtered_facts = inventory[:data][:facts].select{|f| options[:hostgroup_facts].include? f}.values
+
+        # Divide facts containing a comma
+        filtered_facts.map!{|v| v.to_s.split(',')}.flatten!
+
+        hosts[ short_hostname ][:mcollective][:facts] = filtered_facts
+
+        facts << filtered_facts
         collectives << hosts[ short_hostname ][:mcollective][:collectives]
 
     end
@@ -410,20 +423,22 @@ end
 
 
 ###########################################################################
-# Fetch list of zabbix groups & Create hosts groups of discoverred
-# collectives, to add hosts to later
+# Fetch list of zabbix groups & Create hosts groups of discovered
+# collectives and facts, to add hosts to later
 
+log.debug("facts: #{facts.flatten.inspect}")
+log.debug("uniq facts: #{facts.flatten.uniq.inspect}")
 log.debug("collectives: #{collectives.flatten.inspect}")
 log.debug("uniq collectives: #{collectives.flatten.uniq.inspect}")
 
-collectives_to_hostgroups = collectives.flatten.uniq
+items_to_hostgroups = collectives.flatten.uniq + facts.flatten.uniq
 
-collectives_to_hostgroups.each do | collective |
+items_to_hostgroups.each do | item |
 
     log.debug( "Fetching list of zabbix hostgroups" )
 
-    collective_hostgroup_name = "#{collective}"
-    collective_hostgroup_id   = nil
+    item_hostgroup_name = "#{item}"
+    item_hostgroup_id   = nil
 
     zabbix_client.request( 'hostgroup.get',
         'search' => '',
@@ -432,34 +447,34 @@ collectives_to_hostgroups.each do | collective |
 
         log.debug("\tName: #{hostgroup['name']} ID: #{hostgroup['groupid']}")
 
-        if hostgroup['name'] == collective_hostgroup_name
-            collective_hostgroup_id = hostgroup['groupid']
+        if hostgroup['name'] == item_hostgroup_name
+            item_hostgroup_id = hostgroup['groupid']
         end
 
     end
 
-    if collective_hostgroup_id.nil?
+    if item_hostgroup_id.nil?
 
         if options[:noop]
 
-            log.debug("No #{collective} hostgroup, but not creating as " <<
+            log.debug("No #{item} hostgroup, but not creating as " <<
                 "we're in --noop mode")
         else
 
-            log.debug("No #{collective} hostgroup: creating")
+            log.debug("No #{item} hostgroup: creating")
 
             resp = zabbix_client.request( 'hostgroup.create',
-                'name' => collective
+                'name' => item
             )
 
-            collective_hostgroup_id = resp['groupids'].first
+            item_hostgroup_id = resp['groupids'].first
 
         end
 
     end
 
-    log.info("New hostgroup: #{collective}")
-    log.info("New hostgroup's ID: #{collective_hostgroup_id}")
+    log.info("New hostgroup: #{item}")
+    log.info("New hostgroup's ID: #{item_hostgroup_id}")
 
 end
 
@@ -557,8 +572,9 @@ hosts.each do |host,data|
             host_group_hash = {}
 
             log.debug("\tName: #{hostgroup['name']} ID: #{hostgroup['groupid']}")
+            discovered_groups = data[:mcollective][:facts] + data[:mcollective][:collectives]
 
-            if data[:mcollective][:collectives].include? hostgroup['name']
+            if discovered_groups.include? hostgroup['name']
                 host_group_hash['groupid'] = hostgroup['groupid']
                 groups_by_id << host_group_hash
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zcollective
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Jon Topper