kennel 1.27.3 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aada5b08dc60f3cae84385963ff9148abb524ca9de028ef05693d69d6cd81fd
-  data.tar.gz: 77fd2e3a6f33beeeb2d700a05ca0bc1a2d491ee6e1f50f80898a538b8293a97f
+  metadata.gz: 839ed976a8811de64729eb9c011c7a52b6495aa229dc836da17927ea850c48ab
+  data.tar.gz: 85974f47c3060dd451d3e34c9c43392e49fcc5b553751f57549320dab77e8ae5
 SHA512:
-  metadata.gz: 12a0223469d614fd1ff97ee31118d3f06dfa66b59989082eaaa94db6036f15fdc2a86d38d811922f32bf79eff7d3c5f058146708489ccc595bffa1c7bec6c404
-  data.tar.gz: 63713ab11c23fa4d73192318ae806d2daf05552897e854d50b93b34205f63570faa53de4897d4e1d27dd69956ef9c3a83ecb21cf70f2861ee90e5ee89e5b7709
+  metadata.gz: a8e84ef685a62a24528f52c29defe99c12ffe61770a3233bd03e43acbe0a7601b7ce3b123bb0b425d611f4d45f506d9086a5c4c64728698838b147f1f7cd89f0
+  data.tar.gz: 58a4a25124dbfc0e197cf3732672b991f7ea34370b99465e2ee18a063c5ab9c9006a3ff41ae74703575b82ce1bbf38c3fc8c785b4d1730ff9bbfa74a829eb663

data/Readme.md

@@ -198,6 +198,7 @@ module Monitors
     defaults(
       name: -> { "#{project.name} load too high" },
       message: -> { "Shut it down!" },
+      type: -> { "query alert" },
       query: -> { "avg(last_5m):avg:system.load.5{hostgroup:#{project.kennel_id}} by {pod} > #{critical}" }
     )
   end

data/lib/kennel/models/base.rb

@@ -31,7 +31,8 @@ module Kennel
           names.each do |name|
             next if method_defined?(name)
             define_method name do
-              raise ArgumentError, "Trying to call #{name} for #{self.class} but it was never set or passed as option"
+              message = "Trying to call #{name} for #{self.class} but it was never set or passed as option"
+              raise_with_location ArgumentError, message
             end
           end
         end
@@ -96,16 +97,18 @@ module Kennel
         end
 
         # need expand_path so it works wih rake and when run individually
-        @invocation_location = caller.detect { |l| File.expand_path(l).start_with?(Dir.pwd) }
+        pwd = /^#{Regexp.escape(Dir.pwd)}\//
+        @invocation_location = caller.detect do |l|
+          if found = File.expand_path(l).sub!(pwd, "")
+            break found
+          end
+        end
       end
 
       def kennel_id
         name = self.class.name
         if name.start_with?("Kennel::")
-          message = +"Set :kennel_id"
-          message << " for project #{project.kennel_id}" if defined?(project)
-          message << " on #{@invocation_location}" if @invocation_location
-          raise ArgumentError, message
+          raise_with_location ArgumentError, "Set :kennel_id"
         end
         @kennel_id ||= Utils.snake_case name
       end
@@ -141,6 +144,13 @@ module Kennel
         raise ValidationError, "#{tracking_id} #{message}"
       end
 
+      def raise_with_location(error, message)
+        message = message.dup
+        message << " for project #{project.kennel_id}" if defined?(project)
+        message << " on #{@invocation_location}" if @invocation_location
+        raise error, message
+      end
+
       def validate_options(options)
         unless options.is_a?(Hash)
           raise ArgumentError, "Expected #{self.class.name}.new options to be a Hash, got a #{options.class}"

data/lib/kennel/models/monitor.rb

@@ -23,7 +23,6 @@ module Kennel
       defaults(
         message: -> { "\n\n@slack-#{project.slack}" },
         escalation_message: -> { "" },
-        type: -> { "query alert" },
         renotify_interval: -> { 120 },
         warning: -> { nil },
         ok: ->  { nil },

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.27.3"
+  VERSION = "1.28.0"
 end

data/template/Readme.md

@@ -180,6 +180,7 @@ module Monitors
     defaults(
       name: -> { "#{project.name} load too high" },
       message: -> { "Shut it down!" },
+      type: -> { "query alert" },
       query: -> { "avg(last_5m):avg:system.load.5{hostgroup:#{project.kennel_id}} by {pod} > #{critical}" }
     )
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.27.3
+  version: 1.28.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-31 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday