kennel 1.46.0 → 1.46.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0345bfa7af804761dd1d2df81a606bd24b1ab05e7c7f72959afd8f8b8e5d2e0e
-  data.tar.gz: dac973533cfbba5832ea9652851a064c5a33d93448bc90cee7320f2b05ed48a5
+  metadata.gz: e553a58a0234a8f08b53c9a00003df0fb4473f6de8b784a398bfd6dde56af721
+  data.tar.gz: 37e35dcd8c26bc0581316218bb269f78a33c451bb7c7183decc8983e07c4ada6
 SHA512:
-  metadata.gz: 01c84946f4f1b68e6aac8d6e22bd69eddf19b40545ab0983cce694f0ec7041829040c5391f1ebd1f6fb325f1336fb7ae4ac9d66a53ae1a1040f3cf3ec75ebf8b
-  data.tar.gz: c538f57f4795f388e389193a7f4c006241985f314ce2cc2e3cd6907b03c70a7293c1df1843669bc5c22f2d12eba584f7ee77d5abe4bca6c11a634c558dad80bf
+  metadata.gz: 59acd5f9e89c4fb361f123eb3c335506a5504568230da791213700c2db1e943e58fecb82b89654f1dce9cc4cfbe6c0e1d45e9203f65c4f333105b2be9858ba8f
+  data.tar.gz: 724611c9c2854ea9f8eef7842dbee85340b2d784e51820ccacfb5b589b24418f2c6a2a41abb68dd02d5ecd9c15e9bd17681b110baafd717f3885a6604d71e33d

data/Readme.md

@@ -54,7 +54,7 @@ module Teams
   class MyTeam < Kennel::Models::Team
     defaults(
       slack: -> { "my-alerts" },
-      email: -> { "my-team@exmaple.com" }
+      email: -> { "my-team@example.com" }
     )
   end
 end

data/lib/kennel/tasks.rb

@@ -50,7 +50,7 @@ namespace :kennel do
     Kennel::UnmutedAlerts.print(Kennel.send(:api), tag)
   end
 
-  desc "Covert existing resources to copy-pastable definitions to import existing resources RESOURCE=dash ID=1234"
+  desc "Convert existing resources to copy-pastable definitions to import existing resources RESOURCE=dash ID=1234"
   task import: :environment do
     resource = ENV["RESOURCE"] || abort("Call with RESOURCE=dash") # TODO: add others
     id = ENV["ID"] || abort("Call with ID=1234")

data/lib/kennel/template_variables.rb

@@ -18,16 +18,18 @@ module Kennel
     # TODO: do the same check for apm_query and their group_by
     def validate_template_variables(data, key)
       variables = (data[:template_variables] || []).map { |v| "$#{v.fetch(:name)}" }
-      queries = data[key].flat_map do |g|
-        requests =
-          (g.dig(:definition, :requests) || []) +
-          (g.dig(:definition, :widgets) || []).flat_map { |w| w.dig(:definition, :requests) || [] }
-        requests.map { |r| r[:q] }
+      queries = data[key].flat_map do |widget|
+        ([widget] + (widget.dig(:definition, :widgets) || [])).flat_map { |w| widget_queries(w) }
       end.compact
       bad = queries.grep_v(/(#{variables.map { |v| Regexp.escape(v) }.join("|")})\b/)
       if bad.any?
         invalid! "queries #{bad.join(", ")} must use the template variables #{variables.join(", ")}"
       end
     end
+
+    def widget_queries(widget)
+      requests = widget.dig(:definition, :requests) || []
+      (requests.is_a?(Hash) ? requests.values : requests).map { |r| r[:q] } # hostmap widgets have hash requests
+    end
   end
 end

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -36,7 +36,7 @@ module Teams
   class MyTeam < Kennel::Models::Team
     defaults(
       slack: -> { "my-alerts" },
-      email: -> { "my-team@exmaple.com" }
+      email: -> { "my-team@example.com" }
     )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.46.0
+  version: 1.46.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday