kennel 1.95.0 → 1.97.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6570a5349f036d6146c90bad7b895dc4ac12d7bdbd7a246639fa73051a65748c
-  data.tar.gz: b62a1cae5ab997244a56b552ccc4653d07dff907145a3ac88e6ca8b225f5e240
+  metadata.gz: e8d215839f60e7de711646bbe7fa33a6cb6e760abccf0b93eb1aa2bf4a7698d5
+  data.tar.gz: edee1d1856e9573bff15881653f3b6b1c0e28aeea923ce228a292a7d5e9bef77
 SHA512:
-  metadata.gz: eac6064d94be025b7d6f66e3dc85d9237f1b80612b15b94c008645e6c57e427cb0907167bd2adec4124b45f94e36bdf76c3f7bbd02d4516e8006d4340b1fc9f3
-  data.tar.gz: 2617d8b6ea3d0c6b1b42921adfc249dd90b2a150ee7f40abc11275c3e473f7e7c425fa8886d8d3995e06b5b84e7398a3daee02464c4cf3985eeb41809fafb1ff
+  metadata.gz: 488aaaff92f09f9176533e8103d86c4eda767cd0ec0d5f6b6982c14f5a0886e7f41ad1ddc9d4d8c2dd4b9906c5fbd90609071af89f4de8c800fa6b8687c171a1
+  data.tar.gz: 0011e0ba0634266a400f224e5855ffdff23142cc111af8acb4f808dfdda29ebf25a4718cf5b70e9222dc600cfdcbd5ae903ffc1d128d9ca2b1b5d475c8eff4c7

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/version.rb

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

data/lib/kennel.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "faraday"
 require "json"
+require "zeitwerk"
 require "shellwords"
 require "English"
 
@@ -30,6 +31,10 @@ require "kennel/models/synthetic_test"
 require "kennel/models/project"
 require "kennel/models/team"
 
+# need to define early since we autoload the teams/ folder into it
+module Teams
+end
+
 module Kennel
   class ValidationError < RuntimeError
   end
@@ -128,9 +133,34 @@ module Kennel
     end
 
     def load_all
-      ["teams", "parts", "projects"].each do |folder|
+      loader = Zeitwerk::Loader.new
+      Dir.exist?("teams") && loader.push_dir("teams", namespace: Teams)
+      Dir.exist?("parts") && loader.push_dir("parts")
+      loader.setup
+
+      # 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,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.95.0
+  version: 1.97.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-23 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 description: 
 email: michael@grosser.it
 executables: []