kennel 1.58.2 → 1.59.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27642045f1b97eac7f2a3184ccc0988a090ac9d4ad3d530120dc614a2b4e5670
-  data.tar.gz: 1f7d6b79d90b4fd1a5a76194af9a5c856920b190fbe0aa50b86499414976003e
+  metadata.gz: da2bef045b7b3b70aaf46ddf1254d31ea43fb0821276a05d08ffe1027d7dcd60
+  data.tar.gz: ccdcb485de98385ecb58d2aa379550de5c44054b822232b36a678f034593629d
 SHA512:
-  metadata.gz: cbd7460160bbb5e65fb1d509a1d0f9eee36229b895591f1555a1e972a2add145646fe24e3956f663bb2b0c501592cdb4a3b52b788d3811210b98a515a0d4658e
-  data.tar.gz: 2f896e594c59774d29d4273b885a0e4ee7ace8dcad4d3a16621d606a5b64bdb4da5ca75bb2afe52b1a137fe0d14cb46a62aa41c771830c868d3b38019a3881a2
+  metadata.gz: 2e4132e556b0eb1a1bf4aaa0a3b7913a1e70f790be3b3226238e6d9d9e2771544b96d665ee668841fd7fa640ac22abd3b2467b91be6d70ca167d01e2af0bd426
+  data.tar.gz: fda2c3268e6420c106ded560ca5fb59dc97fe783e385d2295588e2cabc3b367f0e1375a48355dbfd4968e19743ebcce60136bd2ba9dc483c7024326abee12828

data/Readme.md

@@ -45,6 +45,7 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
  - copy any `API Key` and add it to `.env` as `DATADOG_API_KEY`
  - find or create (check last page) your personal "Application Key" and add it to `.env` as `DATADOG_APP_KEY=`
  - change the `DATADOG_SUBDOMAIN=app` in `.env` to your companies subdomain if you have one
+ - verify it works by running `rake plan`, it might show some diff, but should not crash
 -->
 
 ### Adding a team

data/lib/kennel.rb

@@ -29,6 +29,10 @@ require "kennel/models/project"
 require "kennel/models/team"
 
 module Kennel
+  MISSING_ID = 1
+  class ValidationError < RuntimeError
+  end
+
   @out = $stdout
   @err = $stderr
 
@@ -68,7 +72,7 @@ module Kennel
         Progress.progress "Generating" do
           load_all
           parts = Models::Project.recursive_subclasses.flat_map do |project_class|
-            project_class.new.parts
+            project_class.new.validated_parts
           end
           parts.map(&:tracking_id).group_by { |id| id }.select do |id, same|
             raise "#{id} is defined #{same.size} times" if same.size != 1

data/lib/kennel/api.rb

@@ -13,7 +13,22 @@ module Kennel
     end
 
     def list(api_resource, params = {})
-      request :get, "/api/v1/#{api_resource}", params: params
+      if api_resource == "slo"
+        raise ArgumentError if params[:limit] || params[:offset]
+        limit = 1000
+        offset = 0
+        all = []
+
+        loop do
+          result = request :get, "/api/v1/#{api_resource}", params: params.merge(limit: limit, offset: offset)
+          data = result.fetch(:data)
+          all.concat data
+          break all if data.size < limit
+          offset += limit
+        end
+      else
+        request :get, "/api/v1/#{api_resource}", params: params
+      end
     end
 
     def create(api_resource, attributes)

data/lib/kennel/models/dashboard.rb

@@ -101,16 +101,16 @@ module Kennel
           when "uptime"
             if ids = definition[:monitor_ids]
               definition[:monitor_ids] = ids.map do |id|
-                tracking_id?(id) ? resolve_link(id, id_map, force: false) : id
+                tracking_id?(id) ? resolve_link(id, id_map) : id
               end
             end
           when "alert_graph"
             if (id = definition[:alert_id]) && tracking_id?(id)
-              definition[:alert_id] = resolve_link(id, id_map, force: false).to_s
+              definition[:alert_id] = resolve_link(id, id_map).to_s
             end
           when "slo"
             if (id = definition[:slo_id]) && tracking_id?(id)
-              definition[:slo_id] = resolve_link(id, id_map, force: false).to_s
+              definition[:slo_id] = resolve_link(id, id_map).to_s
             end
           end
         end

data/lib/kennel/models/monitor.rb

@@ -105,6 +105,7 @@ module Kennel
       def resolve_linked_tracking_ids(id_map)
         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)
           end
         end

data/lib/kennel/models/project.rb

@@ -14,6 +14,18 @@ module Kennel
           instance_method(method_in_file).source_location.first.sub("#{Bundler.root}/", "")
         end
       end
+
+      def validated_parts
+        all = parts
+        validate_parts(all)
+        all
+      end
+
+      private
+
+      # hook for users to add custom validations via `prepend`
+      def validate_parts(parts)
+      end
     end
   end
 end

data/lib/kennel/models/record.rb

@@ -13,9 +13,6 @@ module Kennel
       }.freeze
       API_LIST_INCOMPLETE = false
 
-      class ValidationError < RuntimeError
-      end
-
       settings :id, :kennel_id
 
       class << self
@@ -81,10 +78,19 @@ module Kennel
 
       private
 
-      def resolve_link(id, id_map, force:)
-        id_map[id] || begin
-          message = "Unable to find #{id} in existing monitors (they need to be created first to link them)"
-          force ? invalid!(message) : Kennel.err.puts(message)
+      def resolve_link(id, id_map, force: false)
+        found = id_map[id]
+        return found if found && found != :new
+
+        if found == :new
+          if force
+            invalid! "Monitor #{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::MISSING_ID
+          end
+        else
+          invalid! "Unable to find monitor #{id} (does not exist and is not being created by the current run)"
         end
       end
 

data/lib/kennel/models/slo.rb

@@ -35,7 +35,7 @@ module Kennel
           description: description,
           thresholds: thresholds,
           monitor_ids: monitor_ids,
-          tags: tags,
+          tags: tags.uniq,
           type: type
         }
 
@@ -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, force: false) || 1 : id
+          id.is_a?(String) ? resolve_link(id, id_map) : id
         end
       end
 

data/lib/kennel/syncer.rb

@@ -195,6 +195,7 @@ module Kennel
 
     def resolve_linked_tracking_ids(actual)
       map = actual.each_with_object({}) { |a, lookup| lookup[tracking_id(a)] = a.fetch(:id) }
+      @expected.each { |e| map[e.tracking_id] ||= :new }
       @expected.each { |e| e.resolve_linked_tracking_ids(map) }
     end
 

data/lib/kennel/tasks.rb

@@ -18,7 +18,7 @@ end
 namespace :kennel do
   desc "Ensure there are no uncommited changes that would be hidden from PR reviewers"
   task no_diff: :generate do
-    result = `git status --porcelain`.strip
+    result = `git status --porcelain generated/`.strip
     Kennel::Tasks.abort "Diff found:\n#{result}\nrun `rake generate` and commit the diff to fix" unless result == ""
     Kennel::Tasks.abort "Error during diffing" unless $CHILD_STATUS.success?
   end
@@ -45,8 +45,7 @@ namespace :kennel do
     end
 
     if bad.any?
-      subdomain = ENV["DATADOG_SUBDOMAIN"]
-      url = (subdomain ? "https://zendesk.datadoghq.com" : "") + "/account/settings"
+      url = Kennel::Utils.path_to_url "/account/settings"
       puts "Invalid mentions found, either ignore them by adding to `KNOWN` env var or add them via #{url}"
       bad.each { |f, v| puts "Invalid mention #{v} in monitor message of #{f}" }
       Kennel::Tasks.abort

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -28,6 +28,7 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
  - copy any `API Key` and add it to `.env` as `DATADOG_API_KEY`
  - find or create (check last page) your personal "Application Key" and add it to `.env` as `DATADOG_APP_KEY=`
  - change the `DATADOG_SUBDOMAIN=app` in `.env` to your companies subdomain if you have one
+ - verify it works by running `rake plan`, it might show some diff, but should not crash
 
 ### Adding a team
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.58.2
+  version: 1.59.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday