es-diag 0.0.2 → 0.0.3

data/es-diag.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "thor"
   s.add_runtime_dependency "ohai"
-
+  s.add_runtime_dependency "hashie"
 end

data/lib/checks/local_node_jvm_heap.rb

@@ -0,0 +1,36 @@
+title "Recommended JVM Heap Size"
+
+
+how_to """
+    Passing JVM level configuration (such as -X parameters) should be set 
+    within the elasticsearch.conf file.
+
+    Use the ES_MIN_MEM and ES_MAX_MEM environment variables to set the minimum 
+    and maximum memory allocation for the JVM (set in mega bytes). It defaults
+    to 256 and 1024 respectively.
+"""
+
+
+#
+# for more detail about es_local_node data bag, see your own node
+# http://localhost:9200/_cluster/nodes/_local
+#
+# for technical detail, see how fetching is implemented in
+# /contexts/es_local_node.rb
+# 
+if data.es_local_node
+  n =  data.es_local_node.nodes.first[1]
+  totmem = n.os.mem.total_in_bytes
+  hmin = n.jvm.mem.heap_init_in_bytes
+  hmax = n.jvm.mem.heap_max_in_bytes
+
+  hmin_r = hmin / totmem
+  hmax_r = hmax / totmem
+
+  if hmin_r < 0.3
+    warn "Min heap size set to #{n.jvm.mem.heap_init}, which is less than 30% of system memory."
+  end
+  if hmax_r > 0.8
+    warn "Max heap size set to #{n.jvm.mem.heap_max}, which is more than 80% of system memory."
+  end
+end

data/lib/checks/ulimits.rb

@@ -1,4 +1,4 @@
-title "ulimit set appropriately - avoid 'Too many open files'"
+title "ulimit Settings ('Too many open files')"
 
 how_to """
     To raise the limit add to /etc/security/limits.conf the lines:

data/lib/contexts/es_local_node.rb

@@ -0,0 +1,22 @@
+require 'open-uri'
+require 'json'
+
+
+title "ElasticSearch Local Node"
+
+node_addr = ES::Diag::Config['es_local_node']
+
+unless node_addr
+  warn "Skipping (no node host provided)."
+  return
+end
+
+begin
+  cdata = JSON.parse open("http://#{node_addr}/_cluster/nodes/_local").read
+  context "es_local_node", cdata
+rescue
+  error "Gathering local node data: #{$!}"
+end
+
+
+

data/lib/es-diag.rb

@@ -4,18 +4,10 @@ require 'ohai'
 
 module ES
   module Diag
-    module Context
-      def self.data
-        unless @ohai
-          Ohai::Config[:plugin_path] << File.expand_path('ohai_plugins', File.dirname(__FILE__))
-          @ohai= Ohai::System.new
-          @ohai.all_plugins
-        end
-        @ohai
-      end
-    end
+    Config = {}
   end
 end
 
+require 'es-diag/context'
 require 'es-diag/check'
 

data/lib/es-diag/check.rb

@@ -8,7 +8,7 @@ class ES::Diag::Check
   end
 
   def data
-    ES::Diag::Context.data
+    @data ||= ES::Diag::Context.new(@ui).data
   end
 
   def how_to(text)
@@ -37,7 +37,7 @@ class ES::Diag::Check
         @ui.warn "- #{warning}"
       end
       if @run_context[:help]
-        @ui.info "\n\nUse these instructions to amend the problems:"
+        @ui.info "\n\n#{@ui.em 'Use these instructions to amend the problems:'}"
         @ui.info @run_context[:help] + "\n"
       end
     end

data/lib/es-diag/cli.rb

@@ -6,18 +6,18 @@ require 'es-diag'
 class ES::Diag::CLI < Thor
 
   desc "status", "report back current status and recommendations."
-  def status
-    say "Checking..."
+  def status(cluster_node=nil)
+    info "Checking..."
+    ES::Diag::Config['es_local_node'] = cluster_node
     c = ES::Diag::Check.new(self)
     c.all_checks
-
   end
 
 
 
   no_tasks do
     def title(text)
-      say "* #{text}"
+      say "\n* #{text}"
     end
 
     def info(detail=nil)
@@ -27,6 +27,14 @@ class ES::Diag::CLI < Thor
     def warn(detail)
       say detail, :yellow
     end
+
+    def error(detail)
+      say detail, :red
+    end
+
+    def em(text)
+      shell.set_color(text, nil, true)
+    end
   end
 
 end

data/lib/es-diag/context.rb

@@ -0,0 +1,59 @@
+require 'hashie'
+
+module ES
+  module Diag
+    class Context
+
+      def initialize(ui)
+        @ui=ui
+      end
+      
+      def warn(text)
+        @ui.warn "[#{@run_context[:title]}] #{text}"
+      end
+
+      def error(text)
+        @ui.warn "[#{@run_context[:title]}] #{text}"
+      end
+
+      def title(text)
+        @run_context[:title] = text
+      end
+
+      def context(k,v)
+        @run_context[:context] = {:key => k, :val => v} 
+      end
+
+      def data
+        unless @ohai
+          @ui.info("Collecting system information...")
+          Ohai::Config[:plugin_path] << File.expand_path('../ohai_plugins', File.dirname(__FILE__))
+          @ohai = Ohai::System.new
+          @ohai.all_plugins
+
+          #enrich base data
+          @ui.info("Collecting extra information...")
+          all_contexts
+        end
+        @ohai
+      end
+
+      def all_contexts
+        Dir[File.expand_path('../contexts/*.rb', File.dirname(__FILE__))].each do |fcheck|
+          run_context(fcheck)
+        end
+      end
+
+      def run_context(filename)
+        @run_context = {}
+        self.instance_eval(IO.read(filename), filename, 1)
+        if @run_context[:context]
+          data[@run_context[:context][:key]] = Hashie::Mash.new @run_context[:context][:val]
+        else
+          warn "No real data fetched. Watch output for errors."
+        end
+      end
+    end
+  end
+end
+

data/lib/es-diag/version.rb

@@ -1,5 +1,5 @@
 module ES
   module Diag
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: es-diag
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000 Z
+date: 2012-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Elastic Search diagnostics tool
 email:
 - jondotan@gmail.com
@@ -57,10 +73,13 @@ files:
 - Rakefile
 - bin/es-diag
 - es-diag.gemspec
+- lib/checks/local_node_jvm_heap.rb
 - lib/checks/ulimits.rb
+- lib/contexts/es_local_node.rb
 - lib/es-diag.rb
 - lib/es-diag/check.rb
 - lib/es-diag/cli.rb
+- lib/es-diag/context.rb
 - lib/es-diag/version.rb
 - lib/ohai_plugins/ulimit.rb
 - resources/screen.png