betterlog 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57cf408499489e3a2a0f7bf2fc51667688ee816e7797984fe4c27ab3393d486a
-  data.tar.gz: a330c835cf6452a13e3b36727f5d296480a22c8b22e12e887df542ff594db450
+  metadata.gz: 975990d950f8eb2ee21cfbbf52fa8472f8a706a02a01728e76e40005ca5807d3
+  data.tar.gz: 74ec7d2ce187050e66d4ff5c424daffb99a18759e987a66a7340ec5edcdf16c1
 SHA512:
-  metadata.gz: eb3d0ce4c94f68b40c704dbe9cb6de03d25cd422b358039536197ebbc0d5f34b53c6c6f39679fae71a3390d5b619acbe2348d826fdf9534407809c5818db09bf
-  data.tar.gz: 0236ab4073d2293e01f1cdc6dbf0157c5d0cb481c2ba1db5069000592ea7d21cdca58f998b04dd505d34ad5718dbbb1020a56b9a77eaceac6ebfdc0a9ecd9fe2
+  metadata.gz: f38d883bf8935c90af49649ed0627b2dc600cb992d03d746be12586cca817efb04820b55455b4f209f405edf1dee8400a950f7a283fa1019719d71d629f48f9c
+  data.tar.gz: 1ac776bcbed6cafb804e25a6a1e4d41836bb232ef9b70b04d09fc6c6a80010c2bd187a88f3167495f2bff4fcd6fad34f55bada5e4e13801ed8dd5c3e2d1c505f

data/README.md

@@ -1,3 +1,34 @@
 # betterlog
 
+## Description
+
 Logging tools for betterplace structured logging
+
+## Usage
+
+### `betterlog`
+
+TODO
+
+### `betterlog_pusher`
+
+TODO
+
+### `betterlog_sink`
+
+This is a small wrapper around the `kubectl logs…` command,
+see `kubectl help logs` for the options.
+
+To tail a log and prettify the output just call and pipe to the `betterlog`
+executable:
+
+```
+  $ betterlog_sink --since=1m -f | betterlog
+```
+
+The sink always defaults to the production logfile, to switch the context to
+staging, prepend the command with the `LOG_ENV` env variable like so:
+
+```
+  $ LOG_ENV=staging betterlog_sink -f | betterlog
+```

data/Rakefile

@@ -16,7 +16,7 @@ GemHadar do
     'gospace'
   readme      'README.md'
   title       "#{name.camelize}"
-  executables ["betterlog", "betterlog_pusher"]
+  executables %w[ betterlog betterlog_pusher betterlog_sink ]
 
   dependency 'tins',           '~>1.3', '>=1.3.5'
   dependency 'complex_config'

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/betterlog.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 0.2.2 ruby lib
+# stub: betterlog 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["betterplace Developers".freeze]
-  s.date = "2019-07-04"
+  s.date = "2019-07-15"
   s.description = "This library provides structure json logging for our rails projects".freeze
   s.email = "developers@betterplace.org".freeze
-  s.executables = ["betterlog".freeze, "betterlog_pusher".freeze]
+  s.executables = ["betterlog".freeze, "betterlog_pusher".freeze, "betterlog_sink".freeze]
   s.extra_rdoc_files = ["README.md".freeze, "lib/betterlog.rb".freeze, "lib/betterlog/global_metadata.rb".freeze, "lib/betterlog/log.rb".freeze, "lib/betterlog/log/event.rb".freeze, "lib/betterlog/log/event_formatter.rb".freeze, "lib/betterlog/log/severity.rb".freeze, "lib/betterlog/log_event_formatter.rb".freeze, "lib/betterlog/logger.rb".freeze, "lib/betterlog/notifiers.rb".freeze, "lib/betterlog/railtie.rb".freeze, "lib/betterlog/version.rb".freeze]
