kennel 1.96.0 → 1.98.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dad671ae1433588cff8641dbe5337c5db450d2bda9a05d61ba272a76c2482a5b
-  data.tar.gz: 493cac344bfa4b1e2cab2de6e395887e91eac3d374fea84333af0268b8ee544d
+  metadata.gz: c3a596895475dbc4577d69916cb277fecfb45add58faf0bf1b6e06d314f161c3
+  data.tar.gz: 1f618cd4aa9a8eed2ad38ec067876e21f6d3f148d541a96bcc9afaa79619a48d
 SHA512:
-  metadata.gz: 6048d4264a57b5b1bbda44bbc302965de9b09ba8985f397d5c537910d1d79fad0b0e77b02dfcda9e43b2168bc32b1c3ad335081afb1f9f2a3c09096c811d0b4d
-  data.tar.gz: d4f919fcda3553c30bcfb38719b9996b5eca9189c0f4d7d73718f52b526a5eb84cb35f128463ae35fbac525dd61aacc54f7d2447bcf53eff5ed4f2bc5a30cc22
+  metadata.gz: 4324951f97ef28dd0a5081231ea6aa676b81c3f405598dcf683d0ad5abc5dc346333d0e5029e84c5c742aa896b90aa1c11cd5891483f5c3bb5e67f0bec6ba6a8
+  data.tar.gz: 44e1c9af9868579db4497c2a9807a814bc6a78e49956c165d0b954fd4cbc0d6511ee046a43777354ef4f18c79ab70e5ae5061468ab5fd410aab5f55f1f219af2

data/lib/kennel/models/monitor.rb

@@ -31,7 +31,7 @@ module Kennel
       settings(
         :query, :name, :message, :escalation_message, :critical, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
         :ok, :no_data_timeframe, :notify_no_data, :notify_audit, :tags, :critical_recovery, :warning_recovery, :require_full_window,
-        :threshold_windows, :new_host_delay, :priority
+        :threshold_windows, :new_host_delay, :new_group_delay, :priority
       )
 
       defaults(
@@ -45,6 +45,7 @@ module Kennel
         no_data_timeframe: -> { 60 },
         notify_audit: -> { MONITOR_OPTION_DEFAULTS.fetch(:notify_audit) },
         new_host_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:new_host_delay) },
+        new_group_delay: -> { nil },
         tags: -> { @project.tags },
         timeout_h: -> { MONITOR_OPTION_DEFAULTS.fetch(:timeout_h) },
         evaluation_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:evaluation_delay) },
@@ -70,6 +71,7 @@ module Kennel
             notify_audit: notify_audit,
             require_full_window: require_full_window,
             new_host_delay: new_host_delay,
+            new_group_delay: new_group_delay,
             include_tags: true,
             escalation_message: Utils.presence(escalation_message.strip),
             evaluation_delay: evaluation_delay,
@@ -106,6 +108,9 @@ module Kennel
           options[:threshold_windows] = windows
         end
 
+        # Datadog requires only either new_group_delay or new_host_delay, never both
+        options.delete(options[:new_group_delay] ? :new_host_delay : :new_group_delay)
+
         validate_json(data) if validate
 
         @as_json = data

data/lib/kennel/models/project.rb

@@ -2,7 +2,7 @@
 module Kennel
   module Models
     class Project < Base
-      settings :team, :parts, :tags, :mention
+      settings :team, :parts, :tags, :mention, :name, :kennel_id
       defaults(
         tags: -> { ["service:#{kennel_id}"] + team.tags },
         mention: -> { team.mention }

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -138,10 +138,29 @@ module Kennel
       Dir.exist?("parts") && loader.push_dir("parts")
       loader.setup
 
-      # TODO: also do projects
+      # TODO: also do projects and update expected path too
       ["projects"].each do |folder|
         Dir["#{folder}/**/*.rb"].sort.each { |f| require "./#{f}" }
       end
+    rescue NameError => e
+      message = e.message
+      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"
+      expected_path = (path.start_with?("teams/") ? path : "parts/#{path}")
+
+      # TODO: prefer to raise a new exception with the old backtrace attacked
+      e.define_singleton_method(:message) do
+        "\n" + <<~MSG.gsub(/^/, "  ")
+          #{message}
+          Unable to load #{klass} from #{expected_path}
+          - Option 1: rename the constant or the file it lives in, to make them match
+          - Option 2: Use `require` or `require_relative` to load the constant
+        MSG
+      end
+
+      raise
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.96.0
+  version: 1.98.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday