kennel 1.83.0 → 1.85.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c3c766383bf7f533e74b935a6faf2272e552bb7c974fa15261c70aa9d31e800
-  data.tar.gz: 339c1dcad92fc215d2a26b7091bbe57dc98d3f6ed5a01666e1ee683162bf20e0
+  metadata.gz: 80ab3a8fb786a4b556aa1318d3b1ab758a9b7d33e786023c02550ee004abd6e8
+  data.tar.gz: 0e5896d464686e750a3973feff199f25030cea119c7ccb03ddc9820a359f0c74
 SHA512:
-  metadata.gz: 97abfc77652ab1afb6192c97f038dc6caa33a2f8aa505c62c6782fef1359b431d93cf293c737d9f2ed03c9bb4d22d0474ac916586aa7ed15863900dc8eb1791d
-  data.tar.gz: 13e247e4ab000410155b9f4835686168a2017c1ee2fd8b4e0f6619c54f0b055581b1acc855d12ac06b0ed3920782722fbffa1d303ea7aa04ed92104ab1ec6908
+  metadata.gz: a5df094d658262ddb50a40234be1f371ebd9120ed66a0a625d68a7ec8debde55980ccc8e2c64e84afbdc16160228700c8361108b526f54ca68403e12318f8a19
+  data.tar.gz: cb924336b3e9caac886fbc60ffc0301500a6dd59f9af53c42d1c7ac13ad5891765165b28fa7da36751da64491ca8e5070e1e1ce047830e8cb3b78363e9e2da4d

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/monitor.rb

@@ -5,8 +5,6 @@ module Kennel
       include OptionalValidations
 
       RENOTIFY_INTERVALS = [0, 10, 20, 30, 40, 50, 60, 90, 120, 180, 240, 300, 360, 720, 1440].freeze # minutes
-      # 2d and 1w are valid timeframes for anomaly monitors
-      QUERY_INTERVALS = ["1m", "5m", "10m", "15m", "30m", "1h", "2h", "4h", "1d", "2d", "1w"].freeze
       OPTIONAL_SERVICE_CHECK_THRESHOLDS = [:ok, :warning].freeze
       READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [
         :multi, :matching_downtimes, :overall_state_modified, :overall_state, :restricted_roles
@@ -202,14 +200,6 @@ module Kennel
           invalid! "renotify_interval must be one of #{RENOTIFY_INTERVALS.join(", ")}"
         end
 
-        if type == "query alert"
-          # verify interval is valid
-          interval = data.fetch(:query)[/\(last_(\S+?)\)/, 1]
-          if interval && !QUERY_INTERVALS.include?(interval)
-            invalid! "query interval was #{interval}, but must be one of #{QUERY_INTERVALS.join(", ")}"
-          end
-        end
-
         if ["query alert", "service check"].include?(type) # TODO: most likely more types need this
           # verify is_match/is_exact_match uses available variables
           message = data.fetch(:message)

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.83.0"
+  VERSION = "1.85.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.83.0
+  version: 1.85.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday