greenhat 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efcb59b0a89d4abb6fbb20d17c96a163e53f3534a1df492bf8f82bd1ab108123
-  data.tar.gz: 630b4544301df24d0f3eadbf71dd61d3506d3bd273f1269e2c9b49687e5d6e49
+  metadata.gz: cf89eef7afeef6861dde013e8cc7992a92d1c9f4dca79ca0a438913f6d9a7a89
+  data.tar.gz: eed033653f4723f19962f5643ac02c71d9f950f97aa4a68375cc3174152e5513
 SHA512:
-  metadata.gz: 504e6a2e265cb92f769e2b70978bf66cf5b758b78ace1f38b1f3e80e8ce33344672dbf5825ab97f0e46155084b36615f42a6d6e942e2d5a9536d8e9ace25c772
-  data.tar.gz: f9bb1c92bf6522bf74f8c5b643cd5c32249b8f1476745972805607b42bcbab394bbe44e7528e5edfe1774bb99a4fb53fa58c419993ed3403474ea528d292f5e2
+  metadata.gz: 90c1a58ef0334bd864480ad422957758850ecacd39bc85db1fd47233192e09bda768e15331dc179d8860f4842aed58fafb439f4f9499ff22d1c25e3ebf8bff74
+  data.tar.gz: aea2b938e6b1a5956d7811084b1ab725cf41f2d0766affffed696755ac497cc41a67ebfc562ce516ce448ebb983e6e504a493e772348fd536f1e5c711954f612

data/lib/greenhat/shell/help.rb

@@ -16,6 +16,8 @@ module GreenHat
       puts 'Top Level Commands'.pastel(:blue)
       puts '  report'.pastel(:green)
       puts '    Show summary report of SOS Report. OS, CPU, Memory, Disk, and etc'
+      puts '      --raw, no pagination'
+      puts '      --archive=<redis/archive>, filter by archive name'
       puts
 
       puts '  ps,df,netstat,free,uptime,uname'.pastel(:green)

data/lib/greenhat/shell/report.rb

@@ -2,11 +2,17 @@ module GreenHat
   # Root Level Shell / Report Helper
   module Shell
     def self.report(raw)
-      args = {
-        raw: raw.include?('--raw')
-      }
+      _files, flags, _args = Args.parse(raw)
 
-      ShellHelper.show(Archive.all.map(&:report).map(&:show).flatten, args)
+      archives = if flags.archive
+                   Archive.all.select do |archive|
+                     flags.archive.any? { |x| archive.name.include? x.to_s }
+                   end
+                 else
+                   Archive.all
+                 end
+
+      ShellHelper.show(archives.map(&:report).map(&:show).flatten, flags)
     end
   end
 end

data/lib/greenhat/thing/file_types.rb

@@ -337,14 +337,14 @@ module GreenHat
           ]
         },
         'nginx/gitlab_pages_access.log' => {
-          format: :raw,
+          format: :nginx,
           log: true,
           pattern: [
             %r{nginx/gitlab_pages_access.log}
           ]
         },
         'nginx/gitlab_access.log' => {
-          format: :raw,
+          format: :nginx,
           log: true,
           pattern: [
             %r{nginx/gitlab_access.log}
@@ -489,7 +489,8 @@ module GreenHat
             %r{pgbouncer-exporter/config},
             %r{repmgrd/config},
             %r{sentinel/config},
-            %r{consul/config}
+            %r{consul/config},
+            %r{mailroom/current}
           ]
         },
         'redis/current' => {
@@ -500,7 +501,6 @@ module GreenHat
             %r{redis/@.*}
           ]
         },
-
         'nginx/gitlab_error.log' => {
           format: :time_space,
           log: true,
@@ -508,6 +508,13 @@ module GreenHat
             %r{nginx/gitlab_error.log}
           ]
         },
+        'nginx/error.log' => {
+          format: :raw,
+          log: false,
+          pattern: [
+            %r{nginx/error.log}
+          ]
+        },
         'nginx/gitlab_registry_error.log' => {
           format: :time_space,
           log: true,
@@ -529,7 +536,7 @@ module GreenHat
           ]
         },
         'nginx/gitlab_registry_access.log' => {
-          format: :raw,
+          format: :nginx,
           log: true,
           pattern: [
             %r{nginx/gitlab_registry_access.log}

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

@@ -0,0 +1,44 @@
+# Top
+module GreenHat
+  # Log
+  module Formatters
+    # ==========================================================================
+    # Formatters
+    # ==========================================================================
+    def format_nginx
+      self.result = raw.map do |row|
+        ip, _sym, remote_user, rest = row.split(' ', 4)
+
+        time, rest = rest.split(']', 2)
+        time = Time.strptime(time, '[%d/%b/%Y:%H:%M:%S %z')
+
+        verb, status, bytes, http_referer, http_user_agent, gzip_ratio = Shellwords.split(rest)
+
+        method, path, http_version = verb.split
+
+        {
+          remote_addr: ip,
+          remote_user: remote_user,
+          method: method,
+          path: path,
+          status: status,
+          bytes: bytes,
+          http_version: http_version,
+          http_referer: http_referer,
+          http_user_agent: http_user_agent,
+          gzip_ratio: gzip_ratio,
+          time: time
+        }
+      end
+
+      :ok
+    end
+
+    # rubocop:disable Metrics/LineLength
+    # NGINX Conf: /var/opt/gitlab/nginx/conf/nginx.conf
+    # log_format gitlab_access '$remote_addr - $remote_user [$time_local] "$request_method $filtered_request_uri $server_protocol" $status $body_bytes_sent "$filtered_http_referer" "$http_user_agent" $gzip_ratio';
+    # rubocop:enable Metrics/LineLength
+
+    # ==========================================================================
+  end
+end

data/lib/greenhat/version.rb

@@ -1,3 +1,3 @@
 module GreenHat
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greenhat
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Davin Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -430,6 +430,7 @@ files:
 - lib/greenhat/thing/formatters/json.rb
 - lib/greenhat/thing/formatters/json_shellwords.rb
 - lib/greenhat/thing/formatters/multiline_json.rb
+- lib/greenhat/thing/formatters/nginx.rb
 - lib/greenhat/thing/formatters/raw.rb
 - lib/greenhat/thing/formatters/shellwords.rb
 - lib/greenhat/thing/formatters/syslog.rb