greenhat 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4787b5c739b568b8f6f5d22bab609f685ed4e4ed725085c432809102174e9dd5
-  data.tar.gz: 7fcedca5675835ae177c58418dc2ddcaf25bae27333aeea9430e5a36d92a0b01
+  metadata.gz: 585d6d2f1488ca970ca64230991151e3417c28f14662dfdb6f02fec7c617d54a
+  data.tar.gz: 2999efd11049fc2d20ad1f5f1e8967b7b0d5caccce2f819530de9f0982349ed6
 SHA512:
-  metadata.gz: c54a1054bd1c38b8514d4cd4c2b38f1c851a463134399c6c5c1af4c81ae9ffe6dbde083856b4dcabd1f09b9b68c5632240fdce5f135b5f8c763d5c72dc7047b0
-  data.tar.gz: 894307efe02d22b50a4a6ca8674700409611e24cf8b46b9653b7f4b24f242b65a0f1649f4fd881bc636c92afea4d42085043b4a8cf3c4662b4535127f9e70b85
+  metadata.gz: 21f480e7eda0513557b373283119317bd2e13ffcb6d8f97924fed30b03b4913ea7f86fee4b007e068384d3615cf18fd9eed405ce89df7c7bcb54eb6d36282a25
+  data.tar.gz: 3028f8003fdee07c04a0e327b2eca2138147203854bc8fbadd3784d2af80ea3660bb402d096632f25033f70cea456204aec5f0508eec2233c91f4099138a9d87

data/lib/greenhat/reports/reports/errors.rb

@@ -23,7 +23,8 @@ entries = [
   { header: 'Workhorse', base: 'gitlab-workhorse/current --level=error', stats: 'error' },
   { header: 'Sidekiq', base: 'sidekiq/current --severity=error', stats: 'message' },
   { header: 'API', base: 'gitlab-rails/api_json.log --severity=error',
-    stats: 'exception.class,exception.message,status' }
+    stats: 'exception.class,exception.message,status' },
+  { header: 'Gitaly', base: 'gitaly/current --level=error --truncate=99', stats: 'error' }
 ]
 
 # Filter Logic
@@ -38,9 +39,10 @@ end
 
 # Return output
 entries.each do |entry|
-  query_string = flags.verbose ? entry.base : entry.base + " --stats=#{entry.stats}"
+  query_string = flags[:verbose] ? entry.base : entry.base + " --stats=#{entry.stats}"
   query(query_string, false) do |results|
-    next if results.map(&:values).map(&:first).sum.zero?
+    next if results.empty?
+    next if !flags[:verbose] && results.map(&:values).map(&:first).sum.zero?
 
     header entry.header
 

data/lib/greenhat/shell/log.rb

@@ -125,10 +125,18 @@ module GreenHat
           return false
         end
 
-        Thing.new.query_save(results, name)
+        Thing.new.query_save(save_greenhat_query_info + results, name)
         puts "#{name.pastel(:green)} Saved!"
       end
 
+      def self.save_greenhat_query_info
+        [{
+          time: Time.now,
+          query: ShellHelper::Log.last,
+          msg: 'GreenHat Save/Write'
+        }]
+      end
+
       def self.write(raw = [])
         if ShellHelper::Log.last.nil?
           puts 'No previous query found'.pastel(:red)
@@ -158,7 +166,7 @@ module GreenHat
           return false
         end
 
-        all = results.map { |row| Oj.dump(row) }
+        all = (save_greenhat_query_info + results).map { |row| Oj.dump(row) }
         File.write(name, all.join("\n"))
         puts "#{name.pastel(:green)} File Written!"
       end

data/lib/greenhat/shell/shell_helper.rb

@@ -1,6 +1,5 @@
 module GreenHat
   # Common Helpers
-  # rubocop:disable Metrics/ModuleLength
   module ShellHelper
     # Use File Process for Output
     def self.file_output(files, flags = {})
@@ -95,109 +94,109 @@ module GreenHat
     end
 
     # Entry Shower / Top Level
-    def self.entry_show(flags, entry, key = nil)
-      LogBot.debug('Entry Show', entry.class) if ENV['DEBUG']
-      case entry
-      when Hash then render_table(entry, flags)
-      when Float, Integer
-        format_table_entry(flags, entry, key)
-        # Ignore Special Formatting for Strings / Usually already formatted
-      when String
-        entry
-      when Array
-        render_array_table(entry, flags)
-      else
-        LogBot.warn('Shell Show', "Unknown #{entry.class}")
-        nil
-      end
-    end
+    # def self.entry_show(flags, entry, key = nil)
+    #   LogBot.debug('Entry Show', entry.class) if ENV['DEBUG']
+    #   case entry
+    #   when Hash then render_table(entry, flags)
+    #   when Float, Integer
+    #     format_table_entry(flags, entry, key)
+    #     # Ignore Special Formatting for Strings / Usually already formatted
+    #   when String
+    #     entry
+    #   when Array
+    #     render_array_table(entry, flags)
+    #   else
+    #     LogBot.warn('Shell Show', "Unknown #{entry.class}")
+    #     nil
+    #   end
+    # end
 
     # Format Table Entries
-    def self.format_table_entry(flags, entry, key = nil)
-      formatted_entry = case entry
-                        # Rounding
-                        when Float, Integer || entry.numeric?
-                          flags.key?(:round) ? entry.to_f.round(flags.round).ai : entry.ai
-
-                        # General Inspecting
-                        when Hash then entry.ai(ruby19_syntax: true)
-
-                        # Arrays often contain Hashes. Dangerous Recursive?
-                        when Array
-                          entry.map { |x| format_table_entry(flags, x) }.join("\n")
-                        when Time
-                          entry.to_s.pastel(:bright_white)
-
-                        # Default String Formatting
-                        else
-                          StringColor.do(key, entry)
-                        end
-
-      # Stats truncation handled separately
-      if flags[:truncate] && !flags[:stats]
-        entry_truncate(formatted_entry, flags[:truncate])
-      else
-        formatted_entry
-      end
-    rescue StandardError => e
-      if ENV['DEBUG']
-        LogBot.warn('Table Format Entry', message: e.message)
-        ap e.backtrace
-      end
-    end
-
-    def self.render_array_table(entry, flags)
-      table_style = flags[:table_style]&.to_sym || :unicode
-      header, rows = entry
-      table = TTY::Table.new(header: header, rows: rows)
-
-      LogBot.debug('Rendering Entries') if ENV['DEBUG']
-      output = table.render(table_style, padding: [0, 1, 0, 1], multiline: true) do |renderer|
-        renderer.border.style = :cyan
-      end
-
-      # Line breaks for basic tables
-      output += "\n" if flags[:table_style] == 'basic'
-
-      output
-    end
-
-    # Print the Table in a Nice way
-    def self.render_table(entry, flags)
-      entry = entry.to_h { |k, v| [k, format_table_entry(flags, v, k)] }
-      # Pre-format Entry
-
-      table_style = flags[:table_style]&.to_sym || :unicode
-
-      table = TTY::Table.new(header: entry.keys, rows: [entry], orientation: :vertical)
-
-      LogBot.debug('Rendering Entries') if ENV['DEBUG']
-      output = table.render(table_style, padding: [0, 1, 0, 1], multiline: true) do |renderer|
-        renderer.border.style = :cyan
-      end
-
-      # Line breaks for basic tables
-      output += "\n" if flags[:table_style] == 'basic'
-
-      output
-    rescue StandardError => e
-      if ENV['DEBUG']
-        LogBot.warn('Table', message: e.message)
-        ap e.backtrace
-      end
-
-      [
-        entry.ai,
-        ('_' * (TTY::Screen.width / 3)).pastel(:cyan),
-        "\n"
-      ].join("\n")
-    end
-
-    def self.render_table_entry(val, col_index, flags)
-      return val.to_s unless col_index == 1
-
-      format_table_entry(flags, val)
-    end
+    # def self.format_table_entry(flags, entry, key = nil)
+    #   formatted_entry = case entry
+    #                     # Rounding
+    #                     when Float, Integer || entry.numeric?
+    #                       flags.key?(:round) ? entry.to_f.round(flags.round).ai : entry.ai
+
+    #                     # General Inspecting
+    #                     when Hash then entry.ai(ruby19_syntax: true)
+
+    #                     # Arrays often contain Hashes. Dangerous Recursive?
+    #                     when Array
+    #                       entry.map { |x| format_table_entry(flags, x) }.join("\n")
+    #                     when Time
+    #                       entry.to_s.pastel(:bright_white)
+
+    #                     # Default String Formatting
+    #                     else
+    #                       StringColor.do(key, entry)
+    #                     end
+
+    #   # Stats truncation handled separately
+    #   if flags[:truncate] && !flags[:stats]
+    #     entry_truncate(formatted_entry, flags[:truncate])
+    #   else
+    #     formatted_entry
+    #   end
+    # rescue StandardError => e
+    #   if ENV['DEBUG']
+    #     LogBot.warn('Table Format Entry', message: e.message)
+    #     ap e.backtrace
+    #   end
+    # end
+
+    # def self.render_array_table(entry, flags)
+    #   table_style = flags[:table_style]&.to_sym || :unicode
+    #   header, rows = entry
+    #   table = TTY::Table.new(header: header, rows: rows)
+
+    #   LogBot.debug('Rendering Entries') if ENV['DEBUG']
+    #   output = table.render(table_style, padding: [0, 1, 0, 1], multiline: true) do |renderer|
+    #     renderer.border.style = :cyan
+    #   end
+
+    #   # Line breaks for basic tables
+    #   output += "\n" if flags[:table_style] == 'basic'
+
+    #   output
+    # end
+
+    # # Print the Table in a Nice way
+    # def self.render_table(entry, flags)
+    #   entry = entry.to_h { |k, v| [k, format_table_entry(flags, v, k)] }
+    #   # Pre-format Entry
+
+    #   table_style = flags[:table_style]&.to_sym || :unicode
+
+    #   table = TTY::Table.new(header: entry.keys, rows: [entry], orientation: :vertical)
+
+    #   LogBot.debug('Rendering Entries') if ENV['DEBUG']
+    #   output = table.render(table_style, padding: [0, 1, 0, 1], multiline: true) do |renderer|
+    #     renderer.border.style = :cyan
+    #   end
+
+    #   # Line breaks for basic tables
+    #   output += "\n" if flags[:table_style] == 'basic'
+
+    #   output
+    # rescue StandardError => e
+    #   if ENV['DEBUG']
+    #     LogBot.warn('Table', message: e.message)
+    #     ap e.backtrace
+    #   end
+
+    #   [
+    #     entry.ai,
+    #     ('_' * (TTY::Screen.width / 3)).pastel(:cyan),
+    #     "\n"
+    #   ].join("\n")
+    # end
+
+    # def self.render_table_entry(val, col_index, flags)
+    #   return val.to_s unless col_index == 1
+
+    #   format_table_entry(flags, val)
+    # end
 
     # Internal Query Helper
     # query = 'gitlab-rails/application_json.log --message!="Cannot obtain an exclusive lease" --severity=error'
@@ -373,6 +372,4 @@ module GreenHat
       puts
     end
   end
-
-  # rubocop:enable Metrics/ModuleLength
 end

data/lib/greenhat/thing/file_types.rb

@@ -131,6 +131,13 @@ module GreenHat
             %r{consul/current}
           ]
         },
+        'consul/identify_primary_db_node.log' => {
+          format: :identify_db,
+          log: true,
+          pattern: [
+            %r{consul/identify_primary_db_node.log}
+          ]
+        },
         'gitlab-kas/current' => {
           format: :time_space,
           log: true,
@@ -223,12 +230,19 @@ module GreenHat
           ]
         },
         'gitlab-exporter/current' => {
-          format: :time_space,
+          format: :exporters,
           log: true,
           pattern: [
             %r{gitlab-exporter/current}
           ]
         },
+        'gitlab-rails/web_exporter' => {
+          format: :exporters,
+          log: true,
+          pattern: [
+            %r{gitlab-rails/web_exporter}
+          ]
+        },
         'gitlab-monitor/current' => {
           format: :time_space,
           log: true,

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

@@ -0,0 +1,48 @@
+# Top
+module GreenHat
+  # Log
+  module Formatters
+    # ==========================================================================
+    # General Exporter Parser
+    # https://gitlab.com/gitlab-com/support/toolbox/greenhat/-/issues/30
+    # [YYYY-MM-DDTHH:MM:SS.sss-HHMM] …ip… - - [DD/Mon/YYYY:HH:MM:SS ZON]
+    # "GET /metrics HTTP/1.1" 200 12345 "-" "Prometheus/2.25.0"
+    # ==========================================================================
+    def format_exporters
+      self.result = raw.map do |row|
+        result = {}
+        time, output = row.split(' ', 2)
+        result[:time] = Time.parse(time)
+
+        # Weird Edge Cases for when IP is not included
+        msg = ''
+        if output.include? '- - '
+          ip, msg = output.split('- -', 2)
+          result[:ip] = ip unless ip.empty?
+        else
+          msg = output
+        end
+
+        # Styrip Extra Time / Get Call Details
+        if msg&.include? ']'
+          _time, request = msg.split('] ', 2)
+          result[:msg] = request # Pass full request
+
+          # Breakout
+          method, path, protocol, status, bytes = request.gsub('"', '').split(' ', 5)
+
+          result.merge!(method: method, path: path, protocol: protocol, status: status, bytes: bytes)
+
+        else
+          result[:msg] = msg
+        end
+
+        result
+      rescue StandardError => e
+        # TODO: Background logger
+        LogBot.warn('Exporters', "Unable to Parse, #{row}:#{e.message}")
+      end
+    end
+    # ==========================================================================
+  end
+end

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

@@ -0,0 +1,32 @@
+# Top
+module GreenHat
+  # Log
+  module Formatters
+    # consul/identify_primary_db_node.log
+    # https://gitlab.com/gitlab-com/support/toolbox/greenhat/-/issues/33
+    # I, [YYYY-MM-DDThh:mm:ss.ssssss #12345]  INFO -- : Found master: sub.domain.tld
+    def format_identify_db
+      self.result = raw.map do |row|
+        next if row.empty? || row == "\n"
+
+        level_abrv, row = row.split(', ', 2)
+
+        time, output = row.split('] ', 2)
+        time = Time.parse time.split('[', 2).last.strip
+
+        level, _a, _b, msg = output.split(' ', 4)
+        {
+          time: time,
+          i: level_abrv,
+          level: level,
+          message: msg
+        }
+      rescue StandardError => e
+        # TODO: Background logger
+        LogBot.warn('identify_db', "Unable to Parse, #{row}:#{e.message}")
+      end
+
+      result.compact!
+    end
+  end
+end

data/lib/greenhat/version.rb

@@ -1,3 +1,3 @@
 module GreenHat
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.6.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greenhat
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Davin Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -513,10 +513,12 @@ files:
 - lib/greenhat/thing/formatters/clean_raw.rb
 - lib/greenhat/thing/formatters/colon_split_strip.rb
 - lib/greenhat/thing/formatters/dotenv.rb
+- lib/greenhat/thing/formatters/exporters.rb
 - lib/greenhat/thing/formatters/format.rb
 - lib/greenhat/thing/formatters/free_m.rb
 - lib/greenhat/thing/formatters/gitlab_ctl_tail.rb
 - lib/greenhat/thing/formatters/gitlab_status.rb
+- lib/greenhat/thing/formatters/identify_db.rb
 - lib/greenhat/thing/formatters/json.rb
 - lib/greenhat/thing/formatters/json_shellwords.rb
 - lib/greenhat/thing/formatters/kube_json.rb