kennel 2.5.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca7ba16c7952c8b56ba72203c27828ed64cf0b5e927673b7de2e3b132536d318
-  data.tar.gz: 77b70544f3be1cda6a21dd24ce5b80eaa9c3f6588d566f46d7c1b43e87bf93e0
+  metadata.gz: bb95ceae817bc98d083407c5a6b19483e12e1932a98209c13fd097cd9bcf7ebd
+  data.tar.gz: 1a0c92f146ab14ffe80bccc86cb12f1561e8d874faefbe7f48f550a4c108cb6e
 SHA512:
-  metadata.gz: c773b16cd6f66d0941073c6146578b5e5b011aff2aa83e90dffea2f069912a3afdb14dabc553fb10436089947f056a9aa13797e9ae54ed3e668e2da6c7b1c40c
-  data.tar.gz: 8c61dac6e484e8ebba99d7abe758f45e81c56536e6d9c686c57e7dcb6a373c9ff1f2afa7feee583d31722c2969234057aa6e23e52a2685d9e73dade48ae37fc2
+  metadata.gz: 2b43e7160e79a8174ae60d929d998322cfda2730116500ce8e6ddbfd4114c2217b0d75c5f326ffafbc94c5976155810a858f6d43423430223fa9325207373a75
+  data.tar.gz: b9c53626a278cea303b617ec12f792f89b5a5ca858a20dd75f244367a38065ed436e5309184b04e8c5ba5f7060a5c5dab472837b2729c2313ab6cb730d6f0bef

data/lib/kennel/syncer.rb

@@ -127,6 +127,7 @@ module Kennel
     # 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
+    # - don't do it when a dashboard layout_type is changing since that would block the update
     # - when using a filter and updating the kennel_id of an existing item, old and new must be in the filter
     def convert_replace_into_update!(matching, unmatched_actual, unmatched_expected)
       unmatched_expected.reject! do |e|
@@ -135,10 +136,15 @@ module Kennel
           break [field, value]
         end
         raise unless e_field #  uncovered: should never happen ...
+        # TODO: ideally reuse invalid_update! logic and just put the fields somewhere
         e_monitor_type = e.as_json[:type]
+        e_dashboard_layout_type = e.as_json[:layout_type]
 
         actual = unmatched_actual.detect do |a|
-          a[:klass].api_resource == e.class.api_resource && a[e_field] == e_value && a[:type] == e_monitor_type
+          a[:klass].api_resource == e.class.api_resource &&
+            a[e_field] == e_value &&
+            a[:type] == e_monitor_type &&
+            a[:layout_type] == e_dashboard_layout_type
         end
         next false unless actual # keep in unmatched
 

data/lib/kennel/tasks.rb

@@ -67,26 +67,30 @@ namespace :kennel do
   end
 
   # ideally do this on every run, but it's slow (~1.5s) and brittle
-  # (might not find all via the matcher + might find false-positives because random emails can also be sent to)
+  # (might not find all via the regex + might find false-positives because random emails can also be sent to)
   # https://help.datadoghq.com/hc/en-us/requests/254114 for automatic validation
-  # /monitor/notifications has users+slack+sns so there is lots of overlap and we don't really need sns
+  # /monitor/notifications has users+slack+sns but not @team- and @webhook-
   # got a support ticket open to get sns into api/v2 too
   desc "Verify that all used monitor  mentions are valid"
   task validate_mentions: :environment do
     known = []
 
-    # @slack- @team- @webhook- user-emails
+    # @slack- @team- @webhook- @sns- user-emails
     known += Kennel::Api.new.send(:request, :get, "/api/v2/notifications/handles?group_limit=99999")
       .fetch(:data)
       .flat_map { |d| d.dig(:attributes, :handles) }
       .map { |v| v.fetch(:value) }
 
-    # group emails or other 1-off things to ignore
+    # group emails or other 1-off things we know are valid
     manual = ENV["KNOWN"].to_s.split(",")
     dupes = (manual & known)
     Kennel::Tasks.abort "KNOWN=#{dupes.join(",")} values are already known and should be removed" if dupes.any?
     known += manual
 
+    # @sns- handles are randomly invalid so we need to ignore them without checking if the ignore is needed
+    # https://help.datadoghq.com/hc/en-us/requests/2310423
+    known += ENV["KNOWN_RANDOM"].to_s.split(",")
+
     bad = []
     Dir["generated/**/*.json"].each do |f|
       next unless (message = JSON.parse(File.read(f))["message"])

data/lib/kennel/version.rb

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

metadata

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