kennel 1.133.1 → 1.135.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ebfb755b091be3c3c59e5363f7b302b3c69a67a13ec9a768c76bc68ca09ec65
-  data.tar.gz: ca416980653d8b8965d72693506c246dbce2c03f5937f0beedc246df194f7617
+  metadata.gz: df9cbe3093fdce8eaea3d1b3e58fd7f715a2c1ed070f6d133e8ef0bd588856e6
+  data.tar.gz: 229af8ec1cccb468c3e5519c4a4292c8889bf0f4386ac5330bd7ec4795b0a608
 SHA512:
-  metadata.gz: f4e96b9bdc91ea48b644333b5c5b5c0d774d9c2f47da73b322dd51406358f7435ec4794f52ffb0cd93eb01131b78a306b1fd301c33f3069c96c24729afc07290
-  data.tar.gz: e7415a9706cb1803ffbef5eb46e45f8acb19c0f17d1f47a168f041886154d1f39d6fd122be072c0ee28bdc07a08061fd3e7582f2d9931349970adff5d268bbb8
+  metadata.gz: 70955bc2936c0d055e6f1c9634e4b7797dc29b89faa55c41b3f08d49366251332f16c24a8f54291285a58df464bbca2c969e179def22d2231a96ccad8a24f401
+  data.tar.gz: 180ca60ae26ef56c64b26dd0a04dc8e13b1bd0f0101d1f8d8161cdf0289ccfc3146947ec81addff80172adb5efabcaf8be037b83a1333d41ba8a8c76f007a314

data/lib/kennel/api.rb

@@ -3,7 +3,7 @@
 # especially 1-off weirdness that should not leak into other parts of the code
 module Kennel
   class Api
-    CACHE_FILE = "tmp/cache/details"
+    CACHE_FILE = ENV.fetch("KENNEL_API_CACHE_FILE", "tmp/cache/details")
 
     def self.tag(api_resource, reply)
       klass = Models::Record.api_resource_map[api_resource]

data/lib/kennel/filter.rb

@@ -45,7 +45,13 @@ module Kennel
     end
 
     def build_tracking_id_filter
-      (tracking_id = ENV["TRACKING_ID"]) && tracking_id.split(",").sort.uniq
+      (tracking_id = ENV["TRACKING_ID"]) && tracking_id.split(",").map { |id| tracking_id_path_conversion(id) }.sort.uniq
+    end
+
+    # allow users to paste the generated path of an objects to update it without manually converting
+    def tracking_id_path_conversion(tracking_id)
+      return tracking_id unless tracking_id.end_with?(".json")
+      tracking_id.sub("generated/", "").sub(".json", "").sub("/", ":")
     end
 
     def filter_resources(resources, by, expected, name, env)

data/lib/kennel/importer.rb

@@ -148,6 +148,7 @@ module Kennel
               .gsub(": null", ": nil")
               .gsub(/(^\s*)"([a-zA-Z][a-zA-Z\d_]*)":/, "\\1\\2:") # "foo": 1 -> foo: 1
               .gsub(/: \[\n\s+\]/, ": []") # empty arrays on a single line
+              .gsub(/: \{\n\s+\}/, ": {}") # empty hash on a single line
               .gsub('q: "metadata"', "q: :metadata") # bring symbols back
               .gsub(/^/, "    ") # indent
             pretty = convert_strings_to_heredoc(pretty)

data/lib/kennel/models/monitor.rb

@@ -32,7 +32,7 @@ module Kennel
       settings(
         :query, :name, :message, :escalation_message, :critical, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
         :ok, :no_data_timeframe, :notify_no_data, :notify_audit, :tags, :critical_recovery, :warning_recovery, :require_full_window,
-        :threshold_windows, :new_host_delay, :new_group_delay, :priority, :validate_using_links, :variables, :on_missing_data
+        :threshold_windows, :scheduling_options, :new_host_delay, :new_group_delay, :priority, :validate_using_links, :variables, :on_missing_data
       )
 
       defaults(
@@ -52,6 +52,7 @@ module Kennel
         critical_recovery: -> { nil },
         warning_recovery: -> { nil },
         threshold_windows: -> { nil },
+        scheduling_options: -> { nil },
         priority: -> { MONITOR_DEFAULTS.fetch(:priority) },
         variables: -> { MONITOR_OPTION_DEFAULTS.fetch(:variables) },
         on_missing_data: -> { MONITOR_OPTION_DEFAULTS.fetch(:on_missing_data) }
@@ -114,6 +115,10 @@ module Kennel
           options[:threshold_windows] = windows
         end
 
+        if schedule = scheduling_options
+          options[:scheduling_options] = schedule
+        end
+
         # 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)
 

data/lib/kennel/tasks.rb

@@ -111,6 +111,8 @@ namespace :kennel do
 
   desc "update datadog (scope with PROJECT=name)"
   task update_datadog: :environment do
+    Kennel::Tasks.kennel.preload
+    Kennel::Tasks.kennel.generate
     Kennel::Tasks.kennel.update
   end
 

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.133.1
+  version: 1.135.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs