kennel 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63bd43d9372d2d92f5123b896583d212f8c30902878a182765610ab0012016fc
-  data.tar.gz: 438a19088b46d37e5738702868373abba331cdf44459841bd07443724cb10416
+  metadata.gz: 3b10b16c02058b7b1ad4f44992cf5f996be952d9d38a6d17ecbae4d728c78948
+  data.tar.gz: 2ec630b10f6efc6e1ae04fa8844198105f6446cbd542c8dfdd5302c7a18de354
 SHA512:
-  metadata.gz: 766bdb5f1370bf27a0f560521df0da7c9589b904820676e81f5e4f12f9671baa4719fd0c44aac92df100db0bca59165d11acbcc6a3687c824307a62fbbf198f4
-  data.tar.gz: '07806de1603fadb136e81b5226f006e6efcdc429876b859717b48761dc64d03ed1b1a82447650efa081c114bb2940881d04b97453b69a664831d07faec8745f4'
+  metadata.gz: 1127d43e65c93542fea552a8bb682b86da4dccda055d1a3f6123d2a3d5996d5b34617c4940bf797b448f4396392e1813a937de01ad5967a60991ab62cefcc704
+  data.tar.gz: 1c5e5f78cdae0f91d6a2d7f7241bf2a8dc90c7b499bba091c9d8d27225314779550c625cb299ff0109fbfd8894ccdf527e904a3a335d0d8d4b9958f4993d2d31

data/lib/kennel/models/dash.rb

@@ -50,9 +50,11 @@ module Kennel
         actual[:template_variables] ||= []
         actual[:graphs].each do |g|
           g[:definition].delete(:status)
-          g[:definition][:requests].each { |r| r.delete(:aggregator) }
         end
-        super
+
+        # NOTE: we might not trigger an update since the api never returns aggregator ... maybe datadog fixes their api
+        # as temporary workaround change something else about the dash to force an update
+        Utils.presence(super&.reject { |op, key| op == "+" && key.end_with?(".aggregator") })
       end
 
       def url(id)
@@ -62,12 +64,20 @@ module Kennel
       private
 
       def validate_json(data)
+        # check for bad variables
         variables = data.fetch(:template_variables).map { |v| "$#{v.fetch(:name)}" }
         queries = data[:graphs].flat_map { |g| g[:definition][:requests].map { |r| r.fetch(:q) } }
         bad = queries.grep_v(/(#{variables.map { |v| Regexp.escape(v) }.join("|")})\b/)
         if bad.any?
           raise "#{tracking_id} queries #{bad.join(", ")} must use the template variables #{variables.join(", ")}"
         end
+
+        # check for fields that are unsettable
+        data[:graphs].each do |g|
+          if g.dig(:definition, :status)
+            raise "#{tracking_id} remove definition status, it is unsettable and will always produce a diff"
+          end
+        end
       end
 
       def render_template_variables

data/lib/kennel/models/screen.rb

@@ -52,7 +52,13 @@ module Kennel
         actual.delete(:height)
         actual.delete(:width)
         actual[:template_variables] ||= []
-        (actual[:widgets] || []).each { |w| w.delete :board_id }
+        (actual[:widgets] || []).each do |w|
+          # api randomly returns time.live_span or timeframe
+          w[:timeframe] = w.delete(:time)[:live_span] if w[:time]
+
+          # board_id is a copied value, can ignore
+          w.delete :board_id
+        end
         super
       end
 

data/lib/kennel/utils.rb

@@ -20,7 +20,7 @@ module Kennel
       end
 
       def presence(value)
-        value.empty? ? nil : value
+        value.nil? || value.empty? ? nil : value
       end
 
       def ask(question)

data/lib/kennel/version.rb

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

metadata

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