kennel 1.108.0 → 1.110.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 056d04f7a660ae4cafb20d7f74b653188e6f0a38d8def21770e5217baedabadd
-  data.tar.gz: a639e95f70deea5ca8f7f809bd530708e4de24448852976f30e752e425b81190
+  metadata.gz: 96f333547d6fe858544175909310a96c5b65507eb8d265285b4ee0b56550ac23
+  data.tar.gz: b4cb7c9a09c432a8faa5ba57746e4f14ee07730de89e3616c88a512db6ab1d5a
 SHA512:
-  metadata.gz: 2e271c571a396798036aa081535cfef3e57c9f44f5265e72baf8fe3b42225ef4f20630072923296f820d74d98a1874709512fe857b8b2d40eadea7f12f3f3876
-  data.tar.gz: b6ce5b0e39bab361310c7cc7581790ddbc008c0a0fb2e6354a45f78df5a2de5e92c1525aff4444240ec24a94b69af56a75fa11725045ba2afd00e6516ed36461
+  metadata.gz: dee8590a0796078c82563b38fba653bbf3a3f6596ccc46206665810fe2c19a98de932a310ac4a524dc6ab63f041b5dffe61d0c19d15bd253d09f44a4b8d88e0f
+  data.tar.gz: ccc05391cf707a64ab70c2e8afe9ba26f9c6fab4632a5f9abdae567504930ec91583989f805ec9cd20d1242068097c258123277d85ea0d605c69c415cc4a67e3

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/base.rb

@@ -10,11 +10,7 @@ module Kennel
       SETTING_OVERRIDABLE_METHODS = [:name, :kennel_id].freeze
 
       def kennel_id
-        name = self.class.name
-        if name.start_with?("Kennel::") # core objects would always generate the same id
-          raise_with_location ArgumentError, "Set :kennel_id"
-        end
-        @kennel_id ||= Utils.snake_case name
+        @kennel_id ||= Utils.snake_case kennel_id_base
       end
 
       def name
@@ -24,6 +20,17 @@ module Kennel
       def to_json # rubocop:disable Lint/ToJSON
         raise NotImplementedError, "Use as_json"
       end
+
+      private
+
+      # hook to allow overwriting id generation to remove custom module scopes
+      def kennel_id_base
+        name = self.class.name
+        if name.start_with?("Kennel::") # core objects would always generate the same id
+          raise_with_location ArgumentError, "Set :kennel_id"
+        end
+        name
+      end
     end
   end
 end

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/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.0"
+  VERSION = "1.110.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.0
+  version: 1.110.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday