kennel 1.61.4 → 1.61.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddec1e52bda24d78c94d0cce08ef0ec8069831d21fa7b5c708093173a1d17b7e
-  data.tar.gz: 16ce37dbdfdd641b358800a75c54183a430d31536e68ad821fe48d7ada98129c
+  metadata.gz: c170afd5f8bc8223b9b7d37bf48a1de593d643fa7de785ec8fc26e631bcdf81c
+  data.tar.gz: 89ec3660c0b7a1022a104a6d6b51eda9ec3291a1bb9cf46d2ae303597e66c30b
 SHA512:
-  metadata.gz: 76747928bf1fc2b8208add017d9f43953366f5de8c0b305cfe74b725ddd8bc40a02d2593b4c00a9d4f1f43652c32e83bd3261424ef2e9fe55a0f01b61a5b7190
-  data.tar.gz: 34ec05f6b7d198fea07a20c7bcf4fdd580c4551fc07d0c61c9820f37da9968994f6da9f4301db37d31d3a76a73ed63cb3f3529b1f2838ade6974607e02b784a8
+  metadata.gz: a68a43cf73743f9f098259dd5c614cdc6ced148d08cf629907f090689804148e01e857a4434f9410607fec338e3cca50f883e4dfe31200e48b80dffbbb7ff379
+  data.tar.gz: d5c5bf8a43c526611162267d6c4babb64a57aab4d0eddbb0cbf9e1fb507f0066528c6e82f7651911fdfd86d74c6ae520b634c7b0de1b799d8d55a1c695f0e457

data/lib/kennel/models/dashboard.rb

@@ -132,16 +132,16 @@ module Kennel
           when "uptime"
             if ids = definition[:monitor_ids]
               definition[:monitor_ids] = ids.map do |id|
-                tracking_id?(id) ? resolve_link(id, id_map) : id
+                tracking_id?(id) ? resolve_link(id, :monitor, id_map) : id
               end
             end
           when "alert_graph"
             if (id = definition[:alert_id]) && tracking_id?(id)
-              definition[:alert_id] = resolve_link(id, id_map).to_s
+              definition[:alert_id] = resolve_link(id, :monitor, id_map).to_s
             end
           when "slo"
             if (id = definition[:slo_id]) && tracking_id?(id)
-              definition[:slo_id] = resolve_link(id, id_map).to_s
+              definition[:slo_id] = resolve_link(id, :slo, id_map).to_s
             end
           end
         end
@@ -150,7 +150,7 @@ module Kennel
       private
 
       def tracking_id?(id)
-        id.is_a?(String) && !id.match?(/\A\d+\z/)
+        id.is_a?(String) && id.include?(":")
       end
 
       # creates queries from metadata to avoid having to keep q and expression in sync

data/lib/kennel/models/monitor.rb

@@ -106,7 +106,7 @@ module Kennel
         if as_json[:type] == "composite"
           as_json[:query] = as_json[:query].gsub(/%\{(.*?)\}/) do
             # need force here since it validates the id exists
-            resolve_link($1, id_map, force: true)
+            resolve_link($1, :monitor, id_map, force: true)
           end
         end
       end

data/lib/kennel/models/record.rb

@@ -54,7 +54,7 @@ module Kennel
 
       private
 
-      def resolve_link(id, id_map, force: false)
+      def resolve_link(id, type, id_map, force: false)
         found = id_map[id]
         return found if found && found != :new
         api_resource = self.class.api_resource
@@ -67,7 +67,7 @@ module Kennel
             Kennel::MISSING_ID
           end
         else
-          invalid! "Unable to find #{api_resource} #{id} (does not exist and is not being created by the current run)"
+          invalid! "Unable to find #{type} #{id} (does not exist and is not being created by the current run)"
         end
       end
 

data/lib/kennel/models/slo.rb

@@ -55,7 +55,7 @@ module Kennel
 
       def resolve_linked_tracking_ids(id_map)
         as_json[:monitor_ids] = as_json[:monitor_ids].map do |id|
-          id.is_a?(String) ? resolve_link(id, id_map) : id
+          id.is_a?(String) ? resolve_link(id, :monitor, id_map) : id
         end
       end
 

data/lib/kennel/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.61.4
+  version: 1.61.5
 platform: ruby
 authors:
 - Michael Grosser