kennel 1.59.2 → 1.61.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da2bef045b7b3b70aaf46ddf1254d31ea43fb0821276a05d08ffe1027d7dcd60
-  data.tar.gz: ccdcb485de98385ecb58d2aa379550de5c44054b822232b36a678f034593629d
+  metadata.gz: dd27c1efc9afa4ba43482978f3be42ae2ff6301b1532ae3461c043d503fc82c3
+  data.tar.gz: cc6209799a8b73dd0aca242e8f9a29a8693a2701c888ca3487f8dea0dfb9d100
 SHA512:
-  metadata.gz: 2e4132e556b0eb1a1bf4aaa0a3b7913a1e70f790be3b3226238e6d9d9e2771544b96d665ee668841fd7fa640ac22abd3b2467b91be6d70ca167d01e2af0bd426
-  data.tar.gz: fda2c3268e6420c106ded560ca5fb59dc97fe783e385d2295588e2cabc3b367f0e1375a48355dbfd4968e19743ebcce60136bd2ba9dc483c7024326abee12828
+  metadata.gz: 28398d5ef02978e71c877edd65a4eb6a462ff1886df46d0bfabac621d640eb67f876d73dacfd52ef2c906c8715de006a7fc9e60d6663f4323f28fcd948cf4f36
+  data.tar.gz: 49581fac6bd3c3112f0d13cae7465580af642a78135f5b49c4e053d27bd66138b9e88b090912a96e943428903c7bcd8e07960c6beb2b406ecc795a69f4348775

data/lib/kennel/api.rb

@@ -27,7 +27,9 @@ module Kennel
           offset += limit
         end
       else
-        request :get, "/api/v1/#{api_resource}", params: params
+        result = request :get, "/api/v1/#{api_resource}", params: params
+        result = result.fetch(:dashboards) if api_resource == "dashboard"
+        result
       end
     end
 

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|

data/lib/kennel/syncer.rb

@@ -38,7 +38,6 @@ module Kennel
     def update
       @create.each do |_, e|
         reply = @api.create e.class.api_resource, e.as_json
-        reply = unnest(e.class.api_resource, reply)
         Kennel.out.puts "Created #{e.class.api_resource} #{tracking_id(e.as_json)} #{e.url(reply.fetch(:id))}"
       end
 
@@ -101,21 +100,16 @@ module Kennel
       end
     end
 
-    # Hack to get diff to work until we can mass-fetch definitions
+    # Make diff work even though we cannot mass-fetch definitions
     def fill_details(a, cache)
       resource = a.fetch(:api_resource)
       args = [resource, a.fetch(:id)]
       full = cache.fetch(args, a[:modified] || a.fetch(:modified_at)) do
-        unnest(resource, @api.show(*args))
+        @api.show(*args)
       end
       a.merge!(full)
     end
 
-    # dashes are nested, others are not
-    def unnest(api_resource, result)
-      result[api_resource.to_sym] || result[:data] || result
-    end
-
     def details_cache(&block)
       cache = FileCache.new CACHE_FILE, Kennel::VERSION
       cache.open(&block)

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.59.2"
+  VERSION = "1.61.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.59.2
+  version: 1.61.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2019-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday