greenhat 0.4.0 → 0.5.0

data/lib/greenhat/thing/formatters/kube_json.rb

@@ -19,9 +19,9 @@ module GreenHat
         end
 
         # Parsing Time
-        format_json_traverse result
+        format_time(result)
 
-        result.sort.to_h
+        result
       rescue StandardError => e
         # TODO: Background Logger?
         e.message
@@ -31,6 +31,7 @@ module GreenHat
 
       :ok
     end
+
     # =========================================================================
   end
 end

data/lib/greenhat/thing/formatters/multiline_json.rb

@@ -4,7 +4,7 @@ module GreenHat
   module Formatters
     # Formatters for single json blobs in entire file
     def format_multiline_json
-      self.result = Oj.load raw.join
+      self.result = Oj.load raw_full.join
     end
   end
 end

data/lib/greenhat/thing/formatters/nginx.rb

@@ -6,7 +6,9 @@ module GreenHat
     # Formatters
     # ==========================================================================
     def format_nginx
-      self.result = raw.map do |row|
+      output = raw.map do |row|
+        next if row.chomp.empty?
+
         conn_data, rest = row.split(' [', 2)
         ip, _sym, remote_user = conn_data.split(' ', 3)
 
@@ -35,6 +37,8 @@ module GreenHat
         { msg: row }
       end
 
+      # Remove Empty Entries
+      self.result = output.compact
       :ok
     end
 

data/lib/greenhat/thing/formatters/table.rb

@@ -2,17 +2,17 @@
 module GreenHat
   # Log
   module Formatters
-    # Formatters for Dmesg
+    # Table Formatting
     def format_table
       # Headers to Readable Symbol
-      headers = raw.first.split(' ', 6).map(&:downcase).map do |x|
+      headers = raw_full.first.split(' ', 6).map(&:downcase).map do |x|
         x.gsub(/\s+/, '_').gsub(/[^0-9A-Za-z_]/, '')
       end.map(&:to_sym)
 
       final = []
 
       # Put fields into a Hash based on Location/Key
-      raw[1..].map(&:split).each do |row|
+      raw_full.map(&:split)[1..].each do |row|
         result = {}
         row.each_with_index do |detail, i|
           result[headers[i]] = detail

data/lib/greenhat/thing/helpers.rb

@@ -25,17 +25,6 @@ module GreenHat
         tmp_path.split('/').last(2).join(divider)
       end
     end
-
-    # Check what kind of file we have
-    def type_check
-      if info?
-        :info
-      elsif SuperLog.type?(path)
-        :log
-      else
-        :raw
-      end
-    end
   end
 end
 

data/lib/greenhat/thing/info_format.rb

@@ -64,15 +64,15 @@ module GreenHat
       conns, sockets = raw.split { |x| x.include? 'Active' }.reject(&:empty?)
 
       formatted_conns = conns[1..].map do |entry|
-        entry.split(' ', 7).map(&:strip).each_with_index.map do |field, idx|
+        entry.split(' ', 7).map(&:strip).each_with_index.to_h do |field, idx|
           [format_netstat_conn_headers[idx], field]
-        end.to_h
+        end
       end
 
       formatted_sockets = sockets[1..].map do |entry|
-        entry.split('  ').map(&:strip).reject(&:blank?).each_with_index.map do |field, idx|
+        entry.split('  ').map(&:strip).reject(&:blank?).each_with_index.to_h do |field, idx|
           [format_netstat_socket_headers[idx], field]
-        end.to_h
+        end
       end
 
       {

data/lib/greenhat/thing/super_log.rb

@@ -1,102 +1 @@
-# TODO: Deprecate, was used specifically for Elk
-# rubocop:disable  /AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/
-module GreenHat
-  # Log Identifier
-  module SuperLog
-    def self.log?(kind)
-      [
-        'gitaly/current',
-        'gitaly/gitaly_ruby_json.log',
-        'gitlab-rails/api_json.log',
-        'gitlab-rails/application_json.log',
-        'gitlab-rails/audit_json.log',
-        'gitlab-rails/graphql_json.log',
-        'gitlab-rails/integrations_json.log',
-        'gitlab-rails/production_json.log',
-        'gitlab-rails/sidekiq_client.log',
-        'gitlab-shell/gitlab-shell.log',
-        'gitlab-workhorse/current',
-        'puma/puma_stdout.log',
-        'sidekiq/current',
-        'gitlab-rails/importer.log',
-        'gitlabsos.log',
-        'nginx/gitlab_access.log',
-        'patroni/current'
-      ].any? { |x| x.include? kind.to_s }
 
-      true
-    end
-
-    # ==========================================================================
-    # File Pattern Matching
-    # ==========================================================================
-    def self.api_json_format?(path)
-      ['rails_api_json_log'].any? { |x| path.include? x }
-    end
-
-    def self.unicorn_stderr_format?(path)
-      %w[
-        unicorn_stderr
-      ].any? { |x| path.include? x }
-    end
-
-    def self.reconfigure_format?(path)
-      %w[
-        reconfigure
-      ].any? { |x| path.include? x }
-    end
-
-    def self.shellwords?(path)
-      %w[
-        gitlab_pages_current
-        alertmanager_current
-        registry_current
-        prometheus_current
-
-      ].any? { |x| path.include? x }
-    end
-
-    def self.time_space?(path)
-      %w[
-        postgresql_current
-        redis_current
-        unicorn_current
-        gitlab_monitor_current
-        sidekiq_exporter_log
-      ].any? { |x| path.include? x }
-    end
-
-    def self.json_format?(path)
-      %w[
-        production_json_log
-        gitaly_current
-        geo_log
-        sidekiq_current
-        sidekiq_log
-        gitlab_shell_gitlab_shell_log
-        gitlab_rails_audit_json_log
-        gitlab_rails_application_json_log
-      ].any? { |x| path.include? x }
-    end
-
-    def self.dmesg_format?(path)
-      %w[
-        dmesg
-      ].any? { |x| path.include? x }
-    end
-    # ==========================================================================
-
-    # Identify Formatter
-    def self.type?(path)
-      return :api_json_format if api_json_format?(path)
-      return :unicorn_stderr_format if unicorn_stderr_format?(path)
-      return :reconfigure_format if reconfigure_format?(path)
-      return :shellwords if shellwords?(path)
-      return :time_space if time_space?(path)
-      return :json_format if json_format?(path)
-      return :dmesg_format if dmesg_format?(path)
-
-      nil
-    end
-  end
-end

data/lib/greenhat/thing.rb

@@ -24,8 +24,7 @@ class Thing < Teron
 
   # Preloader Flags
   field :parsed # Flag for Parsing
-  field :result # Processed Data
-  field :raw_result # Flag for reading raw data
+  field :result, dump: false # Processed Data
   field :result_fields # All available fields
 
   def friendly_name
@@ -57,10 +56,14 @@ class Thing < Teron
     result_fields
   end
 
+  # Readlines rather than putting whole thing into memory
   def raw
-    raw_read if raw_result.nil?
+    File.foreach(file)
+  end
 
-    raw_result
+  # Where full read is needed
+  def raw_full
+    File.read(file).split("\n")
   end
 
   # Filter / Archive Pattern Matching
@@ -73,32 +76,27 @@ class Thing < Teron
     data.blank?
   end
 
-  def raw_read
-    spin_start("Read  #{name.pastel(:blue)} #{size.pastel(:bright_black)}")
-    self.raw_result = File.read(file).split("\n")
-  rescue StandardError => e
-    LogBot.fatal('Raw Read', message: e.message, backtrace: e.backtrace.first)
-    self.raw_result = ''
-  ensure
-    spin_done
-  end
-
   def output(print_it = true)
     if print_it
-      puts raw.join("\n")
+      puts raw.map(&:to_s).map(&:chomp)
     else
-      raw
+      raw.map(&:to_s).map(&:chomp)
     end
   end
 
-  # Log Identifier Helper
-  def log?
-    GreenHat::SuperLog.log? kind
+  # Hashed values searching
+  def process?
+    kind != :raw && methods.include?(formatter)
   end
 
-  # Hashed values searching
-  def processed?
-    kind != :raw
+  # Things that can be queried (Query Helper)
+  def query?
+    data.instance_of?(Array)
+  end
+
+  # Helper for all things that can be hash/value filtered
+  def self.list
+    all.select.select(&:process?)
   end
 
   # Helper Formatter Method
@@ -107,9 +105,6 @@ class Thing < Teron
   end
 
   def process
-    # Read First if Needed (Spinner)
-    raw_read if raw_result.nil?
-
     if methods.include? formatter
       spin_start("Parse #{name.pastel(:blue)} #{kind.to_s.pastel(:bright_black)} ")
       begin

data/lib/greenhat/version.rb

@@ -1,3 +1,3 @@
 module GreenHat
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greenhat
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Davin Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -476,6 +476,7 @@ files:
 - lib/greenhat/shell/pipe.rb
 - lib/greenhat/shell/platform.rb
 - lib/greenhat/shell/process.rb
+- lib/greenhat/shell/query.rb
 - lib/greenhat/shell/report.rb
 - lib/greenhat/shell/shell_helper.rb
 - lib/greenhat/thing.rb