kennel 1.75.1 → 1.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23af2ecfb9019df555f7fe3a3954f4d992208927744093ff1f8886afd571e457
-  data.tar.gz: 6e2c902c47020e46b5fc0e647d8d63bbd7227657ce78303c673470be840ecbf9
+  metadata.gz: e6ac506da0670019c4f9bfeedda08ff728a0522b86a4e65356ef75b806ac1a33
+  data.tar.gz: e19bca2c80a775ba5a28a480b7b265246c0aa00699eec87147ef9d1b7725b603
 SHA512:
-  metadata.gz: c2dfa7e9f54c83d3369b48b91896cb7dc7cfe75bb94d672d7de07bc7a6b8ea3f63ebe38788dddf5de90ead3b73f977c42f87497d61e7b23def6ae385d0a42213
-  data.tar.gz: 9ebb18f6d9c54be18a783d8511e3128b9c59b5898f9f14a1be77c871dcdab837681bf04050ec97a1a2f675c84fda624469edaed0af9f5e0da11b60517ba93cea
+  metadata.gz: c29f4797475eb5f83eb7d3b5a35af710267eff90263764e0611f6d2bb52b75d3af34c3fdc7423e0945b2c0741c94bed3480152a17ef73b301877592d93c138c4
+  data.tar.gz: bbe104daf2fc7962fa95d94ce6b44b098ddd40461354717d99c0483f5672659a71ebaeaecaad32a28406161b8cd6ff726deefbf6986063b36e7eeb6e0edd60e5

data/Readme.md

@@ -205,17 +205,18 @@ to unblock use the `validate: -> { false }` option.
 
 ### Linking with kennel_ids
 
-To link to existing monitors via their kennel_id
+To link to existing monitors via their kennel_id `projects kennel_id` + `:` + `monitors kennel id`
 
  - Screens `uptime` widgets can use `monitor: {id: "foo:bar"}`
  - Screens `alert_graph` widgets can use `alert_id: "foo:bar"`
  - Monitors `composite` can use `query: -> { "%{foo:bar} || %{foo:baz}" }`
+ - Slos can use `monitor_ids: -> ["foo:bar"]` 
 
 ### Debugging changes locally
 
  - rebase on updated `master` to not undo other changes
  - figure out project name by converting the class name to snake-case
- - run `PROJECT=foo bundle exec rake kennel:update_datadog` to test changes for a single project
+ - run `PROJECT=foo bundle exec rake kennel:update_datadog` to test changes for a single project (monitors: remove mentions while debugging to avoid alert spam)
 
 ### Reuse
 
@@ -257,7 +258,8 @@ Run `rake kennel:alerts TAG=service:my-service` to see all un-muted alerts for a
 
 ### Grepping through all of datadog
 
-`TYPE=monitor rake kennel:dump`
+`rake kennel:dump`
+focus on a single type: `TYPE=monitors`
 
 ### Find all monitors with No-Data
 

data/lib/kennel/github_reporter.rb

@@ -15,8 +15,10 @@ module Kennel
     def initialize(token, git_sha)
       @token = token
       @git_sha = git_sha
-      origin = ENV["PROJECT_REPOSITORY"] || Utils.capture_sh("git remote -v").split("\n").first
-      @repo_part = origin[%r{github\.com[:/](.+?)(\.git|$)}, 1] || raise("no origin found")
+      @repo_part = ENV["GITHUB_REPOSITORY"] || begin
+        origin = ENV["PROJECT_REPOSITORY"] || Utils.capture_sh("git remote -v").split("\n").first
+        origin[%r{github\.com[:/](\S+?)(\.git|$)}, 1] || raise("no origin found in #{origin}")
+      end
     end
 
     def report(&block)

data/lib/kennel/importer.rb

@@ -42,10 +42,15 @@ module Kennel
 
       case resource
       when "monitor"
-        # flatten monitor options so they are all on the base
+        # flatten monitor options so they are all on the base which is how Monitor builds them
         data.merge!(data.delete(:options))
         data.merge!(data.delete(:thresholds) || {})
-        [:notify_no_data, :notify_audit].each { |k| data.delete(k) if data[k] } # monitor uses true by default
+
+        # clean up values that are the default
+        data.delete(:notify_no_data) if data[:notify_no_data] # Monitor uses true by default
+        data.delete(:notify_audit) unless data[:notify_audit] # Monitor uses false by default
+
+        # keep all values that are settable
         data = data.slice(*model.instance_methods)
 
         # make query use critical method if it matches
@@ -61,6 +66,8 @@ module Kennel
         widgets&.each { |widget| dry_up_query!(widget) }
       end
 
+      data.delete(:tags) if data[:tags] == [] # do not create super + [] call
+
       # simplify template_variables to array of string when possible
       if vars = data[:template_variables]
         vars.map! { |v| v[:default] == "*" && v[:prefix] == v[:name] ? v[:name] : v }

data/lib/kennel/models/monitor.rb

@@ -18,6 +18,7 @@ module Kennel
         new_host_delay: 300,
         timeout_h: 0,
         renotify_interval: 0,
+        notify_audit: false,
         no_data_timeframe: nil, # this works out ok since if notify_no_data is on, it would never be nil
         groupby_simple_monitor: false
       }.freeze
@@ -36,9 +37,9 @@ module Kennel
         warning: -> { nil },
         ok: -> { nil },
         id: -> { nil },
-        notify_no_data: -> { true },
+        notify_no_data: -> { true }, # datadog sets this to false by default, but true is the safer
         no_data_timeframe: -> { 60 },
