greenhat 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 562e92d64d65ccb2791a5602855d0fb9de79b443e4116f2a906fa34d07f7d0ae
-  data.tar.gz: 23040e75b3c4ea72b9363aab2f5db85d420a7e990dfab120e550890b29755413
+  metadata.gz: efdb641c3ae684fcaf175c79aca027340e28bca4baeb97d2760f879709cbf511
+  data.tar.gz: 04a8a25c0e5f3ffd1fb3f4de4b1c65856c90d902418725cabe87aca9c1fbbfa8
 SHA512:
-  metadata.gz: 4b4e2da3672c747354ac630d3347be6ac49a1ddec84f034ffecef51528f1277fd3e079fea742cfe1a55762ed99f4ddd74d1b2166a6ef55a24e8d2eb2ccbaa9bf
-  data.tar.gz: 594011521f46b879c5c3636828263577411810d30d49b7b8dc811fcb50260c692e45cf3884bed31ca45a482503324a51085280226668e8bd3d94d729d49be361
+  metadata.gz: af18184676b26aaff2c24ed85a18902fc06f08939755f9698d2fd43664fd5727a1b464aafd5b4c879a8c6065af856fb733c69022b6b2ec73389913468ce21c00
+  data.tar.gz: c0442ebaeb59941d09f4b413fcb36431a7975153ad4f5ff56d4e9c3cc29ad20c62836ec201f6de1b9e94a3f50d28d76973440c91b0f3d6f1a69347f00daf97c0

data/lib/greenhat/accessors/disk.rb

@@ -45,6 +45,9 @@ module GreenHat
       ].join
 
       disks.map do |disk|
+        # Safety
+        next if disk.nil? || disk.use.nil?
+
         # Pretty Disk Use
         use = [
           disk.use.rjust(5).ljust(5).pastel(:green),

data/lib/greenhat/host.rb

@@ -148,7 +148,7 @@ class Host < Teron
 
     headers = file.raw.first.split(' ', 11)
     list = file.raw[1..].each.map do |row|
-      row.split(' ', 11).each_with_index.each_with_object({}) do |(v, i), obj|
+      row.split(' ', 11).each_with_index.with_object({}) do |(v, i), obj|
         obj[headers[i]] = v
       end
     end

data/lib/greenhat/shell/args.rb

@@ -63,7 +63,13 @@ module GreenHat
           flags[arg.field] = arg.value
 
           true
-        # Ignore Good Entries
+        # Special Flags -- Send Full Thing
+        elsif arg_to_flag_raw_list.include?(arg.field)
+          flags[arg.field] ||= []
+          flags[arg.field].push arg
+
+          true
+          # Ignore Good Entries
         else
           false
         end
@@ -85,6 +91,13 @@ module GreenHat
       ]
     end
 
+    # Don't parse the flag value, just give it to the flag
+    def self.arg_to_flag_raw_list
+      %i[
+        stats_limit
+      ]
+    end
+
     # Arg Scan (Split -- values into keys)
     def self.arg_scan(arg)
       arg.scan(/^-+([^=]+)=(.*)/).map do |field, value|

data/lib/greenhat/shell/filter_help.rb

@@ -105,6 +105,15 @@ module GreenHat
 
           ],
 
+          stats_limit: [
+            '--stats_limit'.pastel(:green),
+            '  Companion to the `stats` and used to filters total output percentages. Supports multiple and logic params',
+            '  Ex: --stats_limit>=1 will only show stats results with higher than 1% frequency',
+            '  Ex: --stats_limit<=15 --stats_limit>=10 slice >10% and <15% frequency',
+            '  Ex: --stats_limit=1, filter for greater than %1'
+
+          ],
+
           uniq: [
             '--uniq'.pastel(:green),
             '  Show unique values only',

data/lib/greenhat/shell/log.rb

@@ -2,7 +2,6 @@ module GreenHat
   # CLI Helper
   module Shell
     # Logs
-    # rubocop:disable Metrics/ModuleLength
     module Log
       def self.auto_complete(list, word)
         # Argument Parsing
@@ -56,7 +55,7 @@ module GreenHat
         puts
 
         puts '  search'.pastel(:green)
-        puts "    General full text by file searching. See #{'search_help'.pastel(:blue)}"
+        puts "    Deprecated! Use the #{'filter --text="search"'.pastel(:blue)} instead"
         puts
 
         puts '  save'.pastel(:green)
@@ -288,33 +287,35 @@ module GreenHat
       # ========================================================================
       # Search (Full Text / String Search)
       # ========================================================================
-      def self.search(raw)
-        # Extract Args
-        files_list, flags, args = Args.parse(raw)
-
-        # Prepare Log List
-        files = ShellHelper.prepare_list(files_list, ShellHelper::Log.list)
-
-        results = ShellHelper.search_start(files, flags, args)
-
-        # Skip and Print Total if set
-        if flags[:total]
-          ShellHelper.total_count(results, flags)
-          return true
-        end
-
-        # Check Search Results
-        if results.values.flatten.empty?
-          puts 'No results'.pastel(:red)
-          ShellHelper::Log.no_files_warning(files) if ShellHelper.find_things(files, flags).count.zero?
-        else
-          # This causes the key 'colorized' output to also be included
-          ShellHelper.show(results.to_a.compact.flatten, flags)
-        end
-      rescue StandardError => e
-        LogBot.fatal('Search', message: e.message)
-        ap e.backtrace
-      end
+      # Deprecated
+      # TODO: Remove
+      # def self.search(raw)
+      #   # Extract Args
+      #   files_list, flags, args = Args.parse(raw)
+
+      #   # Prepare Log List
+      #   files = ShellHelper.prepare_list(files_list, ShellHelper::Log.list)
+
+      #   results = ShellHelper.search_start(files, flags, args)
+
+      #   # Skip and Print Total if set
+      #   if flags[:total]
+      #     ShellHelper.total_count(results, flags)
+      #     return true
+      #   end
+
+      #   # Check Search Results
+      #   if results.values.flatten.empty?
+      #     puts 'No results'.pastel(:red)
+      #     ShellHelper::Log.no_files_warning(files) if ShellHelper.find_things(files, flags).count.zero?
+      #   else
+      #     # This causes the key 'colorized' output to also be included
+      #     ShellHelper.show(results.to_a.compact.flatten, flags)
+      #   end
+      # rescue StandardError => e
+      #   LogBot.fatal('Search', message: e.message)
+      #   ap e.backtrace
+      # end
       # ========================================================================
 
       # Supported Params
@@ -323,56 +324,53 @@ module GreenHat
       # --slice=time,path (E.g. log filter  --path='mirror/pull' --slice=path,time )
       # --except: Exclude specific fields (except multiple with comma)
 
-      # rubocop:disable Metrics/MethodLength
-      def self.search_help
-        puts "\u2500".pastel(:cyan) * 20
-        puts 'Log Search'.pastel(:yellow)
-        puts "\u2500".pastel(:cyan) * 20
-
-        puts 'Search will do a full line include or exclude text search'
-
-        puts 'Options'.pastel(:blue)
-        puts '--text'.pastel(:green)
-        puts '  Primary parameter for searching. Include or ! to exclude'
-        puts '  Ex: --text=BuildHooksWorker --text!=start sidekiq/current'
-        puts
-
-        puts '--total'.pastel(:green)
-        puts '  Print only total count of matching entries'
-        puts
-
-        puts '--slice'.pastel(:green)
-        puts '  Extract specific fields from entries (slice multiple with comma)'
-        puts '  Ex: --slice=path or --slice=path,params'
-        puts
-
-        puts '--except'.pastel(:green)
-        puts '  Exclude specific fields (except multiple with comma)'
-        puts '  Ex: --except=params --except=params,path'
-        puts
-
-        puts '--archive'.pastel(:green)
-        puts '  Limit to specific archive name (inclusive). Matching SOS tar.gz name'
-        puts '  Ex: --archive=dev-gitlab_20210622154626, --archive=202106,202107'
-        puts
-
-        puts '--limit'.pastel(:green)
-        puts '  Limit total number of results. Default to half total screen size'
-        puts '  Ex: --limit; --limit=10'
-        puts
-
-        puts 'Search specific logs'.pastel(:blue)
-        puts '  Any non dash parameters will be the log list to search from'
-        puts "  Ex: log filter --path=api sidekiq/current (hint: use  `#{'ls'.pastel(:yellow)}` for log names)"
-        puts
-
-        puts 'Example Queries'.pastel(:blue)
-        puts 'log search --text=BuildHooksWorker --text!=start sidekiq/current --total'
-        puts 'log search --text=BuildHooksWorker --text!=start --slice=enqueued_at sidekiq/current'
-        puts
-      end
-      # rubocop:enable Metrics/MethodLength,Metrics/ModuleLength
-
+      # def self.search_help
+      #   puts "\u2500".pastel(:cyan) * 20
+      #   puts 'Log Search'.pastel(:yellow)
+      #   puts "\u2500".pastel(:cyan) * 20
+
+      #   puts 'Search will do a full line include or exclude text search'
+
+      #   puts 'Options'.pastel(:blue)
+      #   puts '--text'.pastel(:green)
+      #   puts '  Primary parameter for searching. Include or ! to exclude'
+      #   puts '  Ex: --text=BuildHooksWorker --text!=start sidekiq/current'
+      #   puts
+
+      #   puts '--total'.pastel(:green)
+      #   puts '  Print only total count of matching entries'
+      #   puts
+
+      #   puts '--slice'.pastel(:green)
+      #   puts '  Extract specific fields from entries (slice multiple with comma)'
+      #   puts '  Ex: --slice=path or --slice=path,params'
+      #   puts
+
+      #   puts '--except'.pastel(:green)
+      #   puts '  Exclude specific fields (except multiple with comma)'
+      #   puts '  Ex: --except=params --except=params,path'
+      #   puts
+
+      #   puts '--archive'.pastel(:green)
+      #   puts '  Limit to specific archive name (inclusive). Matching SOS tar.gz name'
+      #   puts '  Ex: --archive=dev-gitlab_20210622154626, --archive=202106,202107'
+      #   puts
+
+      #   puts '--limit'.pastel(:green)
+      #   puts '  Limit total number of results. Default to half total screen size'
+      #   puts '  Ex: --limit; --limit=10'
+      #   puts
+
+      #   puts 'Search specific logs'.pastel(:blue)
+      #   puts '  Any non dash parameters will be the log list to search from'
+      #   puts "  Ex: log filter --path=api sidekiq/current (hint: use  `#{'ls'.pastel(:yellow)}` for log names)"
+      #   puts
+
+      #   puts 'Example Queries'.pastel(:blue)
+      #   puts 'log search --text=BuildHooksWorker --text!=start sidekiq/current --total'
+      #   puts 'log search --text=BuildHooksWorker --text!=start --slice=enqueued_at sidekiq/current'
+      #   puts
+      # end
       # ------------------------------------------------------------------------
     end
   end

data/lib/greenhat/shell/old_search_helper.rb

@@ -1,54 +1,56 @@
-module GreenHat
-  # Deprecating search stuff
-  module ShellHelper
-    # Main Entry Point for Searching
-    # def self.search_start(log_list, filter_type, args, opts)
-    def self.search_start(files, flags, args)
-      # Convert to Things
-      logs = ShellHelper.find_things(files, flags)
-
-      logs.each_with_object({}) do |log, obj|
-        # Ignore Empty Results / No Thing
-        next if log&.data.blank?
-
-        obj[log.friendly_name] = ShellHelper.search(log.data, flags, args)
-
-        obj
-      end
-    end
-
-    # Generic Search Helper / String/Regex
-    def self.search(data, flags = {}, args = {})
-      results = data.clone.flatten.compact
-      results.select! do |row|
-        args.send(flags.logic) do |arg|
-          search_row(row, arg, flags)
-        end
-      end
-
-      # Strip Results if Slice is defined
-      results.map! { |row| row.slice(*flags[:slice]) } if flags[:slice]
-
-      # Strip Results if Except is defined
-      results.map! { |row| row.except(*flags[:except]) } if flags[:except]
-
-      # Remove Blank from either slice or except
-      results.reject!(&:empty?)
-
-      results
-    end
-
-    # Break out filter row logic into separate method
-    def self.search_row(row, arg, flags)
-      # Sensitivity Check / Check for Match
-      included = filter_row_entry(row.to_s, arg, flags)
-
-      # Pivot of off include vs exclude
-      if arg.bang
-        !included
-      else
-        included
-      end
-    end
-  end
-end
+# Deprecated
+# TODO: Remove
+# module GreenHat
+#   # Deprecating search stuff
+#   module ShellHelper
+#     # Main Entry Point for Searching
+#     # def self.search_start(log_list, filter_type, args, opts)
+#     def self.search_start(files, flags, args)
+#       # Convert to Things
+#       logs = ShellHelper.find_things(files, flags)
+
+#       logs.each_with_object({}) do |log, obj|
+#         # Ignore Empty Results / No Thing
+#         next if log&.data.blank?
+
+#         obj[log.friendly_name] = ShellHelper.search(log.data, flags, args)
+
+#         obj
+#       end
+#     end
+
+#     # Generic Search Helper / String/Regex
+#     def self.search(data, flags = {}, args = {})
+#       results = data.clone.flatten.compact
+#       results.select! do |row|
+#         args.send(flags.logic) do |arg|
+#           search_row(row, arg, flags)
+#         end
+#       end
+
+#       # Strip Results if Slice is defined
+#       results.map! { |row| row.slice(*flags[:slice]) } if flags[:slice]
+
+#       # Strip Results if Except is defined
+#       results.map! { |row| row.except(*flags[:except]) } if flags[:except]
+
+#       # Remove Blank from either slice or except
+#       results.reject!(&:empty?)
+
+#       results
+#     end
+
+#     # Break out filter row logic into separate method
+#     def self.search_row(row, arg, flags)
+#       # Sensitivity Check / Check for Match
+#       included = filter_row_entry(row.to_s, arg, flags)
+
+#       # Pivot of off include vs exclude
+#       if arg.bang
+#         !included
+#       else
+#         included
+#       end
+#     end
+#   end
+# end

data/lib/greenhat/shell/query.rb

@@ -252,7 +252,7 @@ module GreenHat
         next unless x.key? :time
 
         x = x.clone # Prevent Top Level Modification
-        x[:time] = x[:time].in_time_zone time_zone
+        x[:time] = x[:time].in_time_zone time_zone.upcase
 
         x
       end
@@ -406,6 +406,9 @@ module GreenHat
         # Total Occurences
         total = occurrences.values.sum
 
+        # Limit Output
+        filter_stats_limiter(occurrences, total, flags[:stats_limit]) if flags.key?(:stats_limit)
+
         # Percs
         occurrences.transform_values! do |count|
           [
@@ -450,6 +453,21 @@ module GreenHat
       end
     end
 
+    # Additional Filtering through stats_limit
+    def self.filter_stats_limiter(results, total, limits)
+      results.select! do |_k, v|
+        limits.all? do |limit|
+          # Shim for Integers
+          if limit.logic == :include?
+            percent(v, total).send(:>=, limit.value)
+          else
+            percent(v, total).send(limit.logic, limit.value)
+          end
+          # ------------
+        end
+      end
+    end
+
     def self.filter_empty_arg(arg)
       puts [
         'Ignoring'.pastel(:bright_yellow),
@@ -460,7 +478,7 @@ module GreenHat
 
     # Break out filter row logic into separate method
     def self.filter_row_key(row, arg, flags)
-      return false if row.nil? # Nothing to filter if row empty
+      return false if row.nil? || row.zero? # Nothing to filter if row empty
 
       # Ignore Other Logic if Field isn't even included / Full Text Searching
       return false unless row.key?(arg[:field]) || arg[:field] == :text
@@ -475,6 +493,9 @@ module GreenHat
       else
         match
       end
+    rescue StandardError => e
+      LogBot.fatal('[Query] Filter Row Failure', message: e.message, backtrace: e.backtrace.first, row: row)
+      false
     end
 
     # Field Partial / Case / Exact search

data/lib/greenhat/shell/shell_helper.rb

@@ -284,7 +284,7 @@ module GreenHat
     end
 
     def self.field_table(list, columns = 4)
-      return nil if list.size.zero?
+      return nil if list.empty?
 
       # Keep Alphabetical Sort
       groups = list.each_slice((list.size / columns.to_f).round).to_a

data/lib/greenhat/thing/file_types.rb

@@ -115,6 +115,54 @@ module GreenHat
             %r{geo-logcursor/current}
           ]
         },
+        'elastic_info' => {
+          format: :raw,
+          pattern: [
+            /elastic_info/
+          ]
+        },
+        'fast-stats/api' => {
+          format: :raw,
+          pattern: [
+            %r{fast-stats/api}
+          ]
+        },
+        'fast-stats/gitaly' => {
+          format: :raw,
+          pattern: [
+            %r{fast-stats/gitaly}
+          ]
+        },
+        'fast-stats/production' => {
+          format: :raw,
+          pattern: [
+            %r{fast-stats/production}
+          ]
+        },
+        'fast-stats/sidekiq' => {
+          format: :raw,
+          pattern: [
+            %r{fast-stats/sidekiq}
+          ]
+        },
+        'non_analyzed_tables' => {
+          format: :raw,
+          pattern: [
+            /non_analyzed_tables/
+          ]
+        },
+        'schema_dump_result' => {
+          format: :raw,
+          pattern: [
+            /schema_dump_result/
+          ]
+        },
+        'log/mail.log' => {
+          format: :raw,
+          pattern: [
+            %r{log/mail.log}
+          ]
+        },
         'gitaly/current' => {
           format: :json_shell,
           log: true,

data/lib/greenhat/thing/info_format.rb

@@ -99,7 +99,7 @@ module GreenHat
     def ps_format
       headers = info.ps.first.split(' ', 11)
       list = info.ps[1..].each.map do |row|
-        row.split(' ', 11).each_with_index.each_with_object({}) do |(v, i), obj|
+        row.split(' ', 11).each_with_index.with_object({}) do |(v, i), obj|
           obj[headers[i]] = v
         end
       end

data/lib/greenhat/version.rb

@@ -1,3 +1,3 @@
 module GreenHat
-  VERSION = '0.6.7'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greenhat
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Davin Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-19 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print