greenhat 0.3.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c055abc7397135be9ca07e7965fc88d67f1d7d16099a5cc5db1977986490361
-  data.tar.gz: 2e2f66a3bbc5bdc84e8b5bef9abfa28706f48841f25c7e642fe352c063745e22
+  metadata.gz: 98d1acd7b3c698127214711199399e78d7b72f4762d8beb575fb2ac1d3e2ae1b
+  data.tar.gz: 011d2f2e27b278a06f87605d13809f3472b5223f39937e6fed55ecc28476ea00
 SHA512:
-  metadata.gz: d9fcd1274e4887fa332a053185ea1049e5db2f3d449714542a31084234326d48623e95e0fb8678b6cb67b20b636ec04c82db1555ff43aac09f158d6df4fc7dc0
-  data.tar.gz: c6fe018479b7cc90f2e70b411761fe5e3b8da5d4237064e3bb450399f966cf00a0302adc433ebf39fad57565ca11efbd95fbd0601a15f2989bc1c6455029a4e8
+  metadata.gz: 2b253023196cc698fc9022455e1a43e6add8fae2e63512e946fb207619e7e29c83783e9b9a265e1f77ce3dcbcb81be270b7bb3896a0822c6bad06c51dec8571f
+  data.tar.gz: 850d05cc4ea5d95e53e289c4781232af8719286c9b3c1165cf9afeac25bf19122a79249bc290ddad9cc4b00767d4c5396052fe5c7e9c43b9b7742f9c15eb1c7f

data/bin/greenhat

@@ -1,12 +1,8 @@
-#!/usr/bin/env ruby
-
+#!/usr/bin/env -S RUBY_GC_OLDMALLOC_LIMIT_MAX=600000000 RUBY_GC_OLDMALLOC_LIMIT=256000000 RUBY_GC_MALLOC_LIMIT=16000000 RUBY_GC_MALLOC_LIMIT_MAX=600000000 ruby
 require 'greenhat'
 
-# DEV ONLY
-require 'pry'
-
 Dir.mktmpdir('greenhat-sauce') do |tmp|
   $TMP = tmp
   $STDOUT_CLONE = $stdout.clone
-  GreenHat::Cli.start ARGV
+  GreenHat::Entrypoint.start ARGV
 end

data/lib/greenhat/accessors/disk.rb

@@ -30,7 +30,6 @@ module GreenHat
     end
 
     # Unified Output Handler
-    # rubocop:disable Metrics/MethodLength
     def self.format_output(file, name = false, limit = nil, filter = %w[tmpfs loop])
       output = []
 
@@ -62,7 +61,7 @@ module GreenHat
           disk.use.rjust(5).ljust(5).pastel(:green),
           '  ['.pastel(:blue),
           ('=' * (disk.use.to_i / 2)).pastel(:green),
-          ' ' * (50 - disk.use.to_i / 2),
+          ' ' * (50 - (disk.use.to_i / 2)),
           ']'.pastel(:blue)
         ].join
 
@@ -78,7 +77,6 @@ module GreenHat
 
       output
     end
-    # rubocop:enable Metrics/MethodLength
 
     # Unified Output Handler
     def self.markdown_format(file, name = false, limit = nil, filter = %w[tmpfs loop])

data/lib/greenhat/accessors/gitlab.rb

@@ -35,14 +35,18 @@ module GreenHat
     end
 
     # Show GitLab Services in a grid / include versions
+    # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
     def self.services(archive, indent = 0)
       manifest = archive.things.find { |x| x.type == 'gitlab/version-manifest.json' }
       gitlab_status = archive.things.find { |x| x.name == 'gitlab_status' }
 
+      # Dont' show invalid
+      return nil if gitlab_status.data.to_s.include? "Could not find 'bundler'"
       return nil unless gitlab_status
 
       list = gitlab_status.data.keys.sort.map do |service|
         color = gitlab_status.data.dig(service, 0, :status) == 'run' ? :green : :red
+        status = gitlab_status.data.dig(service, 0, :status) == 'run' ? '↑' : '↓'
 
         # Collect Service version from manifest
         version = manifest.data.software[service.to_sym]&.display_version
@@ -50,7 +54,7 @@ module GreenHat
         # If able to identify version use / fallback
         if version
           [
-            service.pastel(color),
+            "#{service}#{status}".pastel(color),
             "(#{version})".pastel(:bright_black)
           ].join(' ')
         else
@@ -71,13 +75,14 @@ module GreenHat
 
       table.render(:unicode, padding: [0, 1, 0, 1], indent: indent)
     end
+    # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 
     def self.services_markdown(archive)
       # manifest = archive.things.find { |x| x.type == 'gitlab/version-manifest.json' }
       gitlab_status = archive.things.find { |x| x.name == 'gitlab_status' }
 
       list = gitlab_status.data.keys.sort.map do |service|
-        status = gitlab_status.data.dig(service, 0, :status) == 'run' ? '↑' : '!'
+        status = gitlab_status.data.dig(service, 0, :status) == 'run' ? '↑' : '↓'
 
         "#{service}#{status}"
       end

data/lib/greenhat/accessors/memory.rb

@@ -6,7 +6,7 @@ module GreenHat
     end
 
     def self.percentage(used, total)
-      return 0 if used.to_i.zero?
+      return 0 if used.to_i.zero? || total.to_i.zero?
 
       # Show at least one bar if below 1%
       [1, ((used.to_i / total.to_f).round(1) * 100).round].max

data/lib/greenhat/archive.rb

@@ -7,7 +7,7 @@ module GreenHat
       Dir.mkdir path
 
       # Initially Copy file into tmpdir
-      FileUtils.cp(archive_path, "#{path}/")
+      FileUtils.cp_r(archive_path.to_s, "#{path}/")
 
       # Extract Everything
       loop do
@@ -28,9 +28,6 @@ module GreenHat
 
       archive = Archive.new(name: archive_path, path: path)
       archive.save
-      # file = list[2]
-      # thing = archive.things_create(file: file)
-      # thing.setup
 
       list.each do |file|
         # Ensure Valid Content
@@ -54,11 +51,20 @@ module GreenHat
     # Handle Different Types of Archives
     def self.unpack(archive_path, path)
       case File.extname archive_path
+      when '.tgz'
+        base_path = archive_path.gsub(File.basename(archive_path), '')
+        `bsdtar -xzf "#{archive_path}" -C #{base_path}`
+        FileUtils.rm(archive_path)
       when '.tar'
-        `bsdtar -xf "#{archive_path}" -C #{path}`
+        base_path = archive_path.gsub(File.basename(archive_path), '')
+        `bsdtar -xf "#{archive_path}" -C #{base_path}`
         FileUtils.rm(archive_path)
       when '.gz'
         `gzip -d "#{archive_path}"`
+      when '.zip'
+        `unzip -o -d "#{base_path}" #{archive_path}`
+      when '.bz2'
+        `bzip2 -d #{archive_path}`
       when '.s'
         # Find Original Directory, Split Path, Rename to .gz
         base_path = archive_path.gsub(File.basename(archive_path), '')
@@ -75,7 +81,7 @@ module GreenHat
     end
 
     def self.archive_types
-      %w[s gz tar]
+      %w[s gz tar tgz zip bz2]
     end
     # -- Archive Loader ----------------------------------------------
   end
@@ -102,11 +108,16 @@ class Archive < Teron
     "#<Archive name: '#{name}'>"
   end
 
-  def report
-    GreenHat::Report.new(self)
+  def report(flags)
+    GreenHat::Report.new(self, flags)
   end
 
   def report_markdown
     GreenHat::ReportMarkdown.new(self)
   end
+
+  # Helper for finding thing
+  def thing?(thing_name = 'gitlab-workhorse/current')
+    things.find { |x| x.name == thing_name }
+  end
 end

data/lib/greenhat/cli.rb

@@ -1,8 +1,31 @@
 # Top level namespace
 module GreenHat
-  # CLI Methods
+  # CLI Methods / Shell Specific COmmands
   # rubocop:disable Metrics/ModuleLength
   module Cli
+    # CLI Start
+    def self.start
+      value ||= '' # Empty Start
+
+      loop do
+        line = reader.read_line(readline_notch, value: value)
+        value = '' # Remove Afterwards
+
+        if reader.breaker
+          value = line
+          puts ''
+          next
+        end
+
+        break if line =~ /^exit/i
+
+        Settings.cmd_add(line) unless line.blank?
+
+        process
+        run
+      end
+    end
+
     def self.cursor
       @cursor = TTY::Cursor
     end
@@ -86,19 +109,19 @@ module GreenHat
       if submodule?
         submodule!
         reader.breaker = true
-      # Only one Match!
+        # Only one Match!
       elsif matches.count == 1
         auto_update(matches.first, word)
 
-      # Print List of Options
+        # Print List of Options
       elsif matches.count > 1
         puts matches.join("\t").pastel(:bright_green)
 
-      # General Filename Matching
+        # General Filename Matching
       elsif !file_matches(word).empty?
         auto_files(file_matches(word), word)
 
-      # Submodule Autocompletion
+        # Submodule Autocompletion
       elsif current_methods.include?('auto_complete')
         update_text = current_location.auto_complete(@list, word)
         auto_update(update_text, word) unless update_text.blank?
@@ -110,7 +133,7 @@ module GreenHat
       if matches.count == 1
         auto_update(matches.first, word)
 
-      # Print List of Options
+        # Print List of Options
       elsif matches.count > 1
         auto_update(common_substr(matches), word)
         puts matches.join("\t").pastel(:bright_green)
@@ -222,12 +245,11 @@ module GreenHat
         run!
 
         return true # End Early
-
       elsif current_submodule?
         @list.shift
       elsif submodule?
         submodule!
-      # Prepend Default if exists
+        # Prepend Default if exists
       elsif default?
         @list.unshift 'default'
       else
@@ -261,7 +283,6 @@ module GreenHat
 
           puts "=> #{item.to_s.pastel(:blue)}"
         end
-
       end
 
       puts ''
@@ -343,121 +364,13 @@ module GreenHat
       @quiet
     end
 
-    # Toggle Quiet Settings
     def self.quiet!
-      @quiet = !@quiet
-    end
-
-    def self.cli_help
-      Shell.version
-      puts
-      puts 'Usage'.pastel(:yellow)
-      puts '  greenhat  <sos-archive.tgz> <sos-archive2.tgz> '
-      puts '  greenhat  <sos-archive.tgz> -q --command=df'
-      puts
-
-      puts 'Options'.pastel(:yellow)
-      puts '  --report, -r'.pastel(:green)
-      puts '    Run `report` against archives and exit'
-      puts
-
-      puts '  --quiet, -r'.pastel(:green)
-      puts '    Surpress GreenHat logging output'
-      puts
-
-      puts '  --load, -l'.pastel(:green)
-      puts '    Automatically attempt to read/parse/preload all included files'
-      puts
-
-      puts '  --command, -c'.pastel(:green)
-      puts '    Run and then exit a GreenHat Shell command'
-      puts
-
-      puts '  --version, -v'.pastel(:green)
-      puts '    Print version and exit'
-      puts
-    end
-
-    # Arguments before general processing
-    def self.pre_args(flags, files)
-      # Help
-      if flags?(%i[help h], flags)
-        cli_help
-        exit 0
-      end
-
-      # Version
-      if flags?(%i[version v], flags)
-        Shell.version
-        exit 0
-      end
-
-      # Quiet Flag
-      @quiet = true if flags?(%i[quiet q], flags)
-
-      # rubocop:disable Style/GuardClause
-      # MIA Files
-      if files.empty? || files.count { |x| File.exist? x }.zero?
-        puts "No arguments or files don't exist".pastel(:red)
-        puts 'Usage: greenhat  <sos-archive.tgz> <sos-archive2.tgz>'
-        cli_help
-        Shell.version
-      end
-      # rubocop:enable Style/GuardClause
-    end
-
-    # Arguments to be handled after general processing
-    def self.post_args(flags)
-      # Run report and exit / Don't Clear for reports
-      if flags?(%i[report r], flags)
-        @quiet = true
-        # Don't Use Pagination
-        GreenHat::Shell.report(['--raw'])
-        exit 0
-      else
-        clear_screen
-      end
-
-      # CTL Tails need to be parsed for new 'things'
-      Thing.where(kind: :gitlab_tail)&.map(&:process)
-      Thing.where(kind: :kube_webservice)&.map(&:process)
-
-      Thing.all.each(&:process) if flags?(%i[load l], flags)
-    end
-
-    # Helper to Simplify checking flags
-    def self.flags?(list = [], flags = {})
-      list.any? { |x| flags.key? x }
+      @quiet = true
     end
 