-        notify_audit: -> { true },
+        notify_audit: -> { MONITOR_OPTION_DEFAULTS.fetch(:notify_audit) },
         new_host_delay: -> { MONITOR_OPTION_DEFAULTS.fetch(:new_host_delay) },
         tags: -> { @project.tags },
         timeout_h: -> { MONITOR_OPTION_DEFAULTS.fetch(:timeout_h) },
@@ -191,7 +192,7 @@ module Kennel
         end
 
         if type == "query alert"
-          # verify interval is valud
+          # verify interval is valid
           interval = data.fetch(:query)[/\(last_(\S+?)\)/, 1]
           if interval && !QUERY_INTERVALS.include?(interval)
             invalid! "query interval was #{interval}, but must be one of #{QUERY_INTERVALS.join(", ")}"
@@ -199,13 +200,17 @@ module Kennel
         end
 
         if ["query alert", "service check"].include?(type) # TODO: most likely more types need this
-          # verify is_match uses available variables
+          # verify is_match/is_exact_match uses available variables
           message = data.fetch(:message)
-          used = message.scan(/{{\s*#is_match\s*"([a-zA-Z\d_.-]+).name"/).flatten.uniq
-          allowed = data.fetch(:query)[/by\s*[({]([^})]+)[})]/, 1].to_s.gsub(/["']/, "").split(/\s*,\s*/)
-          unsupported = used - allowed
-          if unsupported.any?
-            invalid! "is_match used with #{unsupported}, but metric is only grouped by #{allowed}"
+          used = message.scan(/{{\s*([#^]is(?:_exact)?_match)\s*([^\s}]+)/)
+          if used.any?
+            allowed = data.fetch(:query)[/by\s*[({]([^})]+)[})]/, 1]
+              .to_s.gsub(/["']/, "").split(/\s*,\s*/)
+              .map! { |w| %("#{w}.name") }
+            used.uniq.each do |match, group|
+              next if allowed.include?(group)
+              invalid! "#{match} used with #{group}, but can only be used with #{allowed.join(", ")}. Add more groupings or fix the #{match}"
+            end
           end
         end
       end

data/lib/kennel/models/slo.rb

@@ -63,10 +63,11 @@ module Kennel
       end
 
       def self.parse_url(url)
-        url[/\/slo\?slo_id=([a-z\d]+)/, 1]
+        url[/\/slo\?.*slo_id=([a-z\d]+)/, 1]
       end
 
       def resolve_linked_tracking_ids!(id_map, **args)
+        return unless as_json[:monitor_ids] # ignore_default can remove it
         as_json[:monitor_ids] = as_json[:monitor_ids].map do |id|
           id.is_a?(String) ? resolve_link(id, :monitor, id_map, **args) : id
         end

data/lib/kennel/syncer.rb

@@ -38,7 +38,7 @@ module Kennel
     end
 
     def update
-      changed = (@create + @update).map { |_, e| e } unless @create.empty?
+      changed = (@create + @update).map { |_, e| e }
 
       @create.each do |_, e|
         e.resolve_linked_tracking_ids!({}, force: true)
@@ -188,7 +188,7 @@ module Kennel
     end
 
     # Do not add tracking-id when working with existing ids on a branch,
-    # so resource do not get deleted fr:om merges to master.
+    # so resource do not get deleted from running an update on master (for example merge->CI).
     # Also make sure the diff still makes sense, by kicking out the now noop-update.
     #
     # Note: ideally we'd never add tracking in the first place, but at that point we do not know the diff yet

data/lib/kennel/tasks.rb

@@ -124,10 +124,18 @@ namespace :kennel do
     Kennel.out.puts Kennel::Importer.new(Kennel.send(:api)).import(resource, id)
   end
 
-  desc "Dump ALL of datadog config as raw json ... useful for grep/search TYPE=slo|monitor|dashboard"
+  desc "Dump ALL of datadog config as raw json ... useful for grep/search [TYPE=slo|monitor|dashboard]"
   task dump: :environment do
-    Kennel.send(:api).list(ENV.fetch("TYPE")).each do |r|
-      Kennel.out.puts JSON.pretty_generate(r)
+    resources =
+      if type = ENV["TYPE"]
+        [type]
+      else
+        Kennel::Models::Record.subclasses.map(&:api_resource)
+      end
+    resources.each do |resource|
+      Kennel.send(:api).list(resource).each do |r|
+        Kennel.out.puts JSON.pretty_generate(r)
+      end
     end
   end
 

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -187,17 +187,18 @@ to unblock use the `validate: -> { false }` option.
 
 ### Linking with kennel_ids
 
-To link to existing monitors via their kennel_id
+To link to existing monitors via their kennel_id `projects kennel_id` + `:` + `monitors kennel id`
 
  - Screens `uptime` widgets can use `monitor: {id: "foo:bar"}`
  - Screens `alert_graph` widgets can use `alert_id: "foo:bar"`
  - Monitors `composite` can use `query: -> { "%{foo:bar} || %{foo:baz}" }`
+ - Slos can use `monitor_ids: -> ["foo:bar"]` 
 
 ### Debugging changes locally
 
  - rebase on updated `master` to not undo other changes
  - figure out project name by converting the class name to snake-case
- - run `PROJECT=foo bundle exec rake kennel:update_datadog` to test changes for a single project
+ - run `PROJECT=foo bundle exec rake kennel:update_datadog` to test changes for a single project (monitors: remove mentions while debugging to avoid alert spam)
 
 ### Reuse
 
@@ -239,7 +240,8 @@ Run `rake kennel:alerts TAG=service:my-service` to see all un-muted alerts for a
 
 ### Grepping through all of datadog
 
-`TYPE=monitor rake kennel:dump`
+`rake kennel:dump`
+focus on a single type: `TYPE=monitors`
 
 ### Find all monitors with No-Data
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.75.1
+  version: 1.77.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday