kennel 1.10.2 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac58d80b06095fc1703c9c12c547de0fb43c81e2072c8c2ed4c5b05e4bf53de1
-  data.tar.gz: feeac0f08078935641310c6b5dfb81409c13242128830e21132903330dfa4494
+  metadata.gz: 7f3b1eb54a6d3249228c90e6313b1b014ce75463da52f3bf9a242ab81aa45b84
+  data.tar.gz: 1e2650fc9d44b68e91336afea05f711b90bca96bb571be027404ad103d94043b
 SHA512:
-  metadata.gz: 16b0fbc19d41c74242999cc33ec63defd1894ae0dfd3aaecf237c1549c485162088c43c16ffc9cf43dc189445c3628fdc5376300617ea6afbdc11148db680a4c
-  data.tar.gz: 5070cccb9a86e218ee472d41fbe2d195f0826d3aa1c2b393f593f0a05379dd390d0e431655af07c96a298879c0bcc5284d5d2d01280df63178be7e0aa7dfdf2e
+  metadata.gz: 603e35948978e66351219b4b34d3ae35ef3d95a48f77a6ebed8fdc167edcba73ebf2be8910779ce62354f2ce34df9a457a882aaef18aac938e58ed6792476482
+  data.tar.gz: 37c00fd53b6767e7f49592eb6f46d63e13289bf64fac7dbbb339a22cb12b51f7bddd2d0a685c95968dda972cb0d1e3a4a0c188ad40a7b52a1b92d5ea4298e73b

data/lib/kennel/models/base.rb

@@ -95,6 +95,10 @@ module Kennel
         "#{project.kennel_id}:#{kennel_id}"
       end
 
+      def to_json
+        raise NotImplementedError, "Use as_json"
+      end
+
       private
 
       # discard styles/conditional_formats/aggregator if nothing would change when we applied (both are default or nil)

data/lib/kennel/models/monitor.rb

@@ -138,30 +138,46 @@ module Kennel
       def validate_json(data)
         type = data.fetch(:type)
 
+        # do not allow deprecated type that will be coverted by datadog and then produce a diff
         if type == "metric alert"
           invalid! "type 'metric alert' is deprecated, do not set type to use the default 'query alert'"
         end
 
+        # verify service checks use interger thresholds to avoid diff
         if type == "service check" && [ok, warning, critical].compact.map(&:class).uniq != [Integer]
           invalid! ":ok, :warning and :critical must be integers for service check type"
         end
 
+        # verify query includes critical value
         if query_value = data.fetch(:query)[/\s*[<>]\s*(\d+(\.\d+)?)\s*$/, 1]
           if Float(query_value) != Float(data.dig(:options, :thresholds, :critical))
             invalid! "critical and value used in query must match"
           end
         end
 
+        # verify renotify interval is valid
         unless RENOTIFY_INTERVALS.include? data.dig(:options, :renotify_interval)
           invalid! "renotify_interval must be one of #{RENOTIFY_INTERVALS.join(", ")}"
         end
 
-        if ["metric alert", "query alert"].include?(type)
+        if type == "query alert"
+          # verify interval is valud
           interval = data.fetch(:query)[/\(last_(\S+?)\)/, 1]
           unless QUERY_INTERVALS.include?(interval)
             invalid! "query interval was #{interval}, but must be one of #{QUERY_INTERVALS.join(", ")}"
           end
         end
+
+        if ["query alert", "service check"].include?(type) # TODO: most likely more types need this
+          # verify is_match uses available variables
+          message = data.fetch(:message)
+          used = message.scan(/{{\s*#is_match\s*"([a-zA-Z\d_.-]+).name"/).flatten.uniq
+          allowed = data.fetch(:query)[/by\s*{([^\}]+)}/, 1].to_s.split(/\s*,\s*/)
+          unsupported = used - allowed
+          if unsupported.any?
+            invalid! "is_match used with unsupported dimensions #{unsupported}, allowed dimensions are #{allowed}"
+          end
+        end
       end
     end
   end

data/lib/kennel/version.rb

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

metadata

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