kennel 1.158.0 → 1.160.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0622cc6a3d8c7a66e692373a5cbd88ceafc6fa6d705524492a06c5e2c67e4204
-  data.tar.gz: d1c057023a8c6d0f093b752ec8cc64c9a8fa185e49d5251b44eeeb87f2441377
+  metadata.gz: 305e0eb2205f87e8f993c0a6d19936f8ab2b2bdffa20316cc54dd241932cdad0
+  data.tar.gz: aea7a8fe0cbb8981e777bf83cdcfdf07489581c0621140f299aa9ec4a3447ac3
 SHA512:
-  metadata.gz: fcfb2a52f2cbbe918d77bebfc2fc19334ad892691a538bd14dc043b52bbf71bcebb11793704798069a7779d20cf67cb096c88347c1f14d35e4a16b691ad3f99a
-  data.tar.gz: d21f845c889de0d9bcfc8e54fefa141e1abfaa3a50bd2556294e468c191d15eaa48cbf054c6f1b1c4f0a7d43b8d5df780f0e3e567b9002826bb6dffa5f1550b7
+  metadata.gz: 19ebc04a7b038919f635a33fc9e8f9e94500c62d9e8c68f6a51df9d66d4d8bc9e4b0036cd48b04f1215cfaa23d28321982ac28f90b26fd091cbac6da671b1f22
+  data.tar.gz: cddea78b6c4050cfbb3b7de37346ea91022a00f72f3da62368870878c8630a2024988b894bb102be81e05f80002c0e9ffcf2ce1ae434673eca43fc342c902f44

data/lib/kennel/api.rb

@@ -7,7 +7,7 @@ module Kennel
 
     RateLimitParams = Data.define(:limit, :period, :remaining, :reset, :name)
 
-    def self.tag(api_resource, reply)
+    def self.with_tracking(api_resource, reply)
       klass = Models::Record.api_resource_map[api_resource]
       return reply unless klass # do not blow up on unknown models
 
@@ -28,7 +28,7 @@ module Kennel
       response = request :get, "/api/v1/#{api_resource}/#{id}", params: params
       response = response.fetch(:data) if api_resource == "slo"
       response[:id] = response.delete(:public_id) if api_resource == "synthetics/tests"
-      self.class.tag(api_resource, response)
+      self.class.with_tracking(api_resource, response)
     end
 
     def list(api_resource, params = {})
@@ -44,7 +44,7 @@ module Kennel
         # ignore monitor synthetics create and that inherit the kennel_id, we do not directly manage them
         response.reject! { |m| m[:type] == "synthetics alert" } if api_resource == "monitor"
 
-        response.map { |r| self.class.tag(api_resource, r) }
+        response.map { |r| self.class.with_tracking(api_resource, r) }
       end
     end
 
@@ -52,13 +52,13 @@ module Kennel
       response = request :post, "/api/v1/#{api_resource}", body: attributes
       response = response.fetch(:data).first if api_resource == "slo"
       response[:id] = response.delete(:public_id) if api_resource == "synthetics/tests"
-      self.class.tag(api_resource, response)
+      self.class.with_tracking(api_resource, response)
     end
 
     def update(api_resource, id, attributes)
       response = request :put, "/api/v1/#{api_resource}/#{id}", body: attributes
       response[:id] = response.delete(:public_id) if api_resource == "synthetics/tests"
-      self.class.tag(api_resource, response)
+      self.class.with_tracking(api_resource, response)
     end
 
     # - force=true to not dead-lock on dependent monitors+slos

data/lib/kennel/importer.rb

@@ -2,12 +2,9 @@
 
 module Kennel
   class Importer
-    # title will have the lock symbol we need to remove when re-importing
-    TITLES = [:name, :title].freeze
-
     # bring important fields to the top
     SORT_ORDER = [
-      *TITLES, :id, :kennel_id, :type, :tags, :query, :sli_specification,
+      *Kennel::Models::Record::TITLE_FIELDS, :id, :kennel_id, :type, :tags, :query, :sli_specification,
       *Models::Record.subclasses.flat_map { |k| k::TRACKING_FIELDS },
       :template_variables
     ].freeze
@@ -17,10 +14,6 @@ module Kennel
     end
 
     def import(resource, id)
-      if ["screen", "dash"].include?(resource)
-        raise ArgumentError, "resource 'screen' and 'dash' are deprecated, use 'dashboard'"
-      end
-
       model =
         Kennel::Models::Record.subclasses.detect { |c| c.api_resource == resource } ||
         raise(ArgumentError, "#{resource} is not supported")
@@ -31,9 +24,10 @@ module Kennel
       model.normalize({}, data) # removes id
       data[:id] = id
 
-      title_field = TITLES.detect { |f| data[f] }
+      # title will have the lock symbol we need to remove when re-importing
+      title_field = Kennel::Models::Record::TITLE_FIELDS.detect { |f| data[f] }
       title = data.fetch(title_field)
-      title.tr!(Kennel::Models::Record::LOCK, "") # avoid double lock icon
+      title.tr!(Kennel::Models::Record::LOCK, "")
 
       # calculate or reuse kennel_id
       data[:kennel_id] =

data/lib/kennel/models/dashboard.rb

@@ -34,7 +34,8 @@ module Kennel
           },
           time: {},
           title_align: "left",
-          title_size: "16"
+          title_size: "16",
+          show_legend: true
         },
         "note" => {
           show_tick: false,

data/lib/kennel/models/record.rb

@@ -26,6 +26,7 @@ module Kennel
         :deleted, :id, :created, :created_at, :creator, :org_id, :modified, :modified_at,
         :klass, :tracking_id # added by syncer.rb
       ].freeze
+      TITLE_FIELDS = [:name, :title].freeze # possible fields that could have the title
       ALLOWED_KENNEL_ID_CHARS = "a-zA-Z_\\d.-"
       ALLOWED_KENNEL_ID_SEGMENT = /[#{ALLOWED_KENNEL_ID_CHARS}]+/
       ALLOWED_KENNEL_ID_FULL = "#{ALLOWED_KENNEL_ID_SEGMENT}:#{ALLOWED_KENNEL_ID_SEGMENT}".freeze

data/lib/kennel/syncer.rb

@@ -89,6 +89,10 @@ module Kennel
 
         # see which expected match the actual
         matching, unmatched_expected, unmatched_actual = MatchedExpected.partition(expected, actual)
+        unmatched_actual.select! { |a| a.fetch(:tracking_id) } # ignore items that were never managed by kennel
+
+        convert_replace_into_update!(matching, unmatched_actual, unmatched_expected)
+
         validate_expected_id_not_missing unmatched_expected
         fill_details! matching # need details to diff later
 
@@ -105,7 +109,7 @@ module Kennel
         end.compact
 
         # delete previously managed
-        deletes = unmatched_actual.map { |a| Types::PlannedDelete.new(a) if a.fetch(:tracking_id) }.compact
+        deletes = unmatched_actual.map { |a| Types::PlannedDelete.new(a) }
 
         # unmatched expected need to be created
         unmatched_expected.each(&:add_tracking_id)
@@ -119,6 +123,32 @@ module Kennel
       end
     end
 
+    # if there is a new item that has the same name or title as an "to be deleted" item,
+    # update it instead to avoid old urls from becoming invalid
+    # - careful with unmatched_actual being huge since it has all api resources
+    # - don't do it when a monitor type is changing since that would block the update
+    def convert_replace_into_update!(matching, unmatched_actual, unmatched_expected)
+      unmatched_expected.reject! do |e|
+        e_field, e_value = Kennel::Models::Record::TITLE_FIELDS.detect do |field|
+          next unless (value = e.as_json[field])
+          break [field, value]
+        end
+        raise unless e_field #  uncovered: should never happen ...
+        e_monitor_type = e.as_json[:type]
+
+        actual = unmatched_actual.detect do |a|
+          a[:klass] == e.class && a[e_field] == e_value && a[:type] == e_monitor_type
+        end
+        next false unless actual # keep in unmatched
+
+        # add as update and remove from unmatched
+        unmatched_actual.delete(actual)
+        actual[:tracking_id] = e.tracking_id
+        matching << [e, actual]
+        true
+      end
+    end
+
     # fill details of things we need to compare
     def fill_details!(details_needed)
       details_needed = details_needed.map { |e, a| a if e && e.class.api_resource == "dashboard" }.compact

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.158.0
+  version: 1.160.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs