collect-agent 0.1.4 → 0.1.5

data/bin/collect-agent

@@ -2,7 +2,6 @@
 
 require 'chef'
 require 'trollop'
-require File.dirname(__FILE__) + '/../lib/helpers.rb'
 
 opts = Trollop::options do
   version "Collect-agent for chef"
@@ -15,19 +14,25 @@ where [options] are:
 EOS
 
   opt :config, "Config chef file", :default => "/etc/chef/client.rb"
+  opt :plugins, "Ohai plugins directory", :default => "/etc/chef/ohai_plugins"
 end
 
+# load ohai
+Ohai::Config[:plugin_path] << opts[:plugins]
 ohai = Ohai::System.new
 ohai.all_plugins
 ohai.seen_plugins
+
+# get node
 Chef::Config.from_file(opts[:config])
 host = Chef::Config[:node_name] || ohai[:fqdn] || ohai[:hostname]
 client = Chef::REST.new(Chef::Config[:chef_server_url], host, Chef::Config[:client_key])
 node = client.get_rest("nodes/#{host}")
 
+# refresh node automatic contents
 node.automatic_attrs.keys.each { |key| node.automatic_attrs[key] = ohai.data[key] if ohai.data[key] }
+ohai.data.keys.each { |key| node.automatic_attrs[key] = ohai.data[key] }
+node.set[:collect_agent][:flag] = "collect_agent"
 
-set_network_addresses(node)
-set_flag(node)
-
-client.put_rest("nodes/#{host}", node)
+# post node
+client.put_rest("nodes/#{host}", node)

data/collect-agent.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "collect-agent"
-  s.version     = "0.1.4"
+  s.version     = "0.1.5"
   s.authors     = ["Vasiliev D.V."]
   s.email       = %w(vadv.mkn@gmail.com)
   s.homepage    = "https://git.undev.cc/megaadmins/collect-agent"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collect-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -57,7 +57,6 @@ files:
 - Rakefile
 - bin/collect-agent
 - collect-agent.gemspec
-- lib/helpers.rb
 homepage: https://git.undev.cc/megaadmins/collect-agent
 licenses:
 - MIT
@@ -84,4 +83,3 @@ signing_key:
 specification_version: 3
 summary: Chef collect agent
 test_files: []
-has_rdoc: 

data/lib/helpers.rb

@@ -1,18 +0,0 @@
-def set_network_addresses(node)
-  private_regexp = "(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^192\.168\.)"
-  localhost_regexp = "(^127\.)"
-  all_addresses = Array.new
-  private_addresses = Array.new
-  node.network['interfaces'].each do |iface, addrs|
-    addrs['addresses'].each do |ip, params|
-      all_addresses << ip if params['family'].eql?('inet') && !ip.match(localhost_regexp) && !iface.match(/^lo/)
-      private_addresses << ip if params['family'].eql?('inet') && ip.match(private_regexp)
-    end
-  end
-  node.automatic_attrs['network']['addresses_private'] = private_addresses
-  node.automatic_attrs['network']['addresses_all'] = all_addresses
-end
-
-def set_flag(node)
-  node.set[:collect_agent][:flag] = "collect_agent"
-end