kennel 1.98.3 → 1.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1362ca60b0542b017fffad3e47bf1de8baf0b08950cb679a98760de51f0ef9c7
-  data.tar.gz: 7dacd36972ad7cad574d50236b6463a6be11082373b752c6f5f4530a29230a34
+  metadata.gz: 0363ce2c85e194b4c6eca7e657a614d3eb0e27d7c0a5f4a55871bf39fc90f5f9
+  data.tar.gz: 075f01f5fa4f153f1a8c07ec000b7abf246e3c0dd9082d5709661240191b07f1
 SHA512:
-  metadata.gz: '069a8adb906d55515b5b21db21ca7186ab1d132b370bd9319910719df4d641ce71729f613b52e764b42a4127d0b32d0da86fdf9f01d440df870c2ebb52168730'
-  data.tar.gz: ea453b3fc2afa94e9f9d916dcdec01b9e077816ea4fcb9c886e2b0a9e36c0c2a7623b4c63b0fd5c2014fa4e04198f42dd759d6335980df899c7bf0b6c8e7b42f
+  metadata.gz: 6834defb05ea8844a19fdaa80a8e3cb7154305bbf3dbc6a66c24d76cc4b050305020c14ca7712a105d1514c421cf4a1f4674b9dfccc93b694e17daba8d8abf8b
+  data.tar.gz: 87f2c790faa21b2e63beaca026c565e6c940aa9dae0cc624b7060d81ed4b6cfce7894c77ccf56b60751a9fb3d1ed0b1dfc2c2c27a893ea88e0097b2d44138a05

data/lib/kennel/models/monitor.rb

@@ -214,27 +214,47 @@ module Kennel
         end
 
         if ["query alert", "service check"].include?(type) # TODO: most likely more types need this
-          # verify is_match/is_exact_match uses available variables
-          message = data.fetch(:message)
-          used = message.scan(/{{\s*([#^]is(?:_exact)?_match)\s*([^\s}]+)/)
-          if used.any?
-            allowed = data.fetch(:query)[/by\s*[({]([^})]+)[})]/, 1]
-              .to_s.gsub(/["']/, "").split(/\s*,\s*/)
-              .map! { |w| %("#{w}.name") }
-            used.uniq.each do |match, group|
-              next if allowed.include?(group)
-              invalid!(
-                "#{match} used with #{group}, but can only be used with #{allowed.join(", ")}. " \
-                "Group the query by #{group.sub(".name", "").tr('"', "")} or change the #{match}"
-              )
-            end
-          end
+          validate_message_variables(data)
         end
 
         unless ALLOWED_PRIORITY_CLASSES.include?(priority.class)
           invalid! "priority needs to be an Integer"
         end
       end
+
+      # verify is_match/is_exact_match and {{foo.name}} uses available variables
+      def validate_message_variables(data)
+        message = data.fetch(:message)
+
+        used =
+          message.scan(/{{\s*(?:[#^]is(?:_exact)?_match)\s*"([^\s}]+)"/) + # {{#is_match "environment.name" "production"}}
+          message.scan(/{{\s*([^}]+\.name)\s*}}/) # Pod {{pod.name}} failed
+        return if used.empty?
+        used.flatten!(1)
+        used.uniq!
+
+        # TODO
+        # - also match without by
+        # - separate parsers for query and service
+        # - service must always allow `host`, maybe others
+        return unless match = data.fetch(:query).match(/(?:{([^}]*)}\s*)?by\s*[({]([^})]+)[})]/)
+
+        allowed =
+          match[1].to_s.split(/\s*,\s*/).map { |k| k.split(":", 2)[-2] } + # {a:b} -> a TODO: does not work for service check
+          match[2].to_s.gsub(/["']/, "").split(/\s*,\s*/) # by {a} -> a
+
+        allowed.compact!
+        allowed.uniq!
+        allowed.map! { |w| "#{w.tr('"', "")}.name" }
+
+        forbidden = used - allowed
+        return if forbidden.empty?
+
+        invalid! <<~MSG.rstrip
+          Used #{forbidden.join(", ")} in the message, but can only be used with #{allowed.join(", ")}.
+          Group or filter the query by #{forbidden.map { |f| f.sub(".name", "") }.join(", ")} to use it.
+        MSG
+      end
     end
   end
 end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.98.3
+  version: 1.99.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday