kennel 1.152.2 → 1.153.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88b86334b6da3d629e425ac3f737a777ad2dd87b37a57fc4743c1ea3cb339bf1
-  data.tar.gz: 31450e2d5e08537c3535febf9c9ed325c4f74389fe214672630cc9f2a7588712
+  metadata.gz: 494943be7e89773e54b07cafc41725e946bbc2c4038315ce21b123515c4561de
+  data.tar.gz: f9ae76c8cc4a83d04f41c44abb4eb8fee2aefc85f60ee6376de1fcd8e639cdee
 SHA512:
-  metadata.gz: de69bafea2a57a785650fa739a0f99072cf5e87405abf3bea8c7d31d03bca82dab1f8a01ff0f6ec0400fef46b76922e44edef5af4b626d2e12e3752d92bde171
-  data.tar.gz: f166d2222b7abfd73ee5cdd5983084cfe050b0faf5b2cec0e8cc5034c101474eade279d9f949e8898249862ba16f12b9da13460269c5f8f19ab59c9974c73a99
+  metadata.gz: 156d4655d75c82ddac1ac80dad4cd1d480c3a7c277c1bcc115a887c7c6d6b653daf7f73deaa7e42fc46a0a79e1bbc2102acb7e4ffa86c08ab7ce14cbdd9270e9
+  data.tar.gz: fde6bf6493035c908ada35545f4666cf7a7c81090dfef315384180d904f6c904d13dc4e5f47c84b33d21d21bfd851efd4e70542c22a19fdc96233898284552f3

data/lib/kennel/api.rb

@@ -146,7 +146,7 @@ module Kennel
         end
 
         if !response.success? && (response.status != 404 || !ignore_404)
-          message = +"Error #{response.status} during #{method.upcase} #{path}\n"
+          message = "Error #{response.status} during #{method.upcase} #{path}\n"
           message << "request:\n#{JSON.pretty_generate(body)}\nresponse:\n" if body
           message << response.body.encode(message.encoding, invalid: :replace, undef: :replace)
           raise message

data/lib/kennel/importer.rb

@@ -37,7 +37,7 @@ module Kennel
 
       # calculate or reuse kennel_id
       data[:kennel_id] =
-        if tracking_id = model.parse_tracking_id(data)
+        if (tracking_id = model.parse_tracking_id(data))
           model.remove_tracking_id(data)
           tracking_id.split(":").last
         else
@@ -88,7 +88,7 @@ module Kennel
       data.delete(:tags) if data[:tags] == [] # do not create super + [] call
 
       # simplify template_variables to array of string when possible
-      if vars = data[:template_variables]
+      if (vars = data[:template_variables])
         vars.map! { |v| v[:default] == "*" && v[:prefix] == v[:name] ? v[:name] : v }
       end
 
@@ -119,10 +119,10 @@ module Kennel
     def dry_up_widget_metadata!(widget)
       (widget.dig(:definition, :requests) || []).each do |request|
         next unless request.is_a?(Hash)
-        next unless metadata = request[:metadata]
-        next unless query = request[:q]&.dup
+        next unless (metadata = request[:metadata])
+        next unless (query = request[:q]&.dup)
         metadata.each do |m|
-          next unless exp = m[:expression]
+          next unless (exp = m[:expression])
           query.sub!(exp, "")
         end
         request[:q] = :metadata if query.delete(", ") == ""

data/lib/kennel/models/dashboard.rb

@@ -112,7 +112,7 @@ module Kennel
 
         # conditional_formats ordering is randomly changed by datadog, compare a stable ordering
         def sort_conditional_formats(widget)
-          if formats = widget&.dig(:definition, :conditional_formats)
+          if (formats = widget&.dig(:definition, :conditional_formats))
             widget[:definition][:conditional_formats] = formats.sort_by(&:hash)
           end
         end
@@ -120,7 +120,7 @@ module Kennel
         def ignore_widget_defaults(expected, actual)
           types = [expected&.dig(:definition, :type), actual&.dig(:definition, :type)].uniq.compact
           return unless types.size == 1
-          return unless defaults = WIDGET_DEFAULTS[types.first]
+          return unless (defaults = WIDGET_DEFAULTS[types.first])
           ignore_default expected&.[](:definition) || {}, actual&.[](:definition) || {}, defaults
         end
 
@@ -179,21 +179,21 @@ module Kennel
       def resolve_linked_tracking_ids!(id_map, **args)
         widgets = as_json[:widgets].flat_map { |w| [w, *w.dig(:definition, :widgets) || []] }
         widgets.each do |widget|
-          next unless definition = widget[:definition]
+          next unless (definition = widget[:definition])
           case definition[:type]
           when "uptime"
-            if ids = definition[:monitor_ids]
+            if (ids = definition[:monitor_ids])
               definition[:monitor_ids] = ids.map do |id|
                 resolve(id, :monitor, id_map, **args) || id
               end
             end
           when "alert_graph"
