kennel 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88495b67d113181455cb6dc751d2f7820eababca5679cfb714bb614dc9370ad6
-  data.tar.gz: a8703613913aa4557c585e605f35a1aef9555902c65a5f1c1772b1038e9d4d34
+  metadata.gz: ef24e36c2feeba08b92edd003e6d11bfefaa31bd0839765393325b29e8132cb3
+  data.tar.gz: 54f97c79250c564d62f01837cc85badc4cdc3357860f40e0408d33640d1a94a8
 SHA512:
-  metadata.gz: d730ee50ff704f25eb39fdd8daa9c95a2c0b43f9a9534c7f1a05a245bd3881ab5ce36f12ebf226354eeafe94c4a961e843eebbbcf0312b2b548577b26a4debdd
-  data.tar.gz: ff487e51479e7a463464e37ec09a10ef7c1dc7d695bcf18f97303048ab0a75759d71eda14aa95e512aa69b66c25baf016d778be449455c0ef069e081f5957373
+  metadata.gz: '08b01acd5c750342d5134e6c2ca6d235bdb5cefc8f0b61b46e7b475ed7be6fd677772bab5a032d2a67685e02389d6741f05ef1e05a0758d3c6f6ff2fae68cb0d'
+  data.tar.gz: 79cc9956a1b1790c2e6bfb7f25c981542a2b21d96f8c3d1bdc5328d1e708c410372fa9405bf16a3fbaf7a27aaf1954ca71cb760ae4bfad82fa346b10635b0e8c

data/lib/kennel/models/monitor.rb

@@ -56,6 +56,7 @@ 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: -> { MONITOR_OPTION_DEFAULTS.fetch(:no_data_timeframe) },
         notify_audit: -> { MONITOR_OPTION_DEFAULTS.fetch(:notify_audit) },
         new_host_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:new_host_delay) },
         new_group_delay: -> { nil },
@@ -149,16 +150,25 @@ module Kennel
       # and enforce that it is not set at the same time as on_missing_data
       def configure_no_data
         notify = notify_no_data
+        timeframe = no_data_timeframe
         action = on_missing_data
+        action ||= "default" if type == "event-v2 alert"
 
-        # on_missing_data cannot be used with notify_no_data or no_data_timeframe
-        if type == "event-v2 alert" || action
-          # TODO: mark setting notify_no_data or no_data_timeframe at all as invalid
+        # TODO: mark setting action && !notify.nil? at all as invalid
+        if action && timeframe
+          invalid! :invalid_no_data_config, "set either no_data_timeframe or on_missing_data"
+        end
+        if type == "composite" && action
+          invalid! :invalid_no_data_config, "cannot use on_missing_data with composite monitor"
+        end
+
+        # on_missing_data cannot be used with notify_no_data + no_data_timeframe
+        if action
           { on_missing_data: action || "default" }
         else
           {
             notify_no_data: notify,
-            no_data_timeframe: notify ? no_data_timeframe : nil
+            no_data_timeframe: notify ? no_data_timeframe || default_no_data_timeframe : nil
           }
         end
       end
@@ -184,7 +194,7 @@ module Kennel
       # 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
+      def default_no_data_timeframe
         default = 60
         if type == "query alert" && (minutes = query_window_minutes)
           (minutes * 2).clamp(default, 24 * 60)
@@ -305,9 +315,11 @@ module Kennel
         end
 
         # verify query includes critical value
-        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"
+        if (critical = data.dig(:options, :thresholds, :critical))
+          if (query_value = data.fetch(:query)[/\s*[<>]=?\s*(\d+(\.\d+)?)\s*$/, 1])
+            if Float(query_value) != Float(critical)
+              invalid! :critical_does_not_match_query, "critical and value used in query must match"
+            end
           end
         end
 

data/lib/kennel/version.rb

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

metadata

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