-  s.files = [".gitignore".freeze, ".travis.yml".freeze, "Dockerfile".freeze, "Gemfile".freeze, "LICENSE".freeze, "Makefile".freeze, "README.md".freeze, "Rakefile".freeze, "TODO.md".freeze, "VERSION".freeze, "betterlog.gemspec".freeze, "betterlog/config.go".freeze, "betterlog/healthz.go".freeze, "betterlog/redis_cert_cache.go".freeze, "bin/betterlog".freeze, "bin/betterlog_pusher".freeze, "cmd/betterlog-server/LICENSE".freeze, "cmd/betterlog-server/main.go".freeze, "config/log.yml".freeze, "lib/betterlog.rb".freeze, "lib/betterlog/global_metadata.rb".freeze, "lib/betterlog/log.rb".freeze, "lib/betterlog/log/event.rb".freeze, "lib/betterlog/log/event_formatter.rb".freeze, "lib/betterlog/log/severity.rb".freeze, "lib/betterlog/log_event_formatter.rb".freeze, "lib/betterlog/logger.rb".freeze, "lib/betterlog/notifiers.rb".freeze, "lib/betterlog/railtie.rb".freeze, "lib/betterlog/version.rb".freeze, "spec/betterlog/global_metadata_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/logger_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  s.files = [".gitignore".freeze, ".travis.yml".freeze, "Dockerfile".freeze, "Gemfile".freeze, "LICENSE".freeze, "Makefile".freeze, "README.md".freeze, "Rakefile".freeze, "TODO.md".freeze, "VERSION".freeze, "betterlog.gemspec".freeze, "betterlog/config.go".freeze, "betterlog/healthz.go".freeze, "betterlog/redis_cert_cache.go".freeze, "bin/betterlog".freeze, "bin/betterlog_pusher".freeze, "bin/betterlog_sink".freeze, "cmd/betterlog-server/LICENSE".freeze, "cmd/betterlog-server/main.go".freeze, "config/log.yml".freeze, "lib/betterlog.rb".freeze, "lib/betterlog/global_metadata.rb".freeze, "lib/betterlog/log.rb".freeze, "lib/betterlog/log/event.rb".freeze, "lib/betterlog/log/event_formatter.rb".freeze, "lib/betterlog/log/severity.rb".freeze, "lib/betterlog/log_event_formatter.rb".freeze, "lib/betterlog/logger.rb".freeze, "lib/betterlog/notifiers.rb".freeze, "lib/betterlog/railtie.rb".freeze, "lib/betterlog/version.rb".freeze, "spec/betterlog/global_metadata_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/logger_spec.rb".freeze, "spec/spec_helper.rb".freeze]
   s.homepage = "http://github.com/betterplace/betterlog".freeze
   s.rdoc_options = ["--title".freeze, "Betterlog".freeze, "--main".freeze, "README.md".freeze]
   s.rubygems_version = "3.0.3".freeze

data/bin/betterlog_sink

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+# vim: set ft=ruby et sw=2 ts=2:
+
+require 'betterlog'
+require 'complex_config/rude'
+require 'json'
+
+LOG_ENV = ENV.fetch('LOG_ENV', 'production')
+
+ENV['KUBECONFIG'] = File.join(
+  ENV.fetch('HOME'),
+  '.kube',
+  "betterlog-#{LOG_ENV}"
+)
+
+@config = complex_config.log(LOG_ENV).sink
+
+def authenticate
+  return if File.exist?(ENV['KUBECONFIG'])
+  context =  [
+    'gke',
+    @config.cluster.project,
+    @config.cluster.zone,
+    @config.cluster.name,
+  ] * ?_
+  system(%{
+    gcloud --no-user-output-enabled container clusters get-credentials \
+    #{@config.cluster.name.inspect} \
+    --zone #{@config.cluster.zone.inspect} \
+    --project #{@config.cluster.project.inspect}
+  }) or fail "failed to authenticate for context #{context.inspect}"
+end
+
+authenticate
+
+pods = JSON(
+  %x{ kubectl -n #{@config.namespace} -ojson get pods },
+  object_class: JSON::GenericObject
+)
+
+if pod = pods.items.find { |i| i.metadata.labels.app == @config.source }
+  system %{
+    kubectl logs -n #{@config.namespace} #{ARGV.join(' ')} #{pod.metadata.name}
+  }
+else
+  exit 1
+end

data/lib/betterlog/version.rb

@@ -1,6 +1,6 @@
 module Betterlog
   # Betterlog version
-  VERSION         = '0.2.2'
+  VERSION         = '0.3.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterlog
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - betterplace Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -175,6 +175,7 @@ email: developers@betterplace.org
 executables:
 - betterlog
 - betterlog_pusher
+- betterlog_sink
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -206,6 +207,7 @@ files:
 - betterlog/redis_cert_cache.go
 - bin/betterlog
 - bin/betterlog_pusher
+- bin/betterlog_sink
 - cmd/betterlog-server/LICENSE
 - cmd/betterlog-server/main.go
 - config/log.yml