manageiq-loggers 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec8a029b67b090525d2c085a741332c9b2ebb827
-  data.tar.gz: ee8165c89b34c860f39a667864a74c4e720b83a7
+  metadata.gz: 57e42ce8c9d94d968cd0f341fe4809ed825d7686
+  data.tar.gz: accdb3174fb08b2c7f8c1f544a29df6af779901f
 SHA512:
-  metadata.gz: 9001fc4372ff4c8b7c252c4fae96f07ca62b1a589d13c964e4f1d11dd040b991810c3d7803b1f20ab62ec7351d6593cb1c79129d3e0e9da8ce20c13ccfbefae9
-  data.tar.gz: b6311b6889df0e2ade54766a2467bcacecb0dd4d910c7d098fec9aef0739c4cc718b83887903aa078b50c4f80fb44ed50e282cfb5033c9fae9c34e9feaa3d4bb
+  metadata.gz: 1ce90c2eafe1bd650f5c987256614e3aafda8eb87e826b58fd1b1c1481168cb8f213699747f9742e3d161d2d7de3873670fe49a6ffe84f63c6a08fcabd237b2e
+  data.tar.gz: 292d0d0cb8e632f2e833bd7809fdc158af53aa6f91e4cd6e48f45e8d72ce7421f9dfcdc154dab48d8188e5a5d23e90b075bd12dd3960f266dc2134d5df07b47b

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.3.0] - 2019-05-30
+
+## Added
+- Add a Journald Logger [(#5)](https://github.com/ManageIQ/manageiq-loggers/pull/5)
+- Add a cloud watch logger [(#9)](https://github.com/ManageIQ/manageiq-loggers/pull/9)
+
 ## [0.2.0] - 2019-05-03
 
 ## Added

data/README.md

@@ -23,6 +23,14 @@ Or install it yourself as:
 
     $ gem install manageiq-loggers
 
+## Dependencies
+
+Some loggers require additional gems to function correctly. These gems are not specified as dependencies of this gem directly because they may not be needed for all users of manageiq-loggers
+
+To use the `Journald` logger, users must specify the `systemd-journal` gem as a dependency
+
+To use the `CloudWatch` logger, users must specify the `cloudwatchlogger` gem as a dependency
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/manageiq/loggers.rb

@@ -1,3 +1,4 @@
 require "manageiq/loggers/base"
+require "manageiq/loggers/cloud_watch"
 require "manageiq/loggers/container"
 require "manageiq/loggers/version"

data/lib/manageiq/loggers/cloud_watch.rb

@@ -0,0 +1,31 @@
+require 'active_support/core_ext/string'
+
+module ManageIQ
+  module Loggers
+    class CloudWatch < 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   = File.exist?(NAMESPACE_FILE) ? File.read(NAMESPACE_FILE) : nil
+
+        unless access_key_id && secret_access_key && log_group_name && log_stream_name
+          return ManageIQ::Loggers::Container.new 
+        end
+
+        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)
+      end
+
+      def initialize(logdev, *args)
+        super
+        self.formatter = ManageIQ::Loggers::Container::Formatter.new
+      end
+    end
+  end
+end

data/lib/manageiq/loggers/journald.rb

@@ -0,0 +1,56 @@
+module ManageIQ
+  module Loggers
+    class Journald < Base
+      def initialize(logdev = nil, *args)
+        require "systemd-journal"
+
+        super(logdev, *args)
+        self.formatter = Formatter.new
+      end
+
+      def filename
+        "journald"
+      end
+
+      def add(severity, message = nil, progname = nil)
+        severity ||= Logger::UNKNOWN
+        return true if severity < @level
+
+        progname ||= @progname
+
+        if message.nil?
+          if block_given?
+            message = yield
+          else
+            message = progname
+            progname = @progname
+          end
+        end
+
+        message = formatter.call(format_severity(severity), progname, message)
+
+        Systemd::Journal.print(log_level_map[severity], message)
+      end
+
+      private
+
+      def log_level_map
+        @log_level_map ||= {
+          Logger::UNKNOWN => Systemd::Journal::LOG_ALERT,
+          Logger::FATAL   => Systemd::Journal::LOG_CRIT,
+          Logger::ERROR   => Systemd::Journal::LOG_ERR,
+          Logger::WARN    => Systemd::Journal::LOG_WARNING,
+          Logger::INFO    => Systemd::Journal::LOG_INFO,
+          Logger::DEBUG   => Systemd::Journal::LOG_DEBUG,
+        }
+      end
+
+      class Formatter < Base::Formatter
+        def call(severity, progname, msg)
+          msg = prefix_task_id(msg2str(msg)).truncate(Base::MAX_LOG_LINE_LENGTH)
+          "%5s -- %s: %s\n" % [severity, progname, msg]
+        end
+      end
+    end
+  end
+end

data/lib/manageiq/loggers/version.rb

@@ -1,5 +1,5 @@
 module Manageiq
   module Loggers
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/manageiq-loggers.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport",     ">= 5.0"
   spec.add_runtime_dependency "manageiq-password", "~> 0.1"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-loggers
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,9 @@ files:
 - lib/manageiq-loggers.rb
 - lib/manageiq/loggers.rb
 - lib/manageiq/loggers/base.rb
+- lib/manageiq/loggers/cloud_watch.rb
 - lib/manageiq/loggers/container.rb
+- lib/manageiq/loggers/journald.rb
 - lib/manageiq/loggers/version.rb
 - manageiq-loggers.gemspec
 homepage: https://github.com/ManageIQ/manageiq-loggers