kennel 1.98.2 → 1.101.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94cb1a40566de5e275526cfb3c28b8c36394ca22edab465493ace5107037f728
-  data.tar.gz: d1adb172f9d04b610e76538eb1ce1fc68bc7a4615554819eb98bb5def0d9cc8f
+  metadata.gz: 11220aba046ce1fbc63b8b62e5a60f0cbd4b04862ff7394c0ad43a1776bc34a6
+  data.tar.gz: 257808a3036f97c8b994c35ce0c4c621bafd1a29a43da0cba6c113a9fe8297ff
 SHA512:
-  metadata.gz: 34d0f7967089bbc6bc7e9fdd8321ce6264c40d637f1e5e3bfd8be46ea3a69aad1e8894818b4f2af814d290456248dcd7d646a141fc27011eca472638cfed73f6
-  data.tar.gz: b48cc148859210b9af80e6ecfcfc8d3fbbbe3895bd28ae071cc3459eee353b5e0976df0e9ea0927ed196cb52be83f68e9e0d02b21503e8523101101a263fb61d
+  metadata.gz: 1bcd69ba301375d93c1c72f9cb1ffcf057e06d4aa3f604baada0ed4dce5cd0d4e7675227d9d4ef8f09a80198bc3e14268fcdb4cd1f3623d3a810818bbbe6d4b2
+  data.tar.gz: c189ecb33b4800d9d0e382f82fedbcfa8723f3ff0a27bbd2554528de60d50f774309da9d30c27374ae3365863861f81fae438d4843a34519c4d0a044a4d250ce

data/Readme.md

@@ -206,7 +206,7 @@ removing the `id` will cause kennel to create a new resource in datadog.
 Having many projects (and their sub-resources) can quickly get out of hand.
 
 Use this class structure to keep things organized:
-```ruby
+```Ruby
 # projects/project_a/base.rb
 module ProjectA
   class Base < Kennel::Models::Project
@@ -217,7 +217,7 @@ module ProjectA
 # projects/project_a/monitors/foo_alert.rb
 module ProjectA
   module Monitors
-    class FooAlert < Kennel::Modesl::Monitor
+    class FooAlert < Kennel::Models::Monitor
       ...
 ```
 

data/lib/kennel/id_map.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+module Kennel
+  class IdMap
+    NEW = :new # will be created during this run
+
+    def initialize
+      @map = Hash.new { |h, k| h[k] = {} }
+    end
+
+    def get(type, tracking_id)
+      @map[type][tracking_id]
+    end
+
+    def set(type, tracking_id, id)
+      @map[type][tracking_id] = id
+    end
+
+    def set_new(type, tracking_id)
+      @map[type][tracking_id] = NEW
+    end
+
+    def new?(type, tracking_id)
+      @map[type][tracking_id] == NEW
+    end
+  end
+end

data/lib/kennel/models/dashboard.rb

@@ -189,16 +189,17 @@ module Kennel
           when "uptime"
             if ids = definition[:monitor_ids]
               definition[:monitor_ids] = ids.map do |id|
-                tracking_id?(id) ? (resolve_link(id, :monitor, id_map, **args) || id) : id
+                resolve(id, :monitor, id_map, **args) || id
               end
             end
           when "alert_graph"
-            if (id = definition[:alert_id]) && tracking_id?(id)
-              definition[:alert_id] = (resolve_link(id, :monitor, id_map, **args) || id).to_s
+            if id = definition[:alert_id]
+              resolved = resolve(id, :monitor, id_map, **args) || id
+              definition[:alert_id] = resolved.to_s # even though it's a monitor id
             end
           when "slo"
-            if (id = definition[:slo_id]) && tracking_id?(id)
-              definition[:slo_id] = (resolve_link(id, :slo, id_map, **args) || id).to_s
+            if id = definition[:slo_id]
+              definition[:slo_id] = resolve(id, :slo, id_map, **args) || id
             end
           end
         end
@@ -206,10 +207,6 @@ module Kennel
 
       private
 
-      def tracking_id?(id)
-        id.is_a?(String) && id.include?(":")
-      end
-
       # creates queries from metadata to avoid having to keep q and expression in sync
       #
       # {q: :metadata, metadata: [{expression: "sum:bar", alias_name: "foo"}, ...], }

data/lib/kennel/models/monitor.rb

@@ -121,7 +121,7 @@ module Kennel
         when "composite", "slo alert"
           type = (as_json[:type] == "composite" ? :monitor : :slo)
           as_json[:query] = as_json[:query].gsub(/%{(.*?)}/) do
-            resolve_link($1, type, id_map, **args) || $&
+            resolve($1, type, id_map, **args) || $&
           end
         end
       end
@@ -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/models/record.rb

@@ -100,9 +100,20 @@ module Kennel
 
       private
 
+      def resolve(value, type, id_map, force:)
+        if tracking_id?(value)
+          return resolve_link(value, type, id_map, force: force)
+        end
+
+        value
+      end
+
+      def tracking_id?(id)
+        id.is_a?(String) && id.include?(":")
+      end
+
       def resolve_link(tracking_id, type, id_map, force:)
-        id = id_map[tracking_id]
-        if id == :new
+        if id_map.new?(type.to_s, tracking_id)
           if force
             invalid!(
               "#{type} #{tracking_id} was referenced but is also created by the current run.\n" \
@@ -111,7 +122,7 @@ module Kennel
           else
             nil # will be re-resolved after the linked object was created
           end
-        elsif id
+        elsif id = id_map.get(type.to_s, tracking_id)
           id
         else
           invalid! "Unable to find #{type} #{tracking_id} (does not exist and is not being created by the current run)"

data/lib/kennel/models/slo.rb

@@ -70,7 +70,7 @@ module Kennel
       def resolve_linked_tracking_ids!(id_map, **args)
         return unless as_json[:monitor_ids] # ignore_default can remove it
         as_json[:monitor_ids] = as_json[:monitor_ids].map do |id|
-          id.is_a?(String) ? (resolve_link(id, :monitor, id_map, **args) || id) : id
+          resolve(id, :monitor, id_map, **args) || id
         end
       end
 

data/lib/kennel/models/synthetic_test.rb

@@ -26,7 +26,7 @@ module Kennel
           type: type,
           subtype: subtype,
           options: options,
-          name: name,
+          name: "#{name}#{LOCK}",
           locations: locations == :all ? LOCATIONS : locations
         }
 

data/lib/kennel/syncer.rb

@@ -122,7 +122,7 @@ module Kennel
     def calculate_diff
       @update = []
       @delete = []
-      @id_map = {}
+      @id_map = IdMap.new
 
       actual = Progress.progress("Downloading definitions") { download_definitions }
 
@@ -254,11 +254,19 @@ module Kennel
     end
 
     def populate_id_map(expected, actual)
+      expected.each do |e|
+        @id_map.set_new(e.class.api_resource, e.tracking_id)
+      end
+
       actual.each do |a|
         next unless tracking_id = a.fetch(:tracking_id)
-        @id_map[tracking_id] = a.fetch(:id)
+        next unless @id_map.get(a.fetch(:klass).api_resource, tracking_id)
+
+        @id_map.set(a.fetch(:klass).api_resource, tracking_id, a.fetch(:id))
+        if a[:klass].api_resource == "synthetics/tests"
+          @id_map.set(Kennel::Models::Monitor.api_resource, tracking_id, a.fetch(:monitor_id))
+        end
       end
-      expected.each { |e| @id_map[e.tracking_id] ||= :new }
     end
 
     def resolve_linked_tracking_ids!(list, force: false)

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -9,6 +9,7 @@ require "kennel/version"
 require "kennel/utils"
 require "kennel/progress"
 require "kennel/syncer"
+require "kennel/id_map"
 require "kennel/api"
 require "kennel/github_reporter"
 require "kennel/subclass_tracking"
@@ -69,7 +70,8 @@ module Kennel
           path = "generated/#{part.tracking_id.tr("/", ":").sub(":", "/")}.json"
           used << File.dirname(path) # only 1 level of sub folders, so this is safe
           used << path
-          write_file_if_necessary(path, JSON.pretty_generate(part.as_json) << "\n")
+          payload = part.as_json.merge(api_resource: part.class.api_resource)
+          write_file_if_necessary(path, JSON.pretty_generate(payload) << "\n")
         end
 
         # deleting all is slow, so only delete the extras

data/template/Readme.md

@@ -189,7 +189,7 @@ removing the `id` will cause kennel to create a new resource in datadog.
 Having many projects (and their sub-resources) can quickly get out of hand.
 
 Use this class structure to keep things organized:
-```ruby
+```Ruby
 # projects/project_a/base.rb
 module ProjectA
   class Base < Kennel::Models::Project
@@ -200,7 +200,7 @@ module ProjectA
 # projects/project_a/monitors/foo_alert.rb
 module ProjectA
   module Monitors
-    class FooAlert < Kennel::Modesl::Monitor
+    class FooAlert < Kennel::Models::Monitor
       ...
 ```
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.98.2
+  version: 1.101.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -77,6 +77,7 @@ files:
 - lib/kennel/api.rb
 - lib/kennel/file_cache.rb
 - lib/kennel/github_reporter.rb
+- lib/kennel/id_map.rb
 - lib/kennel/importer.rb
 - lib/kennel/models/base.rb
 - lib/kennel/models/dashboard.rb