kennel 1.61.2 → 1.62.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd27c1efc9afa4ba43482978f3be42ae2ff6301b1532ae3461c043d503fc82c3
-  data.tar.gz: cc6209799a8b73dd0aca242e8f9a29a8693a2701c888ca3487f8dea0dfb9d100
+  metadata.gz: f5ad82b24cba6eef0e7733dac0b4c0f51e54fb728338112c8505ddf84284df23
+  data.tar.gz: c6bf110be71f0296d352797ed7f8ac364dfa18e580a632ef1ad21e427da65111
 SHA512:
-  metadata.gz: 28398d5ef02978e71c877edd65a4eb6a462ff1886df46d0bfabac621d640eb67f876d73dacfd52ef2c906c8715de006a7fc9e60d6663f4323f28fcd948cf4f36
-  data.tar.gz: 49581fac6bd3c3112f0d13cae7465580af642a78135f5b49c4e053d27bd66138b9e88b090912a96e943428903c7bcd8e07960c6beb2b406ecc795a69f4348775
+  metadata.gz: 85b2929f6e429c64be88d96dbbfb76f057fa56d1dea6eb81668e728b214ff4cd91a6345899199f95034c75414444519d6d7f585174687866f99c20481e547172
+  data.tar.gz: 55412cc487dffdf9de2e4f715fb3773690591753793fe2ea799677f853b3c42348e1fbc6ed13a8e7adc3d45d0fd3ac9141a825ef10d4a2066cdb58350e3632ff

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

@@ -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

@@ -8,7 +8,7 @@ module Kennel
       QUERY_INTERVALS = ["1m", "5m", "10m", "15m", "30m", "1h", "2h", "4h", "1d"].freeze
       OPTIONAL_SERVICE_CHECK_THRESHOLDS = [:ok, :warning].freeze
       READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [
-        :multi, :matching_downtimes, :overall_state_modified, :overall_state
+        :multi, :matching_downtimes, :overall_state_modified, :overall_state, :restricted_roles
       ]
 
       # defaults that datadog uses when options are not sent, so safe to leave out if our values match their defaults
@@ -35,7 +35,7 @@ module Kennel
         ok: -> { nil },
         id: -> { nil },
         notify_no_data: -> { true },
-        no_data_timeframe: -> { notify_no_data ? 60 : nil },
+        no_data_timeframe: -> { 60 },
         notify_audit: -> { true },
         new_host_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:new_host_delay) },
         tags: -> { @project.tags },
@@ -57,7 +57,7 @@ module Kennel
           options: {
             timeout_h: timeout_h,
             notify_no_data: notify_no_data,
-            no_data_timeframe: no_data_timeframe,
+            no_data_timeframe: notify_no_data ? no_data_timeframe : nil,
             notify_audit: notify_audit,
             require_full_window: require_full_window,
             new_host_delay: new_host_delay,
@@ -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/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.61.2"
+  VERSION = "1.62.1"
 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.2
+  version: 1.62.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2020-01-22 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