genesis_collector 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d39ca69a6adc13a4abd67a0fd9625732c5826e
-  data.tar.gz: aaa36058829ee9455487571eb878622871a81828
+  metadata.gz: 7380d9cdffa045595133ceaf1058548d805690ef
+  data.tar.gz: 263298738b9ce230963da716696f27e78af66b19
 SHA512:
-  metadata.gz: 070ccbcc1e62328c588cff5307d26a23a11968da352230e2b8b46f755afa2e75bb5280414e7d607606b9960ad2fcc8292a3baa22ad22896523928210de9af5ab
-  data.tar.gz: 0ad60a20d56121590e319c1dbc48d4196e1347ddb45768bf2ff47e015097fd15f9a4e03bd52d0d5cc3144234ca02b57116d71c1e63aad62d54107771896695a5
+  metadata.gz: dcb446358887fd25740f07fc624536a2ca5c82c9d1f909138af494785c2d66f0c3390bd8ab71773e3d88b10c4301e77c59300af3989d66d187d30c110414dbaa
+  data.tar.gz: 108a96d5a92935b1b8debd9f1fcd7ab4d101fd80618b3986cbb856a93c56ef3377c84c972eb30afc371f2485bbe02773f724f540cea58727f8dd1c0a45237a76

data/lib/genesis_collector/chef.rb

@@ -1,26 +1,34 @@
+require 'time'
+
 module GenesisCollector
   module Chef
 
     def collect_chef
-      @payload[:chef] = {
-        environment: get_chef_environment,
-        roles: (@chef_node.respond_to?(:[]) ? @chef_node['roles'] : []),
-        run_list: (@chef_node.respond_to?(:[]) ? @chef_node['run_list'] : ''),
-        tags: get_chef_tags
-      }
+      @payload[:chef] = @chef_node.nil? ? collect_chef_from_knife : collect_chef_from_node
     end
 
-    def get_chef_environment
-      env = nil
-      env = File.read('/etc/chef/current_environment').gsub(/\s+/, '') if File.exist? '/etc/chef/current_environment'
-      env || 'unknown'
+    def collect_chef_from_node
+      {
+        environment: @chef_node.chef_environment,
+        roles: @chef_node.roles,
+        run_list: @chef_node.run_list.to_s,
+        tags: @chef_node.tags,
+        last_run: Time.at(@chef_node.ohai_time).utc.iso8601
+      }
     end
 
-    def get_chef_tags
-      node_show_output = shellout_with_timeout('knife node show `hostname` -c /etc/chef/client.rb')
-      node_show_output.match(/Tags:(.*)/)[0].delete(' ').gsub('Tags:', '').split(',')
+    def collect_chef_from_knife
+      output = shellout_with_timeout('knife node show `hostname` -c /etc/chef/client.rb -a ohai_time -a run_list -a tags -a environment -a roles -f json')
+      _hostname, parsed = JSON.parse(output).first
+      {
+        environment: parsed['environment'],
+        roles: parsed['roles'],
+        run_list: parsed['run_list'].join(', '),
+        tags: parsed['tags'],
+        last_run: Time.at(parsed['ohai_time']).utc.iso8601
+      }
     rescue
-      []
+      nil
     end
 
   end

data/lib/genesis_collector/version.rb

@@ -1,3 +1,3 @@
 module GenesisCollector
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genesis_collector
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - David Radcliffe