kennel 1.20.1 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca4b6718dd57977c3c0f6dc71f2afeb12e15c85f3a03d247b4352dbfc9b1595f
-  data.tar.gz: 198eb908a346606cbc8afa98c9acab6a4d514fa6be785dd8c704015b79745584
+  metadata.gz: f1f69dd4a6316d9bcf55251a7a1242d4933f4e367db322b17d3a0f3a73f53739
+  data.tar.gz: 1c30f6568e29ff26e778f4da3f47db5272c1a7161bc0c03ca035ef8df6baf02c
 SHA512:
-  metadata.gz: e6f5a46f56229a8d1d7dfaa49d4378c2521101af574853073a1cb725ff44468c8d6f1e93543fae84a49f66f5b40fb0640f918482606fb201bceebc6a91866505
-  data.tar.gz: 7bd22fb1b7a09847da973357ce2634f0aebf88263e9400212f9d69e98c2918dd565ad4f9c5dabcdb3057b9e1e06e20427aae7dbe52aa0e9e21c949f75b264d9a
+  metadata.gz: e780b23f4d1bc971891df5bacf79e390d73d539ee2142d28f5f0b2b5418a5d0667eb8004ee5fc7d916571420e704547b40c157d284c253af90d58cf8a2794712
+  data.tar.gz: 02b6786dfbc2139cd8aae30204cb51062aa997124b4ebb1b0dd4f9f281b64a8520734c017fe1be2df70ca38b6c79ff79ca88bd291ce515eaaa9900f38cab7377

data/lib/kennel/models/screen.rb

@@ -85,12 +85,13 @@ module Kennel
       end
 
       def resolve_linked_tracking_ids(id_map)
-        uptime_widgets = as_json[:widgets].select { |w| w[:type] == "uptime" && w.dig(:monitor, :id).is_a?(String) }
-        uptime_widgets.each do |uptime_widget|
-          tracking = uptime_widget[:monitor][:id]
-          uptime_widget[:monitor][:id] =
-            id_map[tracking] ||
-            warn("Unable to find #{tracking} in existing monitors (they need to be created first to link them)")
+        as_json[:widgets].each do |widget|
+          case widget[:type]
+          when "uptime"
+            resolve_link(widget, [:monitor, :id], id_map)
+          when "alert_graph"
+            resolve_link(widget, [:alert_id], id_map)
+          end
         end
       end
 
@@ -147,6 +148,21 @@ module Kennel
 
         basics.merge(custom)
       end
+
+      def resolve_link(widget, key, id_map)
+        id = widget.dig(*key)
+        return unless tracking_id?(id)
+
+        *id_path, id_key = key
+        monitor_path = (id_path.empty? ? widget : widget.dig(*id_path))
+        monitor_path[id_key] =
+          id_map[id] ||
+          warn("Unable to find #{id} in existing monitors (they need to be created first to link them)")
+      end
+
+      def tracking_id?(id)
+        id.is_a?(String) && !id.match?(/\A\d+\z/)
+      end
     end
   end
 end

data/lib/kennel/version.rb

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

metadata

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