kennel 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 203db588fb0b4a3297898e2e86fc2905ffcdb787b653a95b7a4c4ed81bfed6c2
-  data.tar.gz: '082e2d0d9e73c6753ecdae3fa2d81c0938afb0884ac82ebd1a6365d2a4166f42'
+  metadata.gz: 855385c4552df559fad87161c013597c2a1233f60b51a80af7ea0b40d9af1bf5
+  data.tar.gz: bc5318c6d20511940b66ec5c8c08bc9dd2d1cb37e2d06a16880837d5d3f0cc66
 SHA512:
-  metadata.gz: 582eb3d3391750263d0fb595778a72f17e626bee11c720b7ee13303be7f197e03a0bd1d0e5b93ab2dbb48074017f460518ba58278131a5136a77ecf4ec72f157
-  data.tar.gz: d2dfbfd993fc9b44349f88a095967eaa8ae299b7ccd6498e8c5488947477845faecbea82a25c5cd797d38be1af88ad48d8b8faa28ee8b3df962d18045480fbcf
+  metadata.gz: 583eacc7338bbb5eb92b19fcb20fd376557bec576dadeff9ae60815156726ffe6a13ee1049bb26ca386273998318ec7b5ce635e7aca4c986aaa4b2cf752aaff3
+  data.tar.gz: 9ed70fd2932133cc52b7c6d8329ce20c66b5fda1405704fb475b5f4229e41a0d2236fa505bd9a94693b444f5e5df47cc5a9ae6047222f03df22437ca3513e7fa

data/lib/kennel/models/dash.rb

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

@@ -88,14 +88,26 @@ module Kennel
         end
       end
 
-      def parallel(items)
-        items.map do |item|
+      def parallel(items, max: 10)
+        threads = [items.size, max].min
+        work = items.each_with_index.to_a
+        done = Array.new(items.size)
+        workers = Array.new(threads).map do
           Thread.new do
-            yield item
-          rescue StandardError => e
-            e
+            loop do
+              item, i = work.pop
+              break unless i
+              done[i] =
+                begin
+                  yield item
+                rescue StandardError => e
+                  e
+                end
+            end
           end
-        end.map(&:value).each { |i| raise i if i.is_a?(StandardError) }
+        end
+        workers.each(&:join)
+        done.each { |d| raise d if d.is_a?(StandardError) }
       end
 
       def natural_order(name)

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday