kennel 2.3.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a72c925b5388b403514bc0be5c998595428bb41cdf41f97f91571a374716e14
-  data.tar.gz: 6bcd5f992433b13f088c633e1cd3468c1966cada8df12a689a07343a17e23d2c
+  metadata.gz: ca7ba16c7952c8b56ba72203c27828ed64cf0b5e927673b7de2e3b132536d318
+  data.tar.gz: 77b70544f3be1cda6a21dd24ce5b80eaa9c3f6588d566f46d7c1b43e87bf93e0
 SHA512:
-  metadata.gz: 713d35626d870aeaaa1148a73b56b73b25e515dfa2523a97e2e423f5f63dc84461b4bcadbe0fc928698717f2928e99fca47ccb9c7a755057635b4b3b51025acc
-  data.tar.gz: 1d65adb907acd6c31f60c53be6dabf9d3849793f684d2d142403f7fa4b71439ec4544e72b325eb7d4181a50e81542b7704c1144ff2e7e79bb7d90716a9b0ce2e
+  metadata.gz: c773b16cd6f66d0941073c6146578b5e5b011aff2aa83e90dffea2f069912a3afdb14dabc553fb10436089947f056a9aa13797e9ae54ed3e668e2da6c7b1c40c
+  data.tar.gz: 8c61dac6e484e8ebba99d7abe758f45e81c56536e6d9c686c57e7dcb6a373c9ff1f2afa7feee583d31722c2969234057aa6e23e52a2685d9e73dade48ae37fc2

data/lib/kennel/importer.rb

@@ -21,6 +21,12 @@ module Kennel
       data = @api.show(model.api_resource, id)
 
       id = data.fetch(:id) # keep native value
+      if resource == "slo"
+        # only set primary if needed to reduce clutter
+        if data[:thresholds] && data[:thresholds].min_by { |t| t[:timeframe].to_i }[:timeframe] != data[:timeframe]
+          data[:primary] = data[:timeframe]
+        end
+      end
       model.normalize({}, data) # removes id
       data[:id] = id
 

data/lib/kennel/models/slo.rb

@@ -6,7 +6,7 @@ module Kennel
 
       READONLY_ATTRIBUTES = [
         *superclass::READONLY_ATTRIBUTES,
-        :type_id, :monitor_tags, :target_threshold, :timeframe, :warning_threshold
+        :type_id, :monitor_tags
       ].freeze
       TRACKING_FIELD = :description
       DEFAULTS = {
@@ -40,20 +40,13 @@ module Kennel
           type: type
         )
 
-        # Add timeframe and thresholds based on primary setting
-        if primary
-          data[:timeframe] = primary
-
+        # add top level timeframe and threshold settings based on `primary`
+        if (p = primary)
+          data[:timeframe] = p
           threshold =
-            thresholds.detect { |t| t[:timeframe] == primary } ||
-            raise("unable to find threshold with timeframe #{primary}")
-
-          # Only add warning_threshold if it exists
-          if threshold[:warning]
-            data[:warning_threshold] = threshold[:warning]
-          end
-
-          # target is required
+            thresholds.detect { |t| t[:timeframe] == p } ||
+            raise(ArgumentError, "#{tracking_id} unable to find threshold with timeframe #{p}")
+          data[:warning_threshold] = threshold[:warning]
           data[:target_threshold] = threshold[:target]
         end
 
@@ -102,6 +95,12 @@ module Kennel
         expected[:tags]&.sort!
         actual[:tags].sort!
 
+        # do not show these in the diff if we automatically pick the primary timeframe,
+        # or we will have a permanent `something -> nil` diff
+        unless expected[:timeframe]
+          [:timeframe, :warning_threshold, :target_threshold].each { |k| actual.delete k }
+        end
+
         ignore_default(expected, actual, DEFAULTS)
       end
 

data/lib/kennel/tasks.rb

@@ -66,18 +66,26 @@ namespace :kennel do
     Kennel::Tasks.abort "Error during diffing" unless $CHILD_STATUS.success?
   end
 
-  # ideally do this on every run, but it's slow (~1.5s) and brittle (might not find all + might find false-positives)
+  # 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)
   # 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
+  # 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 = Kennel::Api.new
-      .send(:request, :get, "/monitor/notifications")
-      .fetch(:handles)
-      .values
-      .flatten(1)
+    known = []
+
+    # @slack- @team- @webhook- 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) }
 
-    known += ENV["KNOWN"].to_s.split(",")
+    # group emails or other 1-off things to ignore
+    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
 
     bad = []
     Dir["generated/**/*.json"].each do |f|

data/lib/kennel/version.rb

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

metadata

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