-    # If no arguments Supplied Print and quit - rather than nasty exception
-    def self.start(raw)
-      Settings.start
-      files, flags, args = Args.parse(raw)
-      pre_args(flags, files)
-      load_files files
-      run_command(args) if args.any? { |arg| run_command?(arg) }
-      post_args(flags)
-
-      value ||= '' # Empty Start
-
-      loop do
-        line = reader.read_line(readline_notch, value: value)
-        value = '' # Remove Afterwards
-
-        if reader.breaker
-          value = line
-          puts ''
-          next
-        end
-
-        break if line =~ /^exit/i
-
-        Settings.cmd_add(line) unless line.blank?
-
-        process
-        run
-      end
+    # Toggle Quiet Settings
+    def self.quiet_toggle
+      @quiet = !@quiet
     end
 
     def self.run_command?(arg)
@@ -479,20 +392,6 @@ module GreenHat
       exit 0
     end
 
-    def self.load_files(files)
-      # TODO: Web Helpers?
-      # suppress_output { GreenHat::Web.start }
-
-      # Don't double up on archives / Only Existing files
-      puts 'Loading Archives'.pastel(:blue) unless Cli.quiet
-      files.uniq.each do |file|
-        next unless File.exist?(file)
-
-        puts "- #{file}".pastel(:magenta) unless Cli.quiet
-        ArchiveLoader.load file
-      end
-    end
-
     def self.suppress_output
       original_stderr = $stderr.clone
       original_stdout = $stdout.clone
@@ -530,5 +429,6 @@ module GreenHat
       exit 1
     end
   end
+
   # rubocop:enable Metrics/ModuleLength
 end

data/lib/greenhat/entrypoint.rb

