kennel 1.84.0 → 1.86.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a509311992fd458bbe488f6959406fce4316725cf9b64e7211d981203a06ef3e
-  data.tar.gz: 393aa26717f935a15ec54ed1148e006d3f473e0358d9d46360a8a68e3e06aec8
+  metadata.gz: 407f7b02a00450c157052f267383507869dc029a97a9f2cadd7b812f282e218c
+  data.tar.gz: b8b3c8b9a9126295d8822d741effd2aed43617d4a5dee6984f99b4b3ed678492
 SHA512:
-  metadata.gz: 6ebf327e582af669842e318571f789de67fea7d2ac0635c50fe472b8032262145feda60ca7df263fe88288c3c9eb35479d0b63cab35988fdda2188a12be5d56a
-  data.tar.gz: 65d0177abfb5c8af812c66957201efad2f29efcbfa9c40f9335515d01a475a0153ef7fd90d192f89c6adcfe528789a6c96c3a8c6b2b972cc554b2befd12db072
+  metadata.gz: 8a1d583dd09886baed89dc44bfa1dc90f1021dd3b2621c676b29b04dc8641a1ae63cd0efd1e9e05c4bfabfcfaeeaf51d9132f97c61703c3df6d5bc31b2bffdfb
+  data.tar.gz: 6a9bd44540113a5c481eb5d17a31173018694a02abecd635519cba61415783af519f83ebf449a3e935b2fd227972b75e1c6792e2d3589a31c513bd97b3f10bb9

data/lib/kennel/importer.rb

@@ -60,6 +60,9 @@ module Kennel
           query.sub!(/([><=]) (#{Regexp.escape(critical.to_f.to_s)}|#{Regexp.escape(critical.to_i.to_s)})$/, "\\1 \#{critical}")
         end
 
+        # using float in query is not allowed, so convert here
+        data[:critical] = data[:critical].to_i if data[:type] == "event alert"
+
         data[:type] = "query alert" if data[:type] == "metric alert"
       when "dashboard"
         widgets = data[:widgets]&.flat_map { |widget| widget.dig(:definition, :widgets) || [widget] }

data/lib/kennel/models/dashboard.rb

@@ -5,7 +5,6 @@ module Kennel
       include TemplateVariables
       include OptionalValidations
 
-      DASHBOARD_DEFAULTS = { template_variables: [] }.freeze
       READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [
         :author_handle, :author_name, :modified_at, :url, :is_read_only, :notify_list
       ]
@@ -22,13 +21,14 @@ module Kennel
         template_variable_presets: nil
       }.freeze
 
-      settings :title, :description, :definitions, :widgets, :layout_type, :template_variable_presets
+      settings :title, :description, :definitions, :widgets, :layout_type, :template_variable_presets, :reflow_type
 
       defaults(
         description: -> { "" },
         definitions: -> { [] },
         widgets: -> { [] },
         template_variable_presets: -> { DEFAULTS.fetch(:template_variable_presets) },
+        reflow_type: -> { layout_type == "ordered" ? "auto" : nil },
         id: -> { nil }
       )
 
@@ -41,6 +41,7 @@ module Kennel
           super
 
           ignore_default(expected, actual, DEFAULTS)
+          ignore_default(expected, actual, reflow_type: "auto") if expected[:layout_type] == "ordered"
 
           widgets_pairs(expected, actual).each do |pair|
             # conditional_formats ordering is randomly changed by datadog, compare a stable ordering
@@ -116,6 +117,8 @@ module Kennel
           widgets: all_widgets
         }
 
+        @json[:reflow_type] = reflow_type if reflow_type # setting nil breaks create with "ordered"
+
         @json[:id] = id if id
 
         validate_json(@json) if validate

data/lib/kennel/tasks.rb

@@ -158,7 +158,9 @@ namespace :kennel do
     found.each do |resource|
       if ENV["URLS"]
         parsed = JSON.parse(resource)
-        Kennel.out.puts models[parsed.fetch("api_resource")].url(parsed.fetch("id"))
+        url = models[parsed.fetch("api_resource")].url(parsed.fetch("id"))
+        title = parsed["title"] || parsed["name"]
+        Kennel.out.puts "#{url} # #{title}"
       else
         Kennel.out.puts resource
       end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.84.0
+  version: 1.86.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -94,14 +94,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: Keep datadog monitors/dashboards/etc in version control, avoid chaotic management