kennel 1.60.0 → 1.61.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6b4a0efd1cc9562ad3fe039254ba48b197a392556105b3d56f66985105a8806
-  data.tar.gz: 8277eccfa9f48eec9ee8fe6dcf516fd4ad1e36c5760ec850dc4d60d71714ddcd
+  metadata.gz: 4fee65e3dbf0bb1646062d6a308050c4a92bcc7e65148e72d1ae3b58a9f3671c
+  data.tar.gz: 566a1a1f668a99ff129f3fb51f3e29d1803e95310cc56892bc1b81b5c2d06de7
 SHA512:
-  metadata.gz: 405531a24f9f801592c687f4f2a2ca448785b8907e549eafde3d7ea02935db63aa010d955d0f0d86d50f75ae1f42344fcf5c7904500e5e6d049ba9cbb1b6483a
-  data.tar.gz: 6c1d454d24dd9b0fc313e0a208a52c2a8efc77258171aefc4df8a115beca66d681925095a4f4ac544792452d7e2e5c09557350a72f467cc38fcbfbceb699350d
+  metadata.gz: 2fbdb4dbd6f2446dd2644e4583bf3f85f1e19e3d1d50258e8865a286f1fda26039def220d433d9af3d130bee8ad39e2d31e1258ca68f876804ab70c28784e005
+  data.tar.gz: 1168eab35eb98e39db85910d1c1d83c436cfb0cb5b574beb61fafa0c429040570d5baa8d3a5e846a35834d5df6ee600d6a130104f5863213f284b94dd05e777f

data/lib/kennel/models/dashboard.rb

@@ -13,6 +13,7 @@ module Kennel
       REQUEST_DEFAULTS = {
         style: { line_width: "normal", palette: "dog_classic", line_type: "solid" }
       }.freeze
+      TIMESERIES_DEFAULTS = { show_legend: false, legend_size: "0" }.freeze
       SUPPORTED_DEFINITION_OPTIONS = [:events, :markers, :precision].freeze
 
       settings :title, :description, :definitions, :widgets, :layout_type
@@ -32,39 +33,68 @@ module Kennel
         def normalize(expected, actual)
           super
 
-          base_pairs(expected, actual).each do |pair|
+          widgets_pairs(expected, actual).each do |pair|
             # datadog always adds 2 to slo widget height
             # need to check fir layout since some monitors have height/width in their definition
-            pair.dig(1, :widgets)&.each do |widget|
+            pair[1].each do |widget|
               if widget.dig(:definition, :type) == "slo" && widget.dig(:layout, :height)
                 widget[:layout][:height] -= 2
               end
             end
 
             # conditional_formats ordering is randomly changed by datadog, compare a stable ordering
-            pair.each do |b|
-              b[:widgets]&.each do |w|
-                if formats = w.dig(:definition, :conditional_formats)
-                  w[:definition][:conditional_formats] = formats.sort_by(&:hash)
+            pair.each do |widgets|
+              widgets.each do |widget|
+                if formats = widget.dig(:definition, :conditional_formats)
+                  widget[:definition][:conditional_formats] = formats.sort_by(&:hash)
                 end
               end
             end
 
-            ignore_request_defaults(*pair, :widgets, :definition)
-            pair.each { |dash| dash[:widgets]&.each { |w| w.delete(:id) } }
+            ignore_definition_defaults_for_type pair, "timeseries", TIMESERIES_DEFAULTS
+
+            ignore_request_defaults(*pair)
+
+            # ids are kinda random so we always discard them
+            pair.each { |widgets| widgets.each { |w| w.delete(:id) } }
           end
         end
 
         private
 
+        def ignore_definition_defaults_for_type(pair, type, defaults)
+          pair.map(&:size).max.times do |i|
+            if pair.all? { |w| w.dig(i, :definition, :type) == type }
+              ignore_defaults(pair[0], pair[1], defaults, nesting: :definition)
+            end
+          end
+        end
+
+        # discard styles/conditional_formats/aggregator if nothing would change when we applied (both are default or nil)
+        def ignore_request_defaults(expected, actual)
+          [expected.size, actual.size].max.times do |i|
+            a_r = actual.dig(i, :definition, :requests) || []
+            e_r = expected.dig(i, :definition, :requests) || []
+            ignore_defaults e_r, a_r, REQUEST_DEFAULTS
+          end
+        end
+
+        def ignore_defaults(expected, actual, defaults, nesting: nil)
+          [expected.size, actual.size].max.times do |i|
+            e = expected.dig(i, *nesting) || {}
+            a = actual.dig(i, *nesting) || {}
+            ignore_default(e, a, defaults)
+          end
+        end
+
         # expand nested widgets into expected/actual pairs for default resolution
-        # [a, e] -> [[a, e], [aw1, ew1], ...]
-        def base_pairs(*pair)
-          result = [pair]
-          slots = pair.map { |d| d[:widgets]&.size }.compact.max.to_i
+        # [a, e] -> [[a-w, e-w], [a-w1-w1, e-w1-w1], ...]
+        def widgets_pairs(*pair)
+          result = [pair.map { |d| d[:widgets] || [] }]
+          slots = result[0].map(&:size).max
           slots.times do |i|
-            nested = pair.map { |d| d.dig(:widgets, i, :definition) || {} }
-            result << nested if nested.any? { |d| d.key?(:widgets) }
+            nested = pair.map { |d| d.dig(:widgets, i, :definition, :widgets) || [] }
+            result << nested if nested.any?(&:any?)
           end
           result
         end

data/lib/kennel/models/record.rb

@@ -6,11 +6,6 @@ module Kennel
       READONLY_ATTRIBUTES = [
         :deleted, :id, :created, :created_at, :creator, :org_id, :modified, :modified_at, :api_resource
       ].freeze
-      REQUEST_DEFAULTS = {
-        style: { width: "normal", palette: "dog_classic", type: "solid" },
-        conditional_formats: [],
-        aggregator: "avg"
-      }.freeze
       API_LIST_INCOMPLETE = false
 
       settings :id, :kennel_id
@@ -22,25 +17,6 @@ module Kennel
           self::READONLY_ATTRIBUTES.each { |k| actual.delete k }
         end
 
-        # discard styles/conditional_formats/aggregator if nothing would change when we applied (both are default or nil)
-        def ignore_request_defaults(expected, actual, level1, level2)
-          actual = actual[level1] || {}
-          expected = expected[level1] || {}
-          [expected.size.to_i, actual.size.to_i].max.times do |i|
-            a_r = actual.dig(i, level2, :requests) || []
-            e_r = expected.dig(i, level2, :requests) || []
-            ignore_defaults e_r, a_r, self::REQUEST_DEFAULTS
-          end
-        end
-
-        def ignore_defaults(expected, actual, defaults)
-          [expected&.size.to_i, actual&.size.to_i].max.times do |i|
-            e = expected[i] || {}
-            a = actual[i] || {}
-            ignore_default(e, a, defaults)
-          end
-        end
-
         def ignore_default(expected, actual, defaults)
           definitions = [actual, expected]
           defaults.each do |key, default|
@@ -81,16 +57,17 @@ module Kennel
       def resolve_link(id, id_map, force: false)
         found = id_map[id]
         return found if found && found != :new
+        api_resource = self.class.api_resource
 
         if found == :new
           if force
-            invalid! "Monitor #{id} will be created in the current run and can only be used after that"
+            invalid! "#{api_resource.capitalize} #{id} will be created in the current run and can only be used after that"
           else
-            Kennel.err.puts "Monitor #{id} will be created in the current run, the next run will link it properly"
+            Kennel.err.puts "#{api_resource.capitalize} #{id} will be created in the current run, the next run will link it properly"
             Kennel::MISSING_ID
           end
         else
-          invalid! "Unable to find monitor #{id} (does not exist and is not being created by the current run)"
+          invalid! "Unable to find #{api_resource} #{id} (does not exist and is not being created by the current run)"
         end
       end
 

data/lib/kennel/syncer.rb

@@ -147,7 +147,8 @@ module Kennel
     def print_plan(step, list, color)
       return if list.empty?
       list.each do |_, e, a, diff|
-        Kennel.out.puts Utils.color(color, "#{step} #{tracking_id(e&.as_json || a)}")
+        api_resource = (e ? e.class.api_resource : a.fetch(:api_resource))
+        Kennel.out.puts Utils.color(color, "#{step} #{api_resource} #{tracking_id(e&.as_json || a)}")
         print_diff(diff) if diff # only for update
       end
     end

data/lib/kennel/template_variables.rb

@@ -23,7 +23,10 @@ module Kennel
       end.compact
       bad = queries.grep_v(/(#{variables.map { |v| Regexp.escape(v) }.join("|")})\b/)
       if bad.any?
-        invalid! "queries #{bad.join(", ")} must use the template variables #{variables.join(", ")}"
+        invalid!(
+          "queries #{bad.join(", ")} must use the template variables #{variables.join(", ")}\n" \
+          "If that is not possible, add `validate: -> { false } # query foo in bar does not have baz tag`"
+        )
       end
     end
 

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.60.0
+  version: 1.61.3
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Keep datadog monitors/dashboards/etc in version control, avoid chaotic management