kennel 1.124.0 → 1.125.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31edba322106d5b2f1942c57640f19eff6a265ea970b5bb2cc7f4ef02d1889fd
-  data.tar.gz: f47474f8b7d745714fb49231755ed2bf41fae62cf8b5ff3817017c8cd8277713
+  metadata.gz: 2464486b37bc4711843991d93789d4844d9c9aac33b40cf8b088ec4b249f39ab
+  data.tar.gz: 794318abfb10fecca670f6a8d2ad22e6f117e8425d0dc964b76163a658593d16
 SHA512:
-  metadata.gz: 3dc6b1b72e834b7b7663b577c830dfa23da87a197752b04988edd2366ac9089685ff01e19a1e3c8244ac9a41f4217c75ec34bc6198ca83cf545bf6079069d71e
-  data.tar.gz: 1dffcf6adbd06fe80117d9a5f9bc3b55fac90bc21abb4fdd4ebeb5b726ade944c799edbbcca3eabbc5a28beff6a302011ecfcce18f041b4ad2228076e164c2d6
+  metadata.gz: 97c3664e939d5776bf4dcc2a8fc72b647af0a8df0112035cadd6105e8117dd116097e85e60838050f96959df5ea0e17d7e00ffe89420712937a32190bcce70ca
+  data.tar.gz: 4a1cf01f15ac6959c7cea683297fb41f3a74791a99b3a16c5391f76af48333d9a1b4ea9a9fc804750844feb75d5c02fae0caced96fc3b85723d128d1ad45e289

data/lib/kennel/models/monitor.rb

@@ -21,7 +21,8 @@ module Kennel
         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
+        groupby_simple_monitor: false,
+        variables: nil
       }.freeze
       DEFAULT_ESCALATION_MESSAGE = ["", nil].freeze
       ALLOWED_PRIORITY_CLASSES = [NilClass, Integer].freeze
@@ -30,7 +31,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
+        :threshold_windows, :new_host_delay, :new_group_delay, :priority, :validate_using_links, :variables
       )
 
       defaults(
@@ -50,7 +51,8 @@ module Kennel
         critical_recovery: -> { nil },
         warning_recovery: -> { nil },
         threshold_windows: -> { nil },
-        priority: -> { MONITOR_DEFAULTS.fetch(:priority) }
+        priority: -> { MONITOR_DEFAULTS.fetch(:priority) },
+        variables: -> { MONITOR_OPTION_DEFAULTS.fetch(:variables) }
       )
 
       def build_json
@@ -73,7 +75,8 @@ module Kennel
             escalation_message: Utils.presence(escalation_message.strip),
             evaluation_delay: evaluation_delay,
             locked: false, # setting this to true prevents any edit and breaks updates when using replace workflow
-            renotify_interval: renotify_interval || 0
+            renotify_interval: renotify_interval || 0,
+            variables: variables
           }
         )
 

data/lib/kennel/models/slo.rb

@@ -2,7 +2,7 @@
 module Kennel
   module Models
     class Slo < Record
-      READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [:type_id, :monitor_tags]
+      READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [:type_id, :monitor_tags, :target_threshold, :timeframe, :warning_threshold]
       TRACKING_FIELD = :description
       DEFAULTS = {
         description: nil,

data/lib/kennel/syncer.rb

@@ -6,7 +6,9 @@ module Kennel
   class Syncer
     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
+
     Plan = Struct.new(:changes, keyword_init: true)
+    Change = Struct.new(:type, :api_resource, :tracking_id, :id)
 
     def initialize(api, expected, kennel:, project_filter: nil, tracking_id_filter: nil)
       @api = api
@@ -32,9 +34,9 @@ module Kennel
 
       Plan.new(
         changes:
-          @create.map { |_id, e| [:create, e.class.api_resource, e.tracking_id, nil] } +
-          @update.map { |_id, e| [:create, e.class.api_resource, e.tracking_id, nil] } +
-          @delete.map { |_id, _e, a| [:delete, a.fetch(:klass).api_resource, a.fetch(:tracking_id), a.fetch(:id)] }
+          @create.map { |_id, e, _a| Change.new(:create, e.class.api_resource, e.tracking_id, nil) } +
+          @update.map { |id, e, _a| Change.new(:update, e.class.api_resource, e.tracking_id, id) } +
+          @delete.map { |id, _e, a| Change.new(:delete, a.fetch(:klass).api_resource, a.fetch(:tracking_id), id) }
       )
     end
 
@@ -53,7 +55,7 @@ module Kennel
         reply = @api.create e.class.api_resource, e.as_json
         cache_metadata reply, e.class
         id = reply.fetch(:id)
-        changes << [:create, e.class.api_resource, e.tracking_id, id]
+        changes << Change.new(:create, e.class.api_resource, e.tracking_id, id)
         populate_id_map [], [reply] # allow resolving ids we could previously no resolve
         Kennel.out.puts "#{LINE_UP}Created #{message} #{e.class.url(id)}"
       end
@@ -62,7 +64,7 @@ module Kennel
         message = "#{e.class.api_resource} #{e.tracking_id} #{e.class.url(id)}"
         Kennel.out.puts "Updating #{message}"
         @api.update e.class.api_resource, id, e.as_json
-        changes << [:update, e.class.api_resource, e.tracking_id, id]
+        changes << Change.new(:update, e.class.api_resource, e.tracking_id, id)
         Kennel.out.puts "#{LINE_UP}Updated #{message}"
       end
 
@@ -71,7 +73,7 @@ module Kennel
         message = "#{klass.api_resource} #{a.fetch(:tracking_id)} #{id}"
         Kennel.out.puts "Deleting #{message}"
         @api.delete klass.api_resource, id
-        changes << [:delete, klass.api_resource, a.fetch(:tracking_id), id]
+        changes << Change.new(:delete, klass.api_resource, a.fetch(:tracking_id), id)
         Kennel.out.puts "#{LINE_UP}Deleted #{message}"
       end
 

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.124.0
+  version: 1.125.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-14 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs