kennel 1.71.0 → 1.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7632d0aefebe72da3129a6d0a67e73500352862b090f7fef7a8dc6b24aeaa6af
-  data.tar.gz: 6c6d8170140c0d707a925861efa6246e136b114a8a0c9ca5ad6b4e30e1d4504a
+  metadata.gz: d99d149867f4ae8fefb711537a756a1d450ae396f5ac371b48f7db555b81d880
+  data.tar.gz: 6faa7915de915d57051a3722ba76eef833e464340dd14e211aedd6075ef13a9a
 SHA512:
-  metadata.gz: f215fabaaee748bd6d2a2df5b765f30875b25400c8ef62ffda2531acf042246acde524c33c7aab8f8bb2eb43fa1b109a8370fc18b959a91ec84f3f18e57de959
-  data.tar.gz: 62a3efb2c67ed3f411ac60e2398be09fcff859c58e162883671cf149113df2d3faba01126d088255587a028a9294036ddfe4fb40bb7637d41e35cfcaff5f717e
+  metadata.gz: aa4907af5eb82756b646cd4e89f6ff6b69832c6cd7ce20ceb18d2cf9da57913866c5237293916e6299baaa35a84254d941cf2dbd7a89ca7e2364f06b6b7e197f
+  data.tar.gz: f8beb5d100df9b205d7759e8f338fb5d01a267f5f22ab312f0793085aff78c0b1e51546cde2555f1f2cda34c62978ba0e60953ac21a87461411892cd52674806

data/lib/kennel/models/dashboard.rb

@@ -13,15 +13,23 @@ module Kennel
       REQUEST_DEFAULTS = {
         style: { line_width: "normal", palette: "dog_classic", line_type: "solid" }
       }.freeze
-      TIMESERIES_DEFAULTS = { show_legend: false, legend_size: "0" }.freeze
+      WIDGET_DEFAULTS = {
+        "timeseries" => { show_legend: false, legend_size: "0" },
+        "note" => { background_color: "white", font_size: "14", show_tick: false, tick_edge: "left", tick_pos: "50%", text_align: "left" }
+      }.freeze
       SUPPORTED_DEFINITION_OPTIONS = [:events, :markers, :precision].freeze
 
-      settings :title, :description, :definitions, :widgets, :layout_type
+      DEFAULTS = {
+        template_variable_presets: nil
+      }.freeze
+
+      settings :title, :description, :definitions, :widgets, :layout_type, :template_variable_presets
 
       defaults(
         description: -> { "" },
         definitions: -> { [] },
         widgets: -> { [] },
+        template_variable_presets: -> { DEFAULTS.fetch(:template_variable_presets) },
         id: -> { nil }
       )
 
@@ -33,6 +41,8 @@ module Kennel
         def normalize(expected, actual)
           super
 
+          ignore_default(expected, actual, DEFAULTS)
+
           widgets_pairs(expected, actual).each do |pair|
             # conditional_formats ordering is randomly changed by datadog, compare a stable ordering
             pair.each do |widgets|
@@ -43,7 +53,7 @@ module Kennel
               end
             end
 
-            ignore_definition_defaults_for_type pair, "timeseries", TIMESERIES_DEFAULTS
+            ignore_widget_defaults pair
 
             ignore_request_defaults(*pair)
 
@@ -54,11 +64,12 @@ module Kennel
 
         private
 
-        def ignore_definition_defaults_for_type(pair, type, defaults)
+        def ignore_widget_defaults(pair)
           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
+            types = pair.map { |w| w.dig(i, :definition, :type) }.uniq
+            next unless types.size == 1
+            next unless defaults = WIDGET_DEFAULTS[types.first]
+            ignore_defaults(pair[0], pair[1], defaults, nesting: :definition)
           end
         end
 
@@ -102,6 +113,7 @@ module Kennel
           title: "#{title}#{LOCK}",
           description: description,
           template_variables: render_template_variables,
+          template_variable_presets: template_variable_presets,
           widgets: all_widgets
         }
 
@@ -167,6 +179,10 @@ module Kennel
         super
 
         validate_template_variables data, :widgets
+
+        # Avoid diff from datadog presets sorting.
+        presets = data[:template_variable_presets]
+        invalid! "template_variable_presets must be sorted by name" if presets && presets != presets.sort_by { |p| p[:name] }
       end
 
       def render_definitions

data/lib/kennel/models/monitor.rb

@@ -202,7 +202,7 @@ module Kennel
           # verify is_match uses available variables
           message = data.fetch(:message)
           used = message.scan(/{{\s*#is_match\s*"([a-zA-Z\d_.-]+).name"/).flatten.uniq
-          allowed = data.fetch(:query)[/by\s*{([^\}]+)}/, 1].to_s.split(/\s*,\s*/)
+          allowed = data.fetch(:query)[/by\s*[\({]([^\}\)]+)[}\)]/, 1].to_s.gsub(/["']/, "").split(/\s*,\s*/)
           unsupported = used - allowed
           if unsupported.any?
             invalid! "is_match used with #{unsupported}, but metric is only grouped by #{allowed}"

data/lib/kennel/syncer.rb

@@ -228,7 +228,7 @@ module Kennel
       json = e.as_json
       field = tracking_field(json)
       value = json[field]
-      json[field] = value.dup.sub!(/\n-- Managed by kennel .*/, "") || raise("did not find tracking id in #{value}")
+      json[field] = value.dup.sub!(/\n?-- Managed by kennel .*/, "") || raise("did not find tracking id in #{value}")
     end
 
     def tracking_id(a)

data/lib/kennel/utils.rb

@@ -19,6 +19,7 @@ module Kennel
           .gsub(/::/, "_") # Foo::Bar -> foo_bar
           .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2') # FOOBar -> foo_bar
           .gsub(/([a-z\d])([A-Z])/, '\1_\2') # fooBar -> foo_bar
+          .tr("-", "_") # foo-bar -> foo_bar
           .downcase
       end
 

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.71.0
+  version: 1.73.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday