kennel 2.21.1 → 2.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9487ffad47b72d1a4e4781239ef3fbd500f806e5d63590c03326d7c6b689529e
-  data.tar.gz: ec5258bd90e47766deb06f71ab8041b3009f6242279a7d9d9bdede0d36da67ec
+  metadata.gz: 21600f7f1ed4c550d106f75619a29a57cf2c6631c95a04b332f2d1a808fc94be
+  data.tar.gz: e366f291cf986a51e7841a70641854fe3090ed39b8616b4acc6b80fc030dcf33
 SHA512:
-  metadata.gz: 2a02de737a11b72651a05c4fbf5bd6e8180cffb95f9d398696e70ee8c8a8c0217e264892582f842a22c9c73ab1f559035c23e1e8da0f74c14680bcf9757c0c63
-  data.tar.gz: 7a2ad8b0f2561a624d410453c601da3c39184625c0565ba5d78a51689bcde28a5a623e3791ee316f7cc3d4141f0d5482735f643ad46c60364f7122ae8e2e5adf
+  metadata.gz: cb9953eb8430131345f3b21ef6cec57ece7248114439a2d5c6bbe22ca522b72350077ff927f8521f51a97695827f8dc1b91cf1809b0c0e05d7dab486643465c7
+  data.tar.gz: dca2a03ad0132035f34d331daf622ed41c281e993037212b8d7894fbdcdd6442dcc7fe62bc2ca9f125ef816027f70d94422a1e06bda60e42743309e8a787958c

data/lib/kennel/api.rb

@@ -55,6 +55,8 @@ module Kennel
     end
 
     def update(api_resource, id, attributes)
+      restore_widget_ids(id, attributes) if api_resource == "dashboard"
+
       response = request :put, "/api/v1/#{api_resource}/#{id}", body: attributes
       response[:id] = response.delete(:public_id) if api_resource == "synthetics/tests"
       self.class.with_tracking(api_resource, response)
@@ -86,6 +88,33 @@ module Kennel
 
     private
 
+    # keep widget ids stable so stored dashboard urls that point at a widget do not break on every update
+    # widget ids are dropped when diffing since they change on every update, but that also changes them in datadog
+    # and breaks stored urls that point at a specific widget, so restore the previous ids by matching widget titles
+    def restore_widget_ids(id, attributes)
+      return unless (widgets = attributes[:widgets])
+      return unless (current = show("dashboard", id, {}, ignore_404: true))
+
+      ids = {}
+      each_widget_with_key(current[:widgets]) { |key, widget| ids[key] = widget[:id] }
+      each_widget_with_key(widgets) do |key, widget|
+        next unless (id = ids[key])
+        widget[:id] ||= id # do not set nil, that breaks updates
+      end
+    end
+
+    # yield each widget with a key built from its (optional) group title and its own title
+    def each_widget_with_key(widgets, prefix: nil, &block)
+      widgets.each do |widget|
+        title = widget.dig(:definition, :title)
+        key = [prefix, title].compact.join("-")
+        yield key, widget
+        if (nested = widget.dig(:definition, :widgets))
+          each_widget_with_key(nested, prefix: title, &block)
+        end
+      end
+    end
+
     def with_pagination(enabled, params)
       return yield params unless enabled
       raise ArgumentError if params[:limit] || params[:offset]

data/lib/kennel/models/monitor.rb

@@ -352,6 +352,10 @@ module Kennel
         if data.dig(:options, :timeout_h)&.> 24
           invalid! :invalid_timeout_h, "timeout_h must be <= 24"
         end
+
+        if type == "composite" && data.dig(:options, :new_group_delay)
+          invalid! :composite_new_group_delay, "new_group_delay is not supported for composite monitors"
+        end
       end
 
       # verify is_match/is_exact_match and {{foo.name}} uses available variables

data/lib/kennel/models/slo.rb

@@ -48,7 +48,9 @@ module Kennel
           threshold =
             thresholds.detect { |t| t[:timeframe] == p } ||
             raise(ArgumentError, "#{tracking_id} unable to find threshold with timeframe #{p}")
-          data[:warning_threshold] = threshold[:warning]
+          if (value = threshold[:warning]) # only set if needed to avoid permanent diff
+            data[:warning_threshold] = value
+          end
           data[:target_threshold] = threshold[:target]
         end
 

data/lib/kennel/version.rb

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

metadata

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