kennel 2.2.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9945e9a42b446b95f53152f08d74765e4f7c228a4a4e9d3f5770eb6006338a0
-  data.tar.gz: 3cc6fd5ff0cece1763b9a4e798ac9da97df80c6b27b613caf45abe7f9ef4a1eb
+  metadata.gz: 3e01b3965b78914228272c6db34282678f7804466ad2ce86bb74937f7ef22be7
+  data.tar.gz: a40663b9cc2a5a609635ca8507e5f70883716307da3927de7e2d52e8a4f6e522
 SHA512:
-  metadata.gz: c43fb32a753b1e59aca9728195612568ec2a11d7d83e7a74daad064bbc5ec2d9f29951d0e0ff66e290d25e357b5a3e2d310cbac0b335ebccb1da7cbb5752a225
-  data.tar.gz: 61f079c7c9a0d8c746c529badc5e2d67fe4c3e8c19e2025ab95516be2667f4b1788d288d3e8420b929dc2fa85a98cd5c6f23b9395c3a066785194f44a02cb0a9
+  metadata.gz: a70ca74dafb5e00e3cb02e85aa6a17b50ea86c38779749eca2623758d2eea649b7d708697f27216768f94b401e7f14a16aa3d85c03c9f4d4cae287357f260bc0
+  data.tar.gz: 6ade52de1bf22e7b5932e017b029a1d46fde06fa7e310d7e482a993d0e6540c64f6123bb7c2b0170e7a94e5a431dde172bac4076afc63b80ed0a68f82292fbe2

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 = {
@@ -14,10 +14,11 @@ module Kennel
         query: nil,
         groups: nil,
         monitor_ids: [],
-        thresholds: []
+        thresholds: [],
+        primary: nil
       }.freeze
 
-      settings :type, :description, :thresholds, :query, :tags, :monitor_ids, :monitor_tags, :name, :groups, :sli_specification
+      settings :type, :description, :thresholds, :query, :tags, :monitor_ids, :monitor_tags, :name, :groups, :sli_specification, :primary
 
       defaults(
         tags: -> { @project.tags },
@@ -25,7 +26,8 @@ module Kennel
         description: -> { DEFAULTS.fetch(:description) },
         monitor_ids: -> { DEFAULTS.fetch(:monitor_ids) },
         thresholds: -> { DEFAULTS.fetch(:thresholds) },
-        groups: -> { DEFAULTS.fetch(:groups) }
+        groups: -> { DEFAULTS.fetch(:groups) },
+        primary: -> { DEFAULTS.fetch(:primary) }
       )
 
       def build_json
@@ -38,6 +40,16 @@ module Kennel
           type: type
         )
 
+        # add top level timeframe and threshold settings based on `primary`
+        if (p = primary)
+          data[:timeframe] = p
+          threshold =
+            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
+
         if type == "time_slice"
           data[:sli_specification] = sli_specification
         elsif (v = query)
@@ -83,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
 
@@ -97,6 +115,11 @@ module Kennel
           invalid! :tags_are_upper_case, "Tags must not be upper case (bad tags: #{bad_tags.sort.inspect})"
         end
 
+        # Check that thresholds are not empty
+        if !data[:thresholds] || data[:thresholds].empty?
+          invalid! :thresholds_empty, "SLO must have at least one threshold defined"
+        end
+
         # prevent "Invalid payload: The target is incorrect: target must be a positive number between (0.0, 100.0)"
         data[:thresholds]&.each do |threshold|
           target = threshold.fetch(:target)

data/lib/kennel/version.rb

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

metadata

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