-            if id = definition[:alert_id]
+            if (id = definition[:alert_id])
               resolved = resolve(id, :monitor, id_map, **args) || id
               definition[:alert_id] = resolved.to_s # even though it's a monitor id
             end
           when "slo"
-            if id = definition[:slo_id]
+            if (id = definition[:slo_id])
               definition[:slo_id] = resolve(id, :slo, id_map, **args) || id
             end
           when "timeseries"

data/lib/kennel/models/monitor.rb

@@ -95,7 +95,7 @@ module Kennel
 
           # warning, ok, critical_recovery, and warning_recovery are optional
           [:warning, :ok, :critical_recovery, :warning_recovery].each do |key|
-            if value = send(key)
+            if (value = send(key))
               thresholds[key] = value
             end
           end
@@ -112,7 +112,7 @@ module Kennel
         end
 
         # set without causing lots of nulls to be stored
-        if notify_by_value = notify_by
+        if (notify_by_value = notify_by)
           options[:notify_by] = notify_by_value
         end
 
@@ -122,11 +122,11 @@ module Kennel
           options.delete :no_data_timeframe
         end
 
-        if windows = threshold_windows
+        if (windows = threshold_windows)
           options[:threshold_windows] = windows
         end
 
-        if schedule = scheduling_options
+        if (schedule = scheduling_options)
           options[:scheduling_options] = schedule
         end
 
@@ -256,7 +256,7 @@ module Kennel
         end
 
         # verify query includes critical value
-        if query_value = data.fetch(:query)[/\s*[<>]=?\s*(\d+(\.\d+)?)\s*$/, 1]
+        if (query_value = data.fetch(:query)[/\s*[<>]=?\s*(\d+(\.\d+)?)\s*$/, 1])
           if Float(query_value) != Float(data.dig(:options, :thresholds, :critical))
             invalid! :critical_does_not_match_query, "critical and value used in query must match"
           end
@@ -298,7 +298,7 @@ module Kennel
         # - also match without by
         # - separate parsers for query and service
         # - service must always allow `host`, maybe others
-        return unless match = data.fetch(:query).match(/(?:{([^}]*)}\s*)?by\s*[({]([^})]+)[})]/)
+        return unless (match = data.fetch(:query).match(/(?:{([^}]*)}\s*)?by\s*[({]([^})]+)[})]/))
 
         allowed =
           match[1].to_s.split(/\s*,\s*/).map { |k| k.split(":", 2)[-2] } + # {a:b} -> a TODO: does not work for service check

data/lib/kennel/models/project.rb

@@ -9,11 +9,11 @@ module Kennel
       )
 
       def self.file_location
-        @file_location ||= begin
-          method_in_file = instance_methods(false).first
-          return if method_in_file.nil?
-
-          instance_method(method_in_file).source_location.first.sub("#{Bundler.root}/", "")
+        return @file_location if defined?(@file_location)
+        if (location = instance_methods(false).first)
+          @file_location = instance_method(location).source_location.first.sub("#{Bundler.root}/", "")
+        else
+          @file_location = nil
         end
       end
 

data/lib/kennel/models/record.rb

@@ -38,7 +38,7 @@ module Kennel
       class << self
         def parse_any_url(url)
           subclasses.detect do |s|
-            if id = s.parse_url(url)
+            if (id = s.parse_url(url))
               break s.api_resource, id
             end
           end
@@ -188,7 +188,7 @@ module Kennel
           else
             nil # will be re-resolved after the linked object was created
           end
-        elsif id = id_map.get(sought_type.to_s, sought_tracking_id)
+        elsif (id = id_map.get(sought_type.to_s, sought_tracking_id))
           id
         else
           raise UnresolvableIdError, <<~MESSAGE
@@ -200,7 +200,7 @@ module Kennel
       end
 
       def raise_with_location(error, message)
-        super error, "#{message} for project #{project.kennel_id}"
+        super(error, "#{message} for project #{project.kennel_id}")
       end
     end
   end

data/lib/kennel/models/slo.rb

@@ -40,11 +40,11 @@ module Kennel
 
         if type == "time_slice"
           data[:sli_specification] = sli_specification
-        elsif v = query
+        elsif (v = query)
           data[:query] = v
         end
 
-        if v = groups
+        if (v = groups)
           data[:groups] = v
         end
 
@@ -64,7 +64,7 @@ module Kennel
       end
 
       def resolve_linked_tracking_ids!(id_map, **args)
-        return unless ids = as_json[:monitor_ids] # ignore_default can remove it
+        return unless (ids = as_json[:monitor_ids]) # ignore_default can remove it
         as_json[:monitor_ids] = ids.map do |id|
           resolve(id, :monitor, id_map, **args) || id
         end

data/lib/kennel/projects_provider.rb

@@ -25,11 +25,11 @@ module Kennel
 
       # TODO: also auto-load projects and update expected path too
       ["projects"].each do |folder|
-        Dir["#{folder}/**/*.rb"].sort.each { |f| require "./#{f}" }
+        Dir["#{folder}/**/*.rb"].each { |f| require "./#{f}" }
       end
     rescue NameError => e
       message = e.message
-      raise unless klass = message[/uninitialized constant (.*)/, 1]
+      raise unless (klass = message[/uninitialized constant (.*)/, 1])
 
       # inverse of zeitwerk lib/zeitwerk/inflector.rb
       path = klass.gsub("::", "/").gsub(/([a-z])([A-Z])/, "\\1_\\2").downcase + ".rb"

data/lib/kennel/settings_as_methods.rb

@@ -9,7 +9,7 @@ module Kennel
       file, line, = caller(2..2).first.split(":", 3)
 
       options.transform_values do |v|
-        if v.class == Proc
+        if v.instance_of?(Proc)
           v
         else
           eval "-> { v }", nil, file, line.to_i
@@ -80,7 +80,7 @@ module Kennel
       # need expand_path so it works wih rake and when run individually
       pwd = /^#{Regexp.escape(Dir.pwd)}\//
       @invocation_location = caller.detect do |l|
-        if found = File.expand_path(l).sub!(pwd, "")
+        if (found = File.expand_path(l).sub!(pwd, ""))
           break found
         end
       end

data/lib/kennel/string_utils.rb

@@ -4,7 +4,7 @@ module Kennel
     class << self
       def snake_case(string)
         string
-          .gsub(/::/, "_") # Foo::Bar -> foo_bar
+          .gsub("::", "_") # Foo::Bar -> foo_bar
           .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2') # FOOBar -> foo_bar
           .gsub(/([a-z\d])([A-Z])/, '\1_\2') # fooBar -> foo_bar
           .tr("-", "_") # foo-bar -> foo_bar
@@ -26,7 +26,7 @@ module Kennel
       end
 
       def truncate_lines(text, to:, warning:)
-        lines = text.split(/\n/, to + 1)
+        lines = text.split("\n", to + 1)
         lines[-1] = warning if lines.size > to
         lines.join("\n")
       end

data/lib/kennel/syncer/resolver.rb

@@ -22,7 +22,7 @@ module Kennel
         # override resources that exist with their id
         actual.each do |a|
           # ignore when not managed by kennel
-          next unless tracking_id = a.fetch(:tracking_id)
+          next unless (tracking_id = a.fetch(:tracking_id))
 
           # ignore when deleted from the codebase
           # (when running with filters we cannot see the other resources in the codebase)

data/lib/kennel/syncer.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "./syncer/matched_expected"
-require_relative "./syncer/plan"
-require_relative "./syncer/plan_printer"
-require_relative "./syncer/resolver"
-require_relative "./syncer/types"
+require_relative "syncer/matched_expected"
+require_relative "syncer/plan"
+require_relative "syncer/plan_printer"
+require_relative "syncer/resolver"
+require_relative "syncer/types"
 
 module Kennel
   class Syncer
@@ -122,7 +122,7 @@ module Kennel
 
     def validate_expected_id_not_missing(expected)
       expected.each do |e|
-        next unless id = e.id
+        next unless (id = e.id)
         resource = e.class.api_resource
         if @strict_imports
           raise "Unable to find existing #{resource} with id #{id}\nIf the #{resource} was deleted, remove the `id: -> { #{id} }` line."

data/lib/kennel/tasks.rb

@@ -81,7 +81,7 @@ namespace :kennel do
 
     bad = []
     Dir["generated/**/*.json"].each do |f|
-      next unless message = JSON.parse(File.read(f))["message"]
+      next unless (message = JSON.parse(File.read(f))["message"])
       used = message
         .scan(/(?:^|\s)(@[^\s{,'"]+)/)
         .flatten(1)
@@ -153,7 +153,7 @@ namespace :kennel do
         end
     end
 
-    if threshold = ENV["THRESHOLD_DAYS"]
+    if (threshold = ENV["THRESHOLD_DAYS"])
       monitors.select! { |m| m[:days_in_no_data] > Integer(threshold) }
     end
 
@@ -196,7 +196,7 @@ namespace :kennel do
   desc "Dump ALL of datadog config as raw json ... useful for grep/search [TYPE=slo|monitor|dashboard]"
   task dump: :environment do
     resources =
-      if type = ENV["TYPE"]
+      if (type = ENV["TYPE"])
         [type]
       else
         Kennel::Models::Record.api_resource_map.keys

data/lib/kennel/unmuted_alerts.rb

@@ -58,7 +58,7 @@ module Kennel
         monitors.reject! { |m| m[:options][:silenced].key?(:*) }
 
         # only keep groups that are alerting
-        monitors.each { |m| m[:state][:groups].reject! { |_, g| g[:status] == "OK" || g[:status] == "Ignored" } }
+        monitors.each { |m| m[:state][:groups].reject! { |_, g| ["OK", "Ignored"].include?(g[:status]) } }
 
         # only keep alerting groups that are not silenced
         monitors.each do |m|

data/lib/kennel/version.rb

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

metadata

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