kennel 1.108.1 → 1.111.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bff54d7ab5c3fbf6a518f66ff1fbaec3ed7d9934d619ca80cbf672daddfb469
-  data.tar.gz: 70875ad9ccfa7a5acce1f0a1d5cba57a22d5e6cdf5af96d006a1ceb0c631245b
+  metadata.gz: ecc8b3b6c87887c18c48a47ef287b7d96a79a12b11f3e76122b95733dfcb53bc
+  data.tar.gz: 335c63f8cb7b01437286a0d5a1e2bfdcc409af5ff98d3743cb485e06c4d63963
 SHA512:
-  metadata.gz: 7f8ea8ce35199caf2d0841a100524711bdf8b197172cba1266821096d314b65d7caa23be31c4b11e500b2dd65e2799192aafc6b404b7eb222a8a734818f96f5f
-  data.tar.gz: de3915196d9aa4d5776036479f1795390ce00003260aa1bce51f4ad70dee6d4992978848b2b6fa429388045d2e2459187f62e6f316e3892649b1f6ed81c984da
+  metadata.gz: 8805038348b44ad5a9615642b6862d6a99dea7d630dd4bc2a2d93448d59d394bf23f714ef46a159c0150f34105b4a8553c4ea09d63b0a0fdc811ac6919a6de04
+  data.tar.gz: 93a9924e1c1d575d110e4e90b10124f7157a18f384284fb190af267ca19580d93e33b9816708429804195450b4865918e63a507dc65e1fcb84885c2b94122e23

data/Readme.md

@@ -248,6 +248,7 @@ so they can be created in a single update and can be re-created if any of them i
  - 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 (monitors: remove mentions while debugging to avoid alert spam)
+   - use `PROJECT=foo,bar,...` for multiple projects
 
 ### Reuse
 Add to `parts/<folder>`.

data/lib/kennel/models/monitor.rb

@@ -111,6 +111,14 @@ module Kennel
         # Datadog requires only either new_group_delay or new_host_delay, never both
         options.delete(options[:new_group_delay] ? :new_host_delay : :new_group_delay)
 
+        # Add in statuses where we would re notify on. Possible values: alert, no data, warn
+        if options[:renotify_interval] != 0
+          statuses = ["alert"]
+          statuses << "no data" if options[:notify_no_data]
+          statuses << "warn" if options.dig(:thresholds, :warning)
+          options[:renotify_statuses] = statuses
+        end
+
         validate_json(data) if validate
 
         @as_json = data

data/lib/kennel/models/synthetic_test.rb

@@ -54,7 +54,10 @@ module Kennel
 
         # tags come in a semi-random order and order is never updated
         expected[:tags]&.sort!
-        actual[:tags].sort!
+        actual[:tags]&.sort!
+
+        expected[:locations]&.sort!
+        actual[:locations]&.sort!
 
         ignore_default(expected, actual, DEFAULTS)
       end

data/lib/kennel/syncer.rb

@@ -4,9 +4,9 @@ module Kennel
     DELETE_ORDER = ["dashboard", "slo", "monitor", "synthetics/tests"].freeze # dashboards references monitors + slos, slos reference monitors
     LINE_UP = "\e[1A\033[K" # go up and clear
 
-    def initialize(api, expected, project: nil)
+    def initialize(api, expected, project_filter: nil)
       @api = api
-      @project_filter = project
+      @project_filter = project_filter
       @expected = expected
       calculate_diff
       validate_plan
@@ -252,7 +252,7 @@ module Kennel
       end
 
       # override resources that exist with their id
-      project_prefix = @project_filter && "#{@project_filter}:"
+      project_prefixes = @project_filter&.map { |p| "#{p}:" }
       actual.each do |a|
         # ignore when not managed by kennel
         next unless tracking_id = a.fetch(:tracking_id)
@@ -262,7 +262,7 @@ module Kennel
         api_resource = a.fetch(:klass).api_resource
         next if
           !@id_map.get(api_resource, tracking_id) &&
-          (!project_prefix || tracking_id.start_with?(project_prefix))
+          (!project_prefixes || tracking_id.start_with?(*project_prefixes))
 
         @id_map.set(api_resource, tracking_id, a.fetch(:id))
         if a[:klass].api_resource == "synthetics/tests"
@@ -277,9 +277,10 @@ module Kennel
 
     def filter_actual_by_project!(actual)
       return unless @project_filter
+      project_prefixes = @project_filter&.map { |p| "#{p}:" }
       actual.select! do |a|
         tracking_id = a.fetch(:tracking_id)
-        !tracking_id || tracking_id.start_with?("#{@project_filter}:")
+        !tracking_id || tracking_id.start_with?(*project_prefixes)
       end
     end
   end

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -63,7 +63,7 @@ module Kennel
 
     def store(parts)
       Progress.progress "Storing" do
-        old = Dir["generated/#{project_filter || "**"}/*"]
+        old = Dir["generated/{#{(project_filter || ["**"]).join(",")}}/*"]
         used = []
 
         Utils.parallel(parts, max: 2) do |part|
@@ -92,7 +92,7 @@ module Kennel
     end
 
     def syncer
-      @syncer ||= Syncer.new(api, generated, project: project_filter)
+      @syncer ||= Syncer.new(api, generated, project_filter: project_filter)
     end
 
     def api
@@ -104,18 +104,20 @@ module Kennel
         Progress.progress "Generating" do
           load_all
           known = []
+          filter = project_filter
+
           parts = Models::Project.recursive_subclasses.flat_map do |project_class|
             project = project_class.new
             kennel_id = project.kennel_id
-            if project_filter
+            if filter
               known << kennel_id
-              next [] if kennel_id != project_filter
+              next [] unless filter.include?(kennel_id)
             end
             project.validated_parts
           end
 
-          if project_filter && parts.empty?
-            raise "#{project_filter} does not match any projects, try any of these:\n#{known.uniq.sort.join("\n")}"
+          if filter && parts.empty?
+            raise "#{filter.join(", ")} does not match any projects, try any of these:\n#{known.uniq.sort.join("\n")}"
           end
 
           parts.group_by(&:tracking_id).each do |tracking_id, same|
@@ -131,7 +133,7 @@ module Kennel
     end
 
     def project_filter
-      ENV["PROJECT"]
+      ENV["PROJECT"]&.split(",")
     end
 
     def load_all

data/template/Readme.md

@@ -230,6 +230,7 @@ so they can be created in a single update and can be re-created if any of them i
  - 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 (monitors: remove mentions while debugging to avoid alert spam)
+   - use `PROJECT=foo,bar,...` for multiple projects
 
 ### Reuse
 Add to `parts/<folder>`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.108.1
+  version: 1.111.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-09 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday