kennel 1.113.0 → 1.113.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b199d98b445f146f6e5ac3a2746d715c4286a75da4ddd9cf2268875e41a4f7f4
-  data.tar.gz: cc748229520b855819210413905525b962b7ea21ff13053258a011f59abaf001
+  metadata.gz: 1820e573733a40ccb56114ecc6c94f8d7732feb10d556f3bf1107c9d21fab7f0
+  data.tar.gz: ed5230938e75e643c71b719f6ec4e3e317e9e94d9fb1a2848bbbe881eea56f4e
 SHA512:
-  metadata.gz: a26a733f32e1b0c167d950d4da1c8deb69717306e6428636e2b5ab03b450eb6db6f6797eb3a054a66083b91d351a6ca875703255cea2adec62f6022452d1e90c
-  data.tar.gz: cedb46594f03b8e2ebf89915f4bd8945f0378b51808e36460b5af8c7b44266e1661de771acb6febaffa2ca1226b88a533fccbea870e47e025b30677b7f91f5a4
+  metadata.gz: beb8e6d2a60fd3c8ebe26cdd14ca70d89b9a107ee0a831cea52601464b7c13afe058f25eaee76add474e728f404d4c56216eea24e5ce4c5a5b58897da1e43af0
+  data.tar.gz: 8000438dd34c1e22334283f2e3892379cc08fadeb6085d74ecd41a3b32fdc0aacb28b9a2019d6bdad7a48bcea94084200f69d8c814054fe928aedf16b06b7ea2

data/lib/kennel/models/monitor.rb

@@ -131,12 +131,15 @@ module Kennel
           as_json[:query] = as_json[:query].gsub(/%{(.*?)}/) do
             resolve($1, type, id_map, **args) || $&
           end
+        else # do nothing
         end
       end
 
       def validate_update!(_actuals, diffs)
-        if bad_diff = diffs.find { |diff| diff[1] == "type" }
-          invalid! "Datadog does not allow update of #{bad_diff[1]} (#{bad_diff[2].inspect} -> #{bad_diff[3].inspect})"
+        # ensure type does not change, but not if it's metric->query which is supported and used by importer.rb
+        _, path, from, to = diffs.detect { |_, path, _, _| path == "type" }
+        if path && !(from == "metric alert" && to == "query alert")
+          invalid! "Datadog does not allow update of #{path} (#{from.inspect} -> #{to.inspect})"
         end
       end
 
@@ -145,7 +148,7 @@ module Kennel
       end
 
       def self.url(id)
-        Utils.path_to_url "/monitors##{id}/edit"
+        Utils.path_to_url "/monitors/#{id}/edit"
       end
 
       def self.parse_url(url)
@@ -208,6 +211,10 @@ module Kennel
       def validate_json(data)
         super
 
+        if data[:name]&.start_with?(" ")
+          invalid! "name cannot start with a space"
+        end
+
         type = data.fetch(:type)
 
         # do not allow deprecated type that will be coverted by datadog and then produce a diff
@@ -238,6 +245,10 @@ module Kennel
         unless ALLOWED_PRIORITY_CLASSES.include?(priority.class)
           invalid! "priority needs to be an Integer"
         end
+
+        if data.dig(:options, :timeout_h)&.> 24
+          invalid! "timeout_h must be <= 24"
+        end
       end
 
       # verify is_match/is_exact_match and {{foo.name}} uses available variables

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -108,7 +108,7 @@ module Kennel
           known = []
           filter = project_filter
 
-          parts = Models::Project.recursive_subclasses.flat_map do |project_class|
+          parts = Utils.parallel(Models::Project.recursive_subclasses) do |project_class|
             project = project_class.new
             kennel_id = project.kennel_id
             if filter
@@ -116,7 +116,7 @@ module Kennel
               next [] unless filter.include?(kennel_id)
             end
             project.validated_parts
-          end
+          end.flatten(1)
 
           if filter && parts.empty?
             raise "#{filter.join(", ")} does not match any projects, try any of these:\n#{known.uniq.sort.join("\n")}"
@@ -131,7 +131,6 @@ module Kennel
           end
 
           # trigger json caching here so it counts into generating
-          # somehow threading helps reduce this ~25%
           Utils.parallel(parts, &:as_json)
 
           parts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.113.0
+  version: 1.113.3
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday