kennel 2.20.0 → 2.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d41a632f2e488aacff6253cdb1b161d628d7522ffd4b7ce3e006455b912ca16d
-  data.tar.gz: 0ffe3c8a9ec7d828aa397460af8f06af307f14e4a9740ff0e1a1693bc6c65950
+  metadata.gz: 5f604eb100e46e40ba76333717c9ddb99e06cd85be98f7eb19217b7be1b193b2
+  data.tar.gz: 352ead0a6c2ce295f14113d03f9ab956278851d55457340dffa9d6fdf042856e
 SHA512:
-  metadata.gz: 8151f10629556f4b9dbad8b11c69e032fca8ebbd00a50e888482a2bb37659ce70028a8740606a90745de3b3808967165b4cc10c1faeac2ccce707bfc57cb8811
-  data.tar.gz: 6682f0c4815aacd911464f92c94f376110e52219c465f6f482dfbb85399b0ec4ea2b5d33d78ae394f753a04ef959b6b766325bd4bbc2f0b461dd172a24ed1349
+  metadata.gz: 5d0e3477bcef3043433fca52d3e3c3940f7cd315c7c89ecebb7a07eb7a50d56adcb46522a51492ef47c72346b10bec7446c495c8d368c5ff741a510e2c8885b9
+  data.tar.gz: 0e71a447829ac1dcc996b08858e7dcd720b3e3f6f9e5b2e008bc0e187e952e1cafaa561b62152a37e547053d033ef0c2e37746419205eb1788d859c536f5d77a

data/lib/kennel/importer.rb

@@ -86,7 +86,14 @@ module Kennel
         end
       when "synthetics/tests"
         data[:locations] = :all if data[:locations].sort == Kennel::Models::SyntheticTest::LOCATIONS.sort
-      else
+      when "slo"
+        # sli_specification it is only used by datadog if the user switched to "Bad Events"
+        # otherwise user would be trying to set sli_specification but the slo does not change since query is used
+        if data.key?(:query) && data.key?(:sli_specification)
+          delete = (data.dig(:sli_specification, :count, :bad_events_formula) ? :query : :sli_specification)
+          data.delete delete
+        end
+      else # uncovered
         # noop
       end
 

data/lib/kennel/models/project.rb

@@ -10,10 +10,16 @@ module Kennel
 
       def self.file_location
         return @file_location if defined?(@file_location)
-        if (location = instance_methods(false).first)
-          @file_location = force_relative_path(instance_method(location).source_location.first)
+        methods = instance_methods(false)
+        if methods.any?
+          @file_location = methods.detect do |method|
+            location = instance_method(method).source_location.first
+            if (path = find_relative_path(location))
+              break path
+            end
+          end || raise("Unable to find file_location for #{name}")
         else
-          @file_location = nil
+          @file_location = nil # not sure if this is actually needed
         end
       end
 
@@ -29,11 +35,9 @@ module Kennel
 
       private
 
-      private_class_method def self.force_relative_path(path)
+      private_class_method def self.find_relative_path(path)
         return path unless File.absolute_path?(path)
-        path.dup.sub!("#{Bundler.root}/", "") ||
-          path.dup.sub!("#{Dir.pwd}/", "") ||
-          raise("Unable to make path #{path} relative with bundler root #{Bundler.root} or pwd #{Dir.pwd}")
+        path.dup.sub!("#{Bundler.root}/", "") || path.dup.sub!("#{Dir.pwd}/", "")
       end
 
       # hook for users to add custom filtering via `prepend`

data/lib/kennel/models/slo.rb

@@ -15,7 +15,8 @@ module Kennel
         groups: nil,
         monitor_ids: [],
         thresholds: [],
-        primary: nil
+        primary: nil,
+        sli_specification: nil
       }.freeze
 
       settings :type, :description, :thresholds, :query, :tags, :monitor_ids, :monitor_tags, :name, :groups, :sli_specification, :primary
@@ -27,7 +28,8 @@ module Kennel
         monitor_ids: -> { DEFAULTS.fetch(:monitor_ids) },
         thresholds: -> { DEFAULTS.fetch(:thresholds) },
         groups: -> { DEFAULTS.fetch(:groups) },
-        primary: -> { DEFAULTS.fetch(:primary) }
+        primary: -> { DEFAULTS.fetch(:primary) },
+        sli_specification: -> { DEFAULTS.fetch(:sli_specification) }
       )
 
       def build_json
@@ -50,9 +52,8 @@ module Kennel
           data[:target_threshold] = threshold[:target]
         end
 
-        # TODO: if user set sli_specification but we don't use it we should raise, but sadly we can't detect that easily
-        if type == "time_slice"
-          data[:sli_specification] = sli_specification
+        if (v = sli_specification)
+          data[:sli_specification] = v
         elsif (v = query)
           data[:query] = v
         end
@@ -102,10 +103,14 @@ module Kennel
           [:timeframe, :warning_threshold, :target_threshold].each { |k| actual.delete k }
         end
 
-        # datadog always sets this, but we only set it for time_slice, so discard it for everything else to avoid diff
-        if expected[:type] != "time_slice"
-          actual.delete :sli_specification
-        end
+        # discard deprecated query which stays in datadog forever when we are trying to set sli_specification
+        # (downgrading to query by setting sli_specification=nil is not supported in the api)
+        actual.delete :query if expected[:sli_specification]
+
+        # user set query so let's not worry about sli_specification even if this might be hiding bugs
+        # ideally we'd validate and tell the user that this will have no effect (see importer logic)
+        # but I'm not confident this will always be right
+        actual.delete :sli_specification if expected[:query]
 
         ignore_default(expected, actual, DEFAULTS)
       end

data/lib/kennel/version.rb

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

metadata

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