kennel 1.19.2 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5902d795641ca4b635575c1dda0c87943d3d2370479f604824a7b48861c13d03
-  data.tar.gz: df6c5b00560993b650525ad2a634ddc26699728db6511112f626920e727fa1b5
+  metadata.gz: 80f76f0bd4a86149f2f04a65927a12c951ee2255907fd115e9b5749e7281665d
+  data.tar.gz: 8fb1fc45590b59fb8eaa4e46e93a0c4688897f27cb3e5f95a2167c53a99c07c5
 SHA512:
-  metadata.gz: 6480156e2717545a37eaf9de3337a4ef0224f209139c6a984b8862fa93a3e17eca574ea6a8b062989bbcf2e906eec6f2cdec91748d519c19e325f3882a1ff509
-  data.tar.gz: bf5906443199b2bf6acbd31ec1119fb02e0914ce61c57fac53e557b2d4e0caf2ceb732b9c699b6c7ee9b8d362cbf5083a989164d5cd2a8e801487f1dbaea6255
+  metadata.gz: 996c2a1b250f5a4f1c62122efa8c61abd6e2bfb08c1aecbccda32c412583dcc942a158eebe2ea0922e7626266e09e663eb6f3c3fbaa0612f22cb494ff56cda39
+  data.tar.gz: 5721558473ac63402c89e963f2a2dce6498f8f9c650daf1db9e15820a37ad58611b756edee04f8af05e270fc4ed51cd93fbf3884184e2c7924b0da725eb9725f

data/Readme.md

@@ -175,6 +175,10 @@ Put returned definition into a project of your choice.
 Some validations might be too strict for your usecase or just wrong, please [open an issue](https://github.com/grosser/kennel/issues) and
 to unblock use the `validate: -> { false }` option.
 
+### Linking with kennel_ids
+
+Screens `uptime` widgets can use `monitor: {id: "foo:bar"}` to link to existing monitors via their kennel_id
+
 ### Debugging locally
 
  - make sure to be on update `master` to not undo other changes

data/lib/kennel/models/base.rb

@@ -131,6 +131,9 @@ module Kennel
         raise NotImplementedError, "Use as_json"
       end
 
+      def resolve_linked_tracking_ids(*)
+      end
+
       private
 
       # let users know which project/resource failed when something happens during diffing where the backtrace is hidden

data/lib/kennel/models/screen.rb

@@ -84,6 +84,16 @@ module Kennel
         Utils.path_to_url "/screen/#{id}"
       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)")
+        end
+      end
+
       private
 
       def validate_json(data)

data/lib/kennel/syncer.rb

@@ -56,8 +56,11 @@ module Kennel
     def calculate_diff
       @update = []
       @delete = []
+
       actual = Progress.progress("Downloading definitions") { download_definitions }
 
+      resolve_linked_tracking_ids actual
+
       Progress.progress "Diffing" do
         filter_by_project! actual
 
@@ -177,6 +180,11 @@ module Kennel
       TEXT
     end
 
+    def resolve_linked_tracking_ids(actual)
+      map = actual.each_with_object({}) { |a, lookup| lookup[tracking_id(a)] = a.fetch(:id) }
+      @expected.each { |e| e.resolve_linked_tracking_ids(map) }
+    end
+
     def filter_by_project!(definitions)
       return unless @project_filter
       definitions.select! do |a|

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -157,6 +157,10 @@ Put returned definition into a project of your choice.
 Some validations might be too strict for your usecase or just wrong, please [open an issue](https://github.com/grosser/kennel/issues) and
 to unblock use the `validate: -> { false }` option.
 
+### Linking with kennel_ids
+
+Screens `uptime` widgets can use `monitor: {id: "foo:bar"}` to link to existing monitors via their kennel_id
+
 ### Debugging locally
 
  - make sure to be on update `master` to not undo other changes

metadata

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