skylight 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cac23645ac924ba9bcace2dd334b2ab17fea852c
-  data.tar.gz: 61b062120bf0a0b2f6914d163e2b4852c498ced1
+  metadata.gz: f628a6b5a3ed23626781369f5cab3b4adfbbb3c0
+  data.tar.gz: 8c623387c32d39fdde9bbbd482039be124fa92c5
 SHA512:
-  metadata.gz: c12f4d069f3e04fb6db597a51b78e81858343cd69bfc85ded5fc3777a3fb43cedcc984439f08e0181658f1759c94c2de999b1f302cf3bb864be57099a128f071
-  data.tar.gz: 39813746ec564f52ecc818a3d8375b0835c73e9b5de92470c674177a27aaba9f16b8cdc6d5e0778331cc15bb3ab942b4df820cec0c733a1b7dd8c59aa7901c6f
+  metadata.gz: '0915a87d423f154fe620d05a090574bc40c1ae10ad511a564a07b1917c54f1d0d94af969e5e858e915387c51ce2126616e3dfcea17aaac7cb58b3bd5e693b958'
+  data.tar.gz: a12c534ac052171b7f37b5f62f3aee67f3a230fa6a5925fdd545653489904c7469ea45c90190fdc409f973e24f2308ca1bf7d8ef1f534219a812edbed6941bc9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.3.0 (May 17, 2017)
+
+* [FEATURE] Add normalizer for couch_potato. (Thanks @cobot)
+* [IMPROVEMENT] `skylight doctor` now validates SSL configuration
+* [IMPROVEMENT] Add ENV option to force use of bundled SSL certificates
+
 ## 1.2.2 (April 28, 2017)
 
 * [BUGFIX] Update bundled SSL certificates to avoid an authentication issue some users encountered due to a new skylight.io certificate.

data/lib/skylight/cli/doctor.rb

@@ -5,16 +5,34 @@ module Skylight
 
       desc "Run some basic tests to look out for common errors"
 
+      def check_ssl
+        say "Checking SSL"
+        http = Util::HTTP.new(config)
+        indent do
+          req = http.get("/", "Accept" => "text/html")
+          if req.success?
+            say "OK", :green
+          else
+            if req.exception.is_a?(Util::HTTP::StartError) && req.exception.original.is_a?(OpenSSL::SSL::SSLError)
+              say "Failed to verify SSL certificate.", :red
+              if Util::SSL.ca_cert_file?
+                say "Certificates located at #{Util::SSL.ca_cert_file_or_default} may be out of date.", :yellow
+                say "Please update your local certificates or try setting `SKYLIGHT_FORCE_OWN_CERTS=1` in your environment.", :yellow
+              end
+            else
+              say "Unable to reach Skylight servers.", :red
+            end
+          end
+        end
+        say "\n"
+      end
+
       def check_rails
         say "Checking for Rails"
 
         indent do
           if is_rails?
             say "Rails application detected", :green
-
-            # Normally auto-loaded, but we haven't loaded Rails by the time Skylight is loaded
-            require 'skylight/railtie'
-            require rails_rb
           else
             say "No Rails application detected", :red
             abort "Currently `skylight doctor` only works with Rails applications"
@@ -60,7 +78,10 @@ module Skylight
             say "Configuration is valid", :green
           rescue ConfigError => e
             say "Configuration is invalid", :red
-            say "  #{e.message}", :red
+            indent do
+              say e.message, :red
+              say "This may occur if you are configuring with ENV variables and didn't set them in this shell."
+            end
             abort
           end
         end
@@ -131,8 +152,16 @@ module Skylight
           return @config if @config
 
           # MEGAHAX
-          railtie = Skylight::Railtie.send(:new)
-          @config = railtie.send(:load_skylight_config, Rails.application)
+          if is_rails?
+            # Normally auto-loaded, but we haven't loaded Rails by the time Skylight is loaded
+            require 'skylight/railtie'
+            require rails_rb
+
+            railtie = Skylight::Railtie.send(:new)
+            @config = railtie.send(:load_skylight_config, Rails.application)
+          else
+            super
+          end
         end
     end
   end

data/lib/skylight/normalizers.rb

@@ -147,7 +147,8 @@ module Skylight
         active_support/cache
         elasticsearch/request
         grape/endpoint
-        moped/query).each do |file|
+        moped/query
+        couch_potato/query).each do |file|
       require "skylight/normalizers/#{file}"
     end
   end

data/lib/skylight/normalizers/couch_potato/query.rb

@@ -0,0 +1,20 @@
+require "json"
+
+module Skylight
+  module Normalizers
+    module CouchPotato
+      class Query < Normalizer
+        register "couch_potato.load"
+        register "couch_potato.view"
+
+        CAT = "db.couch_db.query".freeze
+
+        def normalize(trace, name, payload)
+          description = payload[:name] if payload
+          _name = name.sub('couch_potato.', '')
+          [CAT, _name, description]
+        end
+      end
+    end
+  end
+end

data/lib/skylight/util/http.rb

@@ -29,7 +29,16 @@ module Skylight
       READ_EXCEPTIONS << Net::ReadTimeout if defined?(Net::ReadTimeout)
       READ_EXCEPTIONS.freeze
 
-      class StartError < StandardError; end
+      class StartError < StandardError
+        attr_reader :original
+
+        def initialize(e)
+          @original = e
+          super e.inspect
+        end
+
+      end
+
       class ReadResponseError < StandardError; end
 
       def initialize(config, service = :auth, opts = {})
@@ -101,7 +110,7 @@ module Skylight
           client = http.start
         rescue => e
           # TODO: Retry here
-          raise StartError, e.inspect
+          raise StartError, e
         end
 
         begin

data/lib/skylight/util/ssl.rb

@@ -6,6 +6,8 @@ module Skylight
       DEFAULT_CA_FILE  = File.expand_path('../../data/cacert.pem', __FILE__)
 
       def self.detect_ca_cert_file!
+        return nil if ENV['SKYLIGHT_FORCE_OWN_CERTS']
+
         @ca_cert_file = false
         if defined?(OpenSSL::X509::DEFAULT_CERT_FILE)
           f = OpenSSL::X509::DEFAULT_CERT_FILE
@@ -17,6 +19,8 @@ module Skylight
       end
 
       def self.detect_ca_cert_dir!
+        return nil if ENV['SKYLIGHT_FORCE_OWN_CERTS']
+
         @ca_cert_dir = false
         if defined?(OpenSSL::X509::DEFAULT_CERT_DIR)
           d = OpenSSL::X509::DEFAULT_CERT_DIR

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -78,6 +78,7 @@ files:
 - lib/skylight/normalizers/active_support/cache_read.rb
 - lib/skylight/normalizers/active_support/cache_read_multi.rb
 - lib/skylight/normalizers/active_support/cache_write.rb
+- lib/skylight/normalizers/couch_potato/query.rb
 - lib/skylight/normalizers/default.rb
 - lib/skylight/normalizers/elasticsearch/request.rb
 - lib/skylight/normalizers/grape/endpoint.rb