kennel 1.61.0 → 1.61.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b27c8e5ce2f9b7ec5b649d582ff591bd05b2c874fdbf21207db795d3cc5b6c26
-  data.tar.gz: a1385e625b05f60d80d9cb5b6ca89a97cd9099187bb24896fee4e1bdcdcf51b3
+  metadata.gz: c170afd5f8bc8223b9b7d37bf48a1de593d643fa7de785ec8fc26e631bcdf81c
+  data.tar.gz: 89ec3660c0b7a1022a104a6d6b51eda9ec3291a1bb9cf46d2ae303597e66c30b
 SHA512:
-  metadata.gz: 32273b702f893078015f99518c2798b3aa30dbd81abc68802ff35765ee489a2a16d0ad5f270c2d824c3d54fd44d4fba48d554486c19683a113f3a9e87f6ce1cd
-  data.tar.gz: 0f3c9290832283f5d1ae08865b926e84c7ba34fa8c79ebb01ddad91dad16eb592e54b9e246e432a00d7c2334908180b31cb2d343ce719a75c39b9cb4cf691ce2
+  metadata.gz: a68a43cf73743f9f098259dd5c614cdc6ced148d08cf629907f090689804148e01e857a4434f9410607fec338e3cca50f883e4dfe31200e48b80dffbbb7ff379
+  data.tar.gz: d5c5bf8a43c526611162267d6c4babb64a57aab4d0eddbb0cbf9e1fb507f0066528c6e82f7651911fdfd86d74c6ae520b634c7b0de1b799d8d55a1c695f0e457

data/Readme.md

@@ -6,8 +6,7 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
 
  - Documented, reusable, automated, and searchable configuration
  - Changes are PR reviewed and auditable
- - Good defaults like no-data / re-notify are preselected
- - Reliable cleanup with automated deletion
+ - Automated deletion when removed from code
 
 ![](template/github/screen.png?raw=true)
 <!-- NOT IN template/Readme.md  -->
@@ -18,7 +17,7 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
     ```Bash
     git clone git@github.com:your-org/kennel.git
     git clone git@github.com:grosser/kennel.git seed
-    mv seed/teamplate/* kennel/
+    mv seed/template/* kennel/
     cd kennel && git add . && git commit -m 'initial'
     ```
  - add a basic projects and teams so others can copy-paste to get started
@@ -31,7 +30,7 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
 
  - `projects/` monitors/dashboards/etc scoped by project
  - `teams/` team definitions
- - `parts/` monitors/dashes/etc that are used by multiple projects
+ - `parts/` monitors/dashboards/etc that are used by multiple projects
  - `generated/` projects as json, to show current state and proposed changes in PRs
 
 ## Workflows

data/lib/kennel/models/dashboard.rb

@@ -91,7 +91,7 @@ module Kennel
         # [a, e] -> [[a-w, e-w], [a-w1-w1, e-w1-w1], ...]
         def widgets_pairs(*pair)
           result = [pair.map { |d| d[:widgets] || [] }]
-          slots = result.compact.map(&:size).max.to_i
+          slots = result[0].map(&:size).max
           slots.times do |i|
             nested = pair.map { |d| d.dig(:widgets, i, :definition, :widgets) || [] }
             result << nested if nested.any?(&:any?)
@@ -125,22 +125,23 @@ module Kennel
       end
 
       def resolve_linked_tracking_ids(id_map)
-        as_json[:widgets].each do |widget|
+        widgets = as_json[:widgets].flat_map { |w| [w, *w.dig(:definition, :widgets) || []] }
+        widgets.each do |widget|
           next unless definition = widget[:definition]
           case definition[:type]
           when "uptime"
             if ids = definition[:monitor_ids]
               definition[:monitor_ids] = ids.map do |id|
-                tracking_id?(id) ? resolve_link(id, id_map) : id
+                tracking_id?(id) ? resolve_link(id, :monitor, id_map) : id
               end
             end
           when "alert_graph"
             if (id = definition[:alert_id]) && tracking_id?(id)
-              definition[:alert_id] = resolve_link(id, id_map).to_s
+              definition[:alert_id] = resolve_link(id, :monitor, id_map).to_s
             end
           when "slo"
             if (id = definition[:slo_id]) && tracking_id?(id)
-              definition[:slo_id] = resolve_link(id, id_map).to_s
+              definition[:slo_id] = resolve_link(id, :slo, id_map).to_s
             end
           end
         end
@@ -149,7 +150,7 @@ module Kennel
       private
 
       def tracking_id?(id)
-        id.is_a?(String) && !id.match?(/\A\d+\z/)
+        id.is_a?(String) && id.include?(":")
       end
 
       # creates queries from metadata to avoid having to keep q and expression in sync

data/lib/kennel/models/monitor.rb

@@ -106,7 +106,7 @@ module Kennel
         if as_json[:type] == "composite"
           as_json[:query] = as_json[:query].gsub(/%\{(.*?)\}/) do
             # need force here since it validates the id exists
-            resolve_link($1, id_map, force: true)
+            resolve_link($1, :monitor, id_map, force: true)
           end
         end
       end

data/lib/kennel/models/record.rb

@@ -54,19 +54,20 @@ module Kennel
 
       private
 
-      def resolve_link(id, id_map, force: false)
+      def resolve_link(id, type, id_map, force: false)
         found = id_map[id]
         return found if found && found != :new
+        api_resource = self.class.api_resource
 
         if found == :new
           if force
-            invalid! "Monitor #{id} will be created in the current run and can only be used after that"
+            invalid! "#{api_resource.capitalize} #{id} will be created in the current run and can only be used after that"
           else
-            Kennel.err.puts "Monitor #{id} will be created in the current run, the next run will link it properly"
+            Kennel.err.puts "#{api_resource.capitalize} #{id} will be created in the current run, the next run will link it properly"
             Kennel::MISSING_ID
           end
         else
-          invalid! "Unable to find monitor #{id} (does not exist and is not being created by the current run)"
+          invalid! "Unable to find #{type} #{id} (does not exist and is not being created by the current run)"
         end
       end
 

data/lib/kennel/models/slo.rb

@@ -55,7 +55,7 @@ module Kennel
 
       def resolve_linked_tracking_ids(id_map)
         as_json[:monitor_ids] = as_json[:monitor_ids].map do |id|
-          id.is_a?(String) ? resolve_link(id, id_map) : id
+          id.is_a?(String) ? resolve_link(id, :monitor, id_map) : id
         end
       end
 

data/lib/kennel/syncer.rb

@@ -147,7 +147,8 @@ module Kennel
     def print_plan(step, list, color)
       return if list.empty?
       list.each do |_, e, a, diff|
-        Kennel.out.puts Utils.color(color, "#{step} #{tracking_id(e&.as_json || a)}")
+        api_resource = (e ? e.class.api_resource : a.fetch(:api_resource))
+        Kennel.out.puts Utils.color(color, "#{step} #{api_resource} #{tracking_id(e&.as_json || a)}")
         print_diff(diff) if diff # only for update
       end
     end

data/lib/kennel/template_variables.rb

@@ -25,7 +25,7 @@ module Kennel
       if bad.any?
         invalid!(
           "queries #{bad.join(", ")} must use the template variables #{variables.join(", ")}\n" \
-          "If that is not possible, add `validate_template_variables: -> { false } # query foo in bar does not have baz tag`"
+          "If that is not possible, add `validate: -> { false } # query foo in bar does not have baz tag`"
         )
       end
     end

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -6,8 +6,7 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
 
  - Documented, reusable, automated, and searchable configuration
  - Changes are PR reviewed and auditable
- - Good defaults like no-data / re-notify are preselected
- - Reliable cleanup with automated deletion
+ - Automated deletion when removed from code
 
 ![](github/screen.png?raw=true)
 
@@ -15,7 +14,7 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
 
  - `projects/` monitors/dashboards/etc scoped by project
  - `teams/` team definitions
- - `parts/` monitors/dashes/etc that are used by multiple projects
+ - `parts/` monitors/dashboards/etc that are used by multiple projects
  - `generated/` projects as json, to show current state and proposed changes in PRs
 
 ## Workflows

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.61.0
+  version: 1.61.5
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Keep datadog monitors/dashboards/etc in version control, avoid chaotic management