@@ -0,0 +1,170 @@
+# Top level namespace
+module GreenHat
+  # Entrypoint Methods
+  # Command Line Args / File Parsing etc
+  module Entrypoint
+    # If no arguments Supplied Print and quit - rather than nasty exception
+    def self.start(raw)
+      @clear = true # Reset screen by default
+      Settings.start
+      files, flags, args = Args.parse(raw)
+      pre_args(flags, files)
+      load_files files
+      Cli.run_command(args) if args.any? { |arg| Cli.run_command?(arg) }
+      post_args(flags)
+      post_setup(flags)
+
+      Cli.start # Kick over to CLI
+    end
+
+    # Arguments before general processing
+    def self.pre_args(flags, files)
+      # Help
+      if flags?(%i[help h], flags)
+        cli_help
+        exit 0
+      end
+
+      # Version
+      if flags?(%i[version v], flags)
+        Shell.version
+        exit 0
+      end
+
+      # Assume Raw Setting
+      Settings.settings[:assume_raw] = true if flags?(%i[no-prompt np], flags)
+      Settings.settings[:assume_raw] = false if flags?(%i[prompt p], flags)
+
+      # Quiet Flag
+      Cli.quiet! if flags?(%i[quiet q], flags)
+
+      if flags?(%i[load-local ll], flags)
+        # Hook in loading local
+        Shell.load_local(false)
+      elsif files.empty? || files.count { |x| File.exist? x }.zero?
+        # MIA Files
+        puts "No arguments or files don't exist".pastel(:red)
+        puts 'Usage: greenhat  <sos-archive.tgz> <sos-archive2.tgz>'
+        puts 'See `--help`'
+
+        @clear = false # Don't hide messages
+
+        Shell.version
+      end
+    end
+
+    # Arguments to be handled after general processing
+    def self.post_args(flags)
+      # Supress Color
+      GreenHat::Settings.settings[:color] = false if flags?(%i[no-color n], flags)
+
+      # Run report and exit / Don't Clear for reports
+      if flags?(%i[report r], flags)
+        Cli.quiet!
+        # Don't Use Pagination
+        GreenHat::Shell.report(['--raw'])
+        exit 0
+      elsif flags?(%i[full-report f], flags)
+        Cli.quiet!
+        # Don't Use Pagination
+        GreenHat::Shell.report(['--raw', '--full'])
+        exit 0
+      elsif flags?(%i[markdown m], flags)
+        Cli.quiet!
+        # Don't Use Pagination
+        GreenHat::Shell.markdown_report(['--raw'])
+        exit 0
+      elsif @clear
+        Cli.clear_screen
+      end
+    end
+
+    def self.post_setup(flags)
+      # CTL Tails need to be parsed for new 'things'
+      Thing.where(kind: :gitlab_tail)&.map(&:process)
+      Thing.where(kind: :kube_webservice)&.map(&:process)
+
+      Thing.all.each(&:process) if flags?(%i[load l], flags)
+
+      Shell.web if flags?(%i[web w], flags)
+    end
+
+    # Helper to Simplify checking flags
+    def self.flags?(list = [], flags = {})
+      list.any? { |x| flags.key? x }
+    end
+
+    def self.load_files(files)
+      # Don't double up on archives / Only Existing files
+      puts 'Loading Archives'.pastel(:blue) unless Cli.quiet
+      files.uniq.each do |file|
+        next unless File.exist?(file)
+
+        puts "- #{file}".pastel(:magenta) unless Cli.quiet
+        ArchiveLoader.load file
+      end
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    def self.cli_help
+      Shell.version
+      puts
+      puts 'Usage'.pastel(:yellow)
+      puts '  greenhat  <sos-archive.tgz> <sos-archive2.tgz> '
+      puts '  greenhat  <sos-archive.tgz> -q --command=df'
+      puts
+
+      puts 'Options'.pastel(:yellow)
+      puts '  --report, -r'.pastel(:green)
+      puts '    Run `report` against archives and exit'
+      puts
+
+      puts '  --full-report, -f'.pastel(:green)
+      puts '    Run `report` with all details. e.g. include fast-stats top/errors'
+      puts
+
+      puts '  --markdown, -m'.pastel(:green)
+      puts '    Run `markdown_report` against archives and exit'
+      puts
+
+      puts '  --quiet, -r'.pastel(:green)
+      puts '    Surpress GreenHat logging output'
+      puts
+
+      puts '  --load, -l'.pastel(:green)
+      puts '    Automatically attempt to read/parse/preload all included files'
+      puts
+
+      puts '  --load-local, -ll'.pastel(:green)
+      puts '    Load log files from locations on an Omnibus install'
+      puts
+
+      puts '  --prompt, -p'.pastel(:green)
+      puts '    Override settings / Assume Prompt'
+      puts
+
+      puts '  --no-prompt, -np'.pastel(:green)
+      puts '    Do not prompt for file types / Assume Raw or JSON'
+      puts
+
+      puts '  --command, -c'.pastel(:green)
+      puts '    Run and then exit a GreenHat Shell command'
+      puts
+
+      puts '  --web, -w'.pastel(:green)
+      puts '    Start Sinatra Webservice on load (4567)'
+      puts
+
+      puts '  --no-color, -n'.pastel(:green)
+      puts '    Disable color output'
+      puts
+
+      puts '  --version, -v'.pastel(:green)
+      puts '    Print version and exit'
+      puts
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    # ==========================================================
+  end
+end