insights-loggers-ruby 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ba6c9d34a5f6d8de910652624371cd65569d4ec195e38d34abf0943f6486541
-  data.tar.gz: fe91d27236ab5d11c8930972efb26c789f00fcee2ca849a25b4a6b61f04068a9
+  metadata.gz: b3c5b0ec28bca5abab1df123d3c7156f2d6121ed47cb2cfc85aaff4e46913704
+  data.tar.gz: 407cab2b0891fdbba9427961efd53fd9e32e64de0547cd7ab90696fa386ed8d0
 SHA512:
-  metadata.gz: 566482f5d024def7b0eb70fa3b56ef6a7d9f8d0c1daa01503ba1bcbad30e4f3e7b4c49844217f0c74791cbd964229120de4113243b7bc0f471333ba8774440fd
-  data.tar.gz: 5efcd7e237ff8b4a5f4a51c9391170448f2001186edbddb4c21ee5ca5c5b9d7ce51614f90ecbc22e56d2c34f2834110bc75886d52ced3596f84128e38bfa88d7
+  metadata.gz: fe581909260b999d40c69934063acaa2939ce3a19b4c07b35a9a60613343d294946d00ae67b6b49e66ddb14147d740933b40fba2485a41c0fbdb16e69c139c5a
+  data.tar.gz: 45451921677cdc7963e216e38508a524d8cc8f06e869f257f54acb74b85556df480cac1559c50fcfdeb62c9502ca57f9aa902192c44cd0a34664b75d22e36a68

data/README.md

@@ -45,6 +45,7 @@ ManageIQ::Loggers::Base
 ManageIQ::Loggers::Container
 ManageIQ::Loggers::CloudWatch
 ManageIQ::Loggers::Journald
+Insights::Loggers::Container
 Insights::Loggers::StdErrorLogger
 TopologicalInventory::Providers::Common::Logger
 ```
@@ -80,7 +81,7 @@ Standard error logger produces formatted output:
  "pid":11561, # process id
  "tid":"3fd1d4c2ffd4", # thread id
  "service": "progname",
- "level":"warning", #info, warning, error, debug
+ "level":"warning", # info(default), warning, error, debug
  "message":"test",
  "request_id": "REQ_ID", # Thread.current[:request_id]
  "tags":["MyApp"],

data/lib/insights/loggers/cloud_watch.rb

@@ -0,0 +1,33 @@
+# inspired by https://github.com/ManageIQ/manageiq-loggers/blob/master/lib/manageiq/loggers/cloud_watch.rb
+require 'active_support/core_ext/string'
+require 'active_support/logger'
+
+module Insights
+  module Loggers
+    class CloudWatch < ManageIQ::Loggers::Base
+      NAMESPACE_FILE = "/var/run/secrets/kubernetes.io/serviceaccount/namespace".freeze
+
+      def self.new(*args)
+        access_key_id     = ENV["CW_AWS_ACCESS_KEY_ID"].presence
+        secret_access_key = ENV["CW_AWS_SECRET_ACCESS_KEY"].presence
+        log_group_name    = ENV["CLOUD_WATCH_LOG_GROUP"].presence
+        log_stream_name   = ENV["HOSTNAME"].presence
+        container_logger = Insights::Loggers::Container.new
+
+        return container_logger unless access_key_id && secret_access_key && log_group_name && log_stream_name
+
+        require 'cloudwatchlogger'
+
+        creds = {:access_key_id => access_key_id, :secret_access_key => secret_access_key}
+        cloud_watch_logdev = CloudWatchLogger::Client.new(creds, log_group_name, log_stream_name)
+        super(cloud_watch_logdev).tap { |logger| logger.extend(ActiveSupport::Logger.broadcast(container_logger)) }
+      end
+
+      def initialize(logdev, *args)
+        super
+        self.formatter = ManageIQ::Loggers::Container::Formatter.new
+        self.level = ENV['LOG_LEVEL'] if ENV['LOG_LEVEL']
+      end
+    end
+  end
+end

data/lib/insights/loggers/container.rb

@@ -0,0 +1,18 @@
+require 'active_support/core_ext/string'
+require 'active_support/logger'
+
+module Insights
+  module Loggers
+    class Container < ManageIQ::Loggers::Container
+      def initialize(logdev = STDOUT, *args)
+        super
+        self.level = ENV['CONTAINER_LOG_LEVEL'] || ENV['LOG_LEVEL'] || DEBUG
+      end
+
+      def level=(new_level)
+        # overwrite method ManageIQ::Loggers::Container#level=
+        method(__method__).super_method.super_method.call(new_level)
+      end
+    end
+  end
+end

data/lib/insights/loggers/factory.rb

@@ -55,6 +55,7 @@ module Insights
         when "Insights::Loggers::StdErrorLogger"
           require "manageiq/loggers/base"
           require "manageiq/loggers/container"
+          require "insights/loggers/container"
           require "insights/loggers/std_error_logger"
           if args && args[:extend_module]
             library_path = EXTENDED_LIBRARY_FROM_MODULE[args[:extend_module]]
@@ -62,8 +63,17 @@ module Insights
 
             require EXTENDED_LIBRARY_FROM_MODULE[args[:extend_module]]
           end
+        when "Insights::Loggers::CloudWatch"
+          require "manageiq/loggers/base"
+          require "manageiq/loggers/container"
+          require "insights/loggers/container"
+          require "insights/loggers/cloud_watch"
         when "TopologicalInventory::Providers::Common::Logger"
           require "topological_inventory/providers/common/logging"
+        when "Insights::Loggers::Container"
+          require "manageiq/loggers/base"
+          require "manageiq/loggers/container"
+          require "insights/loggers/container"
         else
           raise ArgumentError, "Can't load libraries for #{logger_class}."
         end

data/lib/insights/loggers/std_error_logger.rb

@@ -1,10 +1,11 @@
 module Insights
   module Loggers
-    class StdErrorLogger < ManageIQ::Loggers::Container
+    class StdErrorLogger < Container
       def initialize(*args)
         super
         self.reopen(STDERR)
         self.formatter = Formatter.new
+        self.level = INFO
       end
 
       def app_name_for_formatter(app_name)

data/lib/insights/loggers/version.rb

@@ -1,5 +1,5 @@
 module Insights
   module Loggers
-    VERSION = "0.1.9".freeze
+    VERSION = "0.1.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insights-loggers-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Insights Authors
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,6 +178,8 @@ files:
 - insights-loggers-ruby.gemspec
 - lib/insights-loggers.rb
 - lib/insights/loggers.rb
+- lib/insights/loggers/cloud_watch.rb
+- lib/insights/loggers/container.rb
 - lib/insights/loggers/factory.rb
 - lib/insights/loggers/std_error_logger.rb
 - lib/insights/loggers/version.rb