kennel 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8fcef3310361713523891bea44caa42662f5958
-  data.tar.gz: 42a606f408399f9554b85d5e2348b66d50e11195
+  metadata.gz: 89c84ca66da09badb7b9af5bb2ce98c206c6d040
+  data.tar.gz: 0bfd6549045618b644a8ffc929fd406efb09ece6
 SHA512:
-  metadata.gz: 54c087b00850de42801159ec06e78e128a175a99c46535d3d0466645c43dad1f082ecb08d21711fc82de2fbc204b13b17da8e76bb881d99dc5dbe83235dfb9ac
-  data.tar.gz: ae1dbefc28044cd1466ef786a366ec3718cc60dcc506f3ec2305afb491da00eaa676a17d5eb4cb8ddd573f6fb844a46f8f0130c0a6c8deb468b8b8d774a8cf5f
+  metadata.gz: 5bbe5060680dc1d39c69d98f1aaba8a28931c7c45cd8afad9002c597aae39b2ad61eab676a8cea0ba8a203b365fb0077e1a8a60e70dccaa9c440e46d9fb12078
+  data.tar.gz: 8c112950b768eca0c9a0ac15e1452dc18532ee6f5b5a9959e591d62d65f0669ccbc598d0e6a48f58c1f27aa56d5574b399fcbe956f2e1eabec51506ba49a60fb

data/lib/kennel/models/monitor.rb

@@ -5,7 +5,6 @@ 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
-      METRIC_TYPES = ["query alert", "metric alert"].freeze
 
       settings(
         :query, :name, :message, :escalation_message, :critical, :kennel_id, :type, :renotify_interval, :warning,
@@ -14,7 +13,7 @@ module Kennel
       defaults(
         message: -> { "" },
         escalation_message: -> { "" },
-        type: -> { "metric alert" }, # TODO: can we auto-determine that ?
+        type: -> { "query alert" },
         renotify_interval: -> { 120 },
         warning: -> { nil },
         ok: ->  { nil },
@@ -22,7 +21,7 @@ module Kennel
         notify_no_data: -> { true },
         no_data_timeframe: -> { notify_no_data ? 60 : nil },
         tags: -> { [] },
-        multi: ->  { !METRIC_TYPES.include?(type) || query.include?(" by ") }
+        multi: ->  { type != "query alert" || query.include?(" by ") }
       )
 
       attr_reader :project
@@ -80,7 +79,7 @@ module Kennel
         thresholds[:ok] = ok if ok
 
         # metric and query values are stored as float by datadog
-        if ["metric alert", "query alert"].include? data.fetch(:type)
+        if data.fetch(:type) == "query alert"
           thresholds.each { |k, v| thresholds[k] = Float(v) }
         end
 
@@ -123,9 +122,6 @@ module Kennel
         # nil or "" are not returned from the api
         options[:evaluation_delay] ||= nil
 
-        # datadog uses these types randomly
-        actual[:type] = type if METRIC_TYPES.include?(actual[:type])
-
         super
       end
 
@@ -134,6 +130,10 @@ module Kennel
       def validate_json(data)
         type = data.fetch(:type)
 
+        if type == "metric alert"
+          raise "#{tracking_id} type 'metric alert' is deprecated, do not set type to use the default 'query alert'"
+        end
+
         if type == "service check" && [ok, warning, critical].compact.map(&:class).uniq != [Integer]
           raise "#{tracking_id} :ok, :warning and :critical must be integers for service check type"
         end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday