kennel 1.84.1 → 1.86.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69237d514f39fc9c8a1fad937bb038ce526424231fe4cc64ce3e69ac43820650
-  data.tar.gz: 7bf30b567652a4f6808073ff46487c7945570a6bb4c34afe60b60ad14bb30f80
+  metadata.gz: e2531f5f8a3ef6c978e2aeeec1db0a16f56aebe690ef6eae8baefff34c3c53fe
+  data.tar.gz: d650a926e7d730f34e3dc90833f04f693161ad6aa112fd8ffdbca88f37d37497
 SHA512:
-  metadata.gz: 3cffb601fc240f3d6f87e41a369a772a0dce2c3de411d8eb290aa67ca89c30fbdde7d05c701e844cf12a92c398438c975175de2739129ad62d85f7c9eb667c30
-  data.tar.gz: 9bf61895741f6b762627f05a756355445fdd43bc488db04ae7a406a2fbc314311adf8e745ec87d4eb512cefd250d0cd3e6b777f3bb3d7cb7543e0cd6eb317ea1
+  metadata.gz: 12c01b65de8be29754e78b8caa6d8d8cc3f8c8089928008917a31121d3641161eb8b519aedfd7f5a643ff9f4f1123579e8bc6e07382e26613b5dd9937f6f6c16
+  data.tar.gz: 421e6d81e4ea91f0eb152ba5230026334221e452f5dea8a4e040d5b8285db8f0913443357b128f5c00e917557ace751f264a55568e50ee86a8e304fb1f9f188e

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/models/slo.rb

@@ -63,7 +63,7 @@ module Kennel
       end
 
       def self.parse_url(url)
-        url[/\/slo\?.*slo_id=([a-z\d]+)/, 1]
+        url[/\/slo(\?.*slo_id=|\/edit\/)([a-z\d]{10,})/, 2]
       end
 
       def resolve_linked_tracking_ids!(id_map, **args)

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.84.1
+  version: 1.86.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-04-21 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