kennel 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9635f7b742f83290e0feaa0f3eb1a55ba4ad78ca7d95c38aaba6e0adfebc1f4
-  data.tar.gz: 984fd58f8cabb3303e5f9084eb90405d6cf39c23b9c42b304d1aa6a07afca24b
+  metadata.gz: 9213ac86e78dd85ff280d2048bd20fe3d074c3d6218cc45021b8c11eee7c720c
+  data.tar.gz: b2506ab43bb450a0496db0985ffa990b378ad591fa7be2a1c8db32223863680e
 SHA512:
-  metadata.gz: ef77dd9a72a9577b0bf8eb78b300c41e098543422d7313a800693fbdc3e5a9ba5db82687cd0551eb362bb9cd8990e9cb943987ea442a3b99cdd52d02b30de3eb
-  data.tar.gz: 4d4e036cc03aec4619c6e407255189f263d9cd167406cd1bf7f0c131047417a65a777c8c449701622fed38e908d8c3f6aab7f9cd6f7514668371fc33bf0eabb4
+  metadata.gz: 73331755a7074cd0eeb95c92901cb8bf477380672a553cd7ef4722ec4cb6ea6f2fd56634eef442fb4a59de961d102c7b8b0f5b39788d006c24d960573eb27500
+  data.tar.gz: fa9ee34a57cce815f63eba43208daac2232cd04456f1200adc4181e6a381407b93962d52cbc5f9b27398caa863c8ab371758f5c216613b0218f8b9e958de6bc5

data/lib/kennel/api.rb

@@ -5,8 +5,6 @@ module Kennel
   class Api
     CACHE_FILE = ENV.fetch("KENNEL_API_CACHE_FILE", "tmp/cache/details")
 
-    RateLimitParams = Data.define(:limit, :period, :remaining, :reset, :name)
-
     def self.with_tracking(api_resource, reply)
       klass = Models::Record.api_resource_map[api_resource]
       return reply unless klass # do not blow up on unknown models
@@ -125,20 +123,8 @@ module Kennel
             end
           end
 
-          rate_limit = RateLimitParams.new(
-            limit: response.headers["x-ratelimit-limit"],
-            period: response.headers["x-ratelimit-period"],
-            remaining: response.headers["x-ratelimit-remaining"],
-            reset: response.headers["x-ratelimit-reset"],
-            name: response.headers["x-ratelimit-name"]
-          )
-
           if response.status == 429
-            message = "Datadog rate limit #{rate_limit.name.inspect} hit"
-            message += " (#{rate_limit.limit} requests per #{rate_limit.period} seconds)"
-            message += "; sleeping #{rate_limit.reset} seconds before trying again"
-            Kennel.err.puts message
-            sleep rate_limit.reset.to_f
+            sleep_until_rate_limit_resets(response)
             redo
           end
 
@@ -161,6 +147,20 @@ module Kennel
       end
     end
 
+    def sleep_until_rate_limit_resets(response)
+      limit = response.headers["x-ratelimit-limit"]
+      period = response.headers["x-ratelimit-period"]
+      reset = response.headers["x-ratelimit-reset"]
+      name = response.headers["x-ratelimit-name"]
+
+      message = "Datadog rate limit #{name.inspect} hit"
+      message += " (#{limit} requests per #{period} seconds)"
+      message += "; sleeping #{reset} seconds before trying again"
+
+      Kennel.err.puts message
+      sleep reset.to_f
+    end
+
     # allow caching all requests to speedup/benchmark logic that includes repeated requests
     def with_cache(enabled, key)
       return yield unless enabled

data/lib/kennel/models/monitor.rb

@@ -32,6 +32,12 @@ module Kennel
       DEFAULT_ESCALATION_MESSAGE = ["", nil].freeze
       ALLOWED_PRIORITY_CLASSES = [NilClass, Integer].freeze
       SKIP_NOTIFY_NO_DATA_TYPES = ["event alert", "event-v2 alert", "log alert"].freeze
+      MINUTES_PER_UNIT = {
+        "m" => 1,
+        "h" => 60,
+        "d" => 60 * 24,
+        "w" => 60 * 24 * 7
+      }.freeze
 
       settings(
         :query, :name, :message, :escalation_message, :critical, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
@@ -49,13 +55,11 @@ module Kennel
         # datadog UI sets this to false by default, but true is safer
         # except for log alerts which will always have "no error" gaps and should default to false
         notify_no_data: -> { !SKIP_NOTIFY_NO_DATA_TYPES.include?(type) },
-        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 },
         group_retention_duration: -> { MONITOR_OPTION_DEFAULTS.fetch(:group_retention_duration) },
         tags: -> { @project.tags },
-        timeout_h: -> { MONITOR_OPTION_DEFAULTS.fetch(:timeout_h) },
         evaluation_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:evaluation_delay) },
         critical_recovery: -> { nil },
         warning_recovery: -> { nil },
@@ -187,6 +191,24 @@ module Kennel
         "cannot update type from #{actual_type} to #{type}"
       end
 
+      # deprecated this setting is no longer returned by dd for new monitors
+      # datadog UI warns when setting no data timeframe to less than 2x the query window
+      # limited to 24h because `no_data_timeframe must not exceed group retention` and max group retention is 24h
+      def no_data_timeframe
+        default = 60
+        if type == "query alert" && (minutes = query_window_minutes)
+          (minutes * 2).clamp(default, 24 * 60)
+        else
+          default
+        end
+      end
+
+      # validate that monitors that alert on no data resolve in external services by using timeout_h, so it sends a
+      # notification when the no data group is removed from the monitor, which datadog does automatically after 24h
+      def timeout_h
+        notify_no_data && on_missing_data != "resolve" ? 24 : MONITOR_OPTION_DEFAULTS.fetch(:timeout_h)
+      end
+
       def self.api_resource
         "monitor"
       end
@@ -372,6 +394,11 @@ module Kennel
         else # do nothing
         end
       end
+
+      def query_window_minutes
+        return unless (match = query.match(/^\s*\w+\(last_(?<count>\d+)(?<unit>[mhdw])\):/))
+        Integer(match["count"]) * MINUTES_PER_UNIT.fetch(match["unit"])
+      end
     end
   end
 end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-20 00:00:00.000000000 Z
+date: 2026-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs