kennel 1.37.3 → 1.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebcab578e988e97aa6d53ad570f6b8be214adb64f844d3afd6c5273c4382acfc
-  data.tar.gz: f4467892f25a81d61ea87cddadf3aba60fc7539f6257885d3505907f23b4c31d
+  metadata.gz: da1d24aacbf462111912acfad39aed333b157db6bcc43bcd21f7edea8b5edf29
+  data.tar.gz: 4cefae45ad88fae1359711da380810c8a4353bd50c00a3d7f3fa7743596a56f7
 SHA512:
-  metadata.gz: e3d90b3142907d5206379ab0826f40d36e7afdca45fe624ac5e13376da899951664a51948a48754d0dfb8325aa4ed0e8ee0cb050a92f716fecb7f5afe3b34360
-  data.tar.gz: 4175e0c4c7846d263ba47c09e1f730cc4376f5d6bb75084df88928ec33ada8d5a00248a2a41278271d942f174d14bdd4966831a0edb18222904e02cbb99a102e
+  metadata.gz: 2ecfa0e9f8029cafcfff445ce1d8c90a7e04052b220fac668f4db2ac6c3b6840da4621a81995a9a1f1e3bbaa2478b48808f6fda8f57d10c778ba806eb41e2e35
+  data.tar.gz: f89fb05b7415a4e796df9edfc73f484ddbefa6cb3646c0dcf44948dd29c31732c847fc17e311a2c6d9c36cca2c65fb7264dc8fa7a98a5ed73dff921d78d7536d

data/lib/kennel/importer.rb

@@ -47,6 +47,11 @@ module Kennel
         end
       end
 
+      # simplify template_variables to array of string when possible
+      if vars = data[:template_variables]
+        vars.map! { |v| v[:default] == "*" && v[:prefix] == v[:name] ? v[:name] : v }
+      end
+
       pretty = pretty_print(data).lstrip.gsub("\\#", "#")
       <<~RUBY
         #{model.name}.new(
@@ -68,6 +73,7 @@ module Kennel
             pretty = JSON.pretty_generate(v)
               .gsub(": null", ": nil")
               .gsub(/(^\s*)"([a-zA-Z][a-zA-Z\d_]*)":/, "\\1\\2:") # "foo": 1 -> foo: 1
+              .gsub(/: \[\n\s+\]/, ": []") # empty arrays on a single line
               .gsub(/^/, "    ") # indent
 
             "\n#{pretty}\n  "

data/lib/kennel/models/dash.rb

@@ -77,7 +77,7 @@ module Kennel
         # check for bad variables
         # TODO: do the same check for apm_query and their group_by
         variables = (data[:template_variables] || []).map { |v| "$#{v.fetch(:name)}" }
-        queries = data[:graphs].flat_map { |g| g[:definition][:requests].map { |r| r[:q] }.compact }
+        queries = data[:graphs].flat_map { |g| (g[:definition][:requests] || []).map { |r| r[:q] }.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(", ")}"

data/lib/kennel/version.rb

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

metadata

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