kennel 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb3b5644eb3dc14c44111022b8f694542b8e53b4cc6cabb515d63d5b5a9686e5
-  data.tar.gz: 2fc9459aab2a5b1a696149f60b760e825372b9cac6cc257a6240ec93df7f4bb1
+  metadata.gz: a7a5c47325d6b67585b8fe87c91aca09e5bfc1f1733bb947a807cc55a1b69eb0
+  data.tar.gz: a11927863dcf10f84d28f35a074f1dcc0744493bf2861d8905dea2edd6e12866
 SHA512:
-  metadata.gz: 524ace140e342c6e95f7ed19b05ca3a10fe7bec772b1c8ad446c5f5e02a16ca14dfbc0719a63874581ffd23b467c1ca0e4b7e95b700297c503cd9655538e8241
-  data.tar.gz: ba247aceff3bb82ef062ef5ce3af06476561d0733255030a07192571501229c811985fe28b6bae9d330ea143d15e37e3938b76a9d33a19943b6152b1893b2400
+  metadata.gz: 8d7b51f07ac1dc137b2197761891bd64c4b7752240977bfe2617cb12fef42204409e1fc80bc2072bd43f289b07468879a6e2e20f9e399f1df4127e0924ab1038
+  data.tar.gz: 80bd9891d18cf951bc10a94af66345f9b6ebc3af0b3fbebc090fc504198f654f2d1b075fe06b1e0d9ed1e31dd420279ce9f79995d05493511cacb80104821293

data/lib/kennel/models/base.rb

@@ -54,10 +54,19 @@ module Kennel
           self.class.validate_setting_exists name
           define_singleton_method name, &block
         end
+
+        @invocation_location = caller.detect { |l| l.start_with?(Dir.pwd) }
       end
 
       def kennel_id
-        @kennel_id ||= Utils.snake_case self.class.name
+        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
+        end
+        @kennel_id ||= Utils.snake_case name
       end
 
       def name

data/lib/kennel/models/monitor.rb

@@ -7,6 +7,7 @@ module Kennel
       API_LIST_INCOMPLETE = false
       RENOTIFY_INTERVALS = [0, 10, 20, 30, 40, 50, 60, 90, 120, 180, 240, 300, 360, 720, 1440].freeze # minutes
       QUERY_INTERVALS = ["1m", "5m", "10m", "15m", "30m", "1h", "2h", "4h", "24h"].freeze
+      OPTIONAL_SERVICE_CHECK_THRESHOLDS = [:ok, :warning].freeze
 
       settings(
         :query, :name, :message, :escalation_message, :critical, :kennel_id, :type, :renotify_interval, :warning,
@@ -35,13 +36,6 @@ module Kennel
         super(*args)
       end
 
-      def kennel_id
-        if self.class == Kennel::Models::Monitor
-          raise "Need to set :kennel_id when defining monitors from Kennel::Models::Monitor"
-        end
-        super
-      end
-
       def as_json
         return @as_json if @as_json
         data = {
@@ -85,8 +79,12 @@ module Kennel
           end
         end
 
-        # metric and query values are stored as float by datadog
-        if data.fetch(:type) == "query alert"
+        case data.fetch(:type)
+        when "service check"
+          # avoid diff for default values of 1
+          OPTIONAL_SERVICE_CHECK_THRESHOLDS.each { |t| thresholds[t] ||= 1 }
+        when "query alert"
+          # metric and query values are stored as float by datadog
           thresholds.each { |k, v| thresholds[k] = Float(v) }
         end
 
@@ -114,16 +112,16 @@ module Kennel
           options[:require_full_window] = true unless options.key?(:require_full_window)
         end
 
-        # setting 0 results in thresholds not getting returned from the api
-        if actual[:type] == "event alert"
+        case actual[:type]
+        when "event alert"
+          # setting 0 results in thresholds not getting returned from the api
           options[:thresholds] ||= { critical: 0 }
-        end
 
-        # fields are not returned when set to true
-        if actual[:type] == "service check"
-          options[:thresholds][:critical] ||= 1
-          options[:thresholds][:warning] ||= 1
-          options[:thresholds][:ok] ||= 1
+        when "service check"
+          # fields are not returned when created with default values via UI
+          OPTIONAL_SERVICE_CHECK_THRESHOLDS.each do |t|
+            options[:thresholds][t] ||= 1
+          end
         end
 
         # nil or "" are not returned from the api

data/lib/kennel/models/team.rb

@@ -3,7 +3,7 @@ module Kennel
   module Models
     class Team < Base
       # TODO: validate slack has no leading #
-      settings :slack, :email, :tags
+      settings :slack, :email, :tags, :kennel_id
       defaults(
         tags: -> { ["team:#{kennel_id.sub(/^teams_/, "")}"] }
       )

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday