hoss 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fbcffb164bffc8e6678fa05d7d7a9f586ecfa71
-  data.tar.gz: 3ec2425370b1f16df23886a7997542e7ff6db82e
+  metadata.gz: 77e0879929d3f7b534cefa7604849ab0b2258545
+  data.tar.gz: f5e96bf56a174c4c30e1f4e30d169fd31671264e
 SHA512:
-  metadata.gz: 533ef7c673ff7363f4e3d9c9526ec4e6a348d96f8dcc1301cfb71281e061f3160f0382cb1f03ec859bc4dac80df930f02224d8bdf80971c34606756bb38744bd
-  data.tar.gz: 8c7c9f8eb0dc93c1e7f4e51454ce3ca98830429bff0ca210a04031d58c215d88900bdd8eb5691d92e9f0298443b80dcfd03c7f369cc0f143962c0660738e4666
+  metadata.gz: 901bc1d0559a101fd0c96c8d87a41f5a80c2060a92b47010c4ff00420f51b343e7a9688ae27df4fc198f6394574eb516d4aec8dc410b545ea0cc1bb3c13ee0cf
+  data.tar.gz: 3d45142d95daa19df9ca0afc186f625c760c0adf8e1366676f1f6c17bd04e087b042b8ae91011e35f29fa24ddea92b951488fd2d4924a89101fc52fd4c131e75

data/README.md

@@ -1,3 +1,3 @@
 # Hoss ![Version](https://img.shields.io/gem/v/hoss.svg?style=flat-square)
 
-Index your Chef Server with Elasticsearch.
+Index your infrastructure with Elasticsearch.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/hoss/index.rb

@@ -0,0 +1 @@
+require_relative 'index/chef'

data/lib/hoss/index/chef.rb

@@ -0,0 +1,143 @@
+require 'pmap'
+require 'ridley'
+require 'elasticsearch'
+
+
+Celluloid.logger = nil
+
+module Hoss
+  module Index
+    class Chef
+      attr_reader :resources, :index, :es, :ridley, :log
+
+      def initialize opts
+        @resources = opts[:chef_resources]
+        @index     = opts[:index_name]
+        @log       = opts[:logger]
+
+        @ridley = Ridley.from_chef_config opts.knife
+
+        @es = Elasticsearch::Client.new \
+          host: opts.elasticsearch_host,
+          reload_connections: true,
+          reload_on_failure: true,
+          trace: opts.trace?,
+          log: opts.trace? ? @log : nil
+
+        log.debug \
+          event: 'reindex',
+          opts: opts
+
+        started = Time.now
+
+        reindex
+
+        log.info \
+          event: 'reindexed',
+          elapsed: Time.now - started
+      end
+
+
+
+    private
+
+
+      def reindex
+        resources.split(',').each do |resource|
+          started = Time.now
+          log.debug event: 'load_resource', resource: resource
+
+          ops = load_resource resource
+
+          log.info \
+            event: 'loaded_resource',
+            resource: resource,
+            elapsed: Time.now - started
+
+
+          started = Time.now
+          log.debug event: 'index_resource', resource: resource
+
+          index_resource resource, ops
+
+          log.info \
+            event: 'indexed_resource',
+            resource: resource,
+            elapsed: Time.now - started
+        end
+      end
+
+
+
+      def load_resource resource
+        ridley.send(resource.to_sym).all.pmap(8) do |r|
+          r = if resource == 'cookbook'
+            { 'name' => r[0], 'versions' => r[1] }
+          else
+            deep_hash r.reload
+          end
+
+          r['type'] = r['chef_type'] || resource
+          r['id'] = r['name']
+
+          raise if r['id'].nil?
+
+          log.trace event: 'reload_object', object: r
+
+          {
+            index: {
+              _index: index,
+              _type: r['type'],
+              _id: r['id'],
+              data: r
+            }
+          }
+        end
+      end
+
+
+
+      def index_resource resource, ops, bulk_size=500
+        while body = ops.shift(bulk_size)
+          break if body.empty?
+
+          begin
+            log.trace \
+              event: 'bulk_index',
+              response: es.bulk(body: body),
+              resource: resource,
+              size: body.size
+
+            log.debug \
+              event: 'index_resource',
+              resource: resource,
+              size: body.size
+
+          rescue
+            log.error \
+              event: 'bulk_index_failed',
+              resource: resource,
+              size: body.size,
+              body: body.inspect
+          end
+        end
+      end
+
+
+
+      def deep_hash obj
+        if obj.respond_to? :to_hash
+          obj = obj.to_hash
+          obj.keys.each do |k|
+            obj[k] = deep_hash obj[k]
+          end
+          obj
+        else
+          obj
+        end
+      end
+
+
+    end
+  end
+end

data/lib/hoss/main.rb

@@ -1,13 +1,7 @@
-require 'pmap'
-require 'ridley'
-require 'elasticsearch'
-
 require_relative 'metadata'
 require_relative 'mjolnir'
-require_relative 'reindex'
-
+require_relative 'index'
 
-Celluloid.logger = nil
 
 module Hoss
   class Main < Mjolnir
@@ -24,41 +18,21 @@ module Hoss
     end
 
 
-    desc 'reindex', '(Re)index Chef server objects into Elasticsearch'
+    desc 'chef', '(Re)index Chef server objects into Elasticsearch'
     option :knife_path, \
       type: :string,
       aliases: %w[ -k ],
       desc: 'Path to a knife for Chef server to index'
-    option :elasticsearch_host, \
-      type: :string,
-      aliases: %w[ -e ],
-      desc: 'Set Elasticsearch host to connect client',
-      default: 'localhost:9200'
-    option :index_name, \
-      type: :string,
-      aliases: %w[ -i ],
-      desc: 'Set Elasticsearch index name for object documents',
-      default: 'chef'
     option :chef_resources, \
       type: :string,
       aliases: %w[ -r ],
       desc: 'Comma-separated list of Chef resources to index',
       default: 'user,cookbook,data_bag,environment,role,client,node'
+    include_index_options
     include_common_options
-    def reindex
-      ridley = Ridley.from_chef_config options.knife
-
-      elasticsearch = Elasticsearch::Client.new \
-        host: options.elasticsearch_host,
-        reload_connections: true,
-        reload_on_failure: true,
-        trace: options.trace?,
-        log: options.trace? ? log : nil
-
-      Reindex.new options.merge \
-        ridley: ridley,
-        elasticsearch: elasticsearch,
-        logger: log
+    def index_chef
+      Hoss::Index::Chef.new options.merge(logger: log)
     end
+
   end
 end

data/lib/hoss/metadata.rb

@@ -4,7 +4,7 @@ module Hoss
   VERSION  = File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).strip
 
   # We don't really do all that much, be humble
-  SUMMARY  = 'Index your Chef Server with Elasticsearch'
+  SUMMARY  = 'Index your infrastructure with Elasticsearch'
 
   # Your benevolent dictator for life
   AUTHOR   = 'Sean Clemmer'

data/lib/hoss/mjolnir.rb

@@ -35,6 +35,22 @@ class Mjolnir < Thor
   end
 
 
+
+  def self.include_index_options
+    option :elasticsearch_host, \
+      type: :string,
+      aliases: %w[ -e ],
+      desc: 'Set Elasticsearch host to connect client',
+      default: 'localhost:9200'
+    option :index_name, \
+      type: :string,
+      aliases: %w[ -i ],
+      desc: 'Set Elasticsearch index name for object documents',
+      default: 'chef'
+  end
+
+
+
   no_commands do
 
     # Construct a Logger given the command-line options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoss
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-description: Index your Chef Server with Elasticsearch.
+description: Index your infrastructure with Elasticsearch.
 email: sclemmer@bluejeans.com
 executables:
 - hoss
@@ -96,10 +96,11 @@ files:
 - bin/hoss
 - hoss.gemspec
 - lib/hoss.rb
+- lib/hoss/index.rb
+- lib/hoss/index/chef.rb
 - lib/hoss/main.rb
 - lib/hoss/metadata.rb
 - lib/hoss/mjolnir.rb
-- lib/hoss/reindex.rb
 homepage: https://github.com/sczizzo/hoss
 licenses:
 - ISC
@@ -123,5 +124,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Index your Chef Server with Elasticsearch
+summary: Index your infrastructure with Elasticsearch
 test_files: []

data/lib/hoss/reindex.rb

@@ -1,127 +0,0 @@
-module Hoss
-  class Reindex
-    attr_reader :resources, :index, :es, :ridley, :log
-
-    def initialize opts
-      @resources = opts[:chef_resources]
-      @index     = opts[:index_name]
-      @es        = opts[:elasticsearch]
-      @ridley    = opts[:ridley]
-      @log       = opts[:logger]
-
-      log.debug \
-        event: 'reindex',
-        opts: opts
-
-      reindex_started = Time.now
-
-      reindex
-
-      log.info \
-        event: 'reindexed',
-        elapsed: Time.now - reindex_started
-    end
-
-
-
-  private
-
-
-    def reindex
-      resources.split(',').each do |resource|
-        started = Time.now
-        log.debug event: 'load_resource', resource: resource
-
-        ops = load_resource resource
-
-        log.info \
-          event: 'loaded_resource',
-          resource: resource,
-          elapsed: Time.now - started
-
-
-        started = Time.now
-        log.debug event: 'index_resource', resource: resource
-
-        index_resource resource, ops
-
-        log.info \
-          event: 'indexed_resource',
-          resource: resource,
-          elapsed: Time.now - started
-      end
-    end
-
-
-
-    def load_resource resource
-      ridley.send(resource.to_sym).all.pmap(8) do |r|
-        r = if resource == 'cookbook'
-          { 'name' => r[0], 'versions' => r[1] }
-        else
-          deep_hash r.reload
-        end
-
-        r['type'] = r['chef_type'] || resource
-        r['id'] = r['name']
-
-        raise if r['id'].nil?
-
-        log.trace event: 'reload_object', object: r
-
-        {
-          index: {
-            _index: index,
-            _type: r['type'],
-            _id: r['id'],
-            data: r
-          }
-        }
-      end
-    end
-
-
-
-    def index_resource resource, ops, bulk_size=500
-      while body = ops.shift(bulk_size)
-        break if body.empty?
-
-        begin
-          log.trace \
-            event: 'bulk_index',
-            response: es.bulk(body: body),
-            resource: resource,
-            size: body.size
-
-          log.debug \
-            event: 'index_resource',
-            resource: resource,
-            size: body.size
-
-        rescue
-          log.error \
-            event: 'bulk_index_failed',
-            resource: resource,
-            size: body.size,
-            body: body.inspect
-        end
-      end
-    end
-
-
-
-    def deep_hash obj
-      if obj.respond_to? :to_hash
-        obj = obj.to_hash
-        obj.keys.each do |k|
-          obj[k] = deep_hash obj[k]
-        end
-        obj
-      else
-        obj
-      end
-    end
-
-
-  end
-end