kennel 1.135.2 → 1.137.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8928631a86f3c83bfabba16aea02f9ed8bc853ddbb7c316495dc15081fe90239
-  data.tar.gz: 63b5107f2a19fd90a4a3b79d6da278956c50dc873162725395f74701e02b9d3b
+  metadata.gz: b53cb18f3d669a49d841764bcf3c7909e9d297c09001779a586facb5af76ac82
+  data.tar.gz: 9260cff2d88fd8de017c9a020525cd634595e99028e0bc6fe75d36994b5aadb2
 SHA512:
-  metadata.gz: 42d9bdc4fba36067d3fc65cf86ef19159c66a0a57fe1d1ab709a598d77eacc843cb591904b8c652a1dbc49626d2ae8ad4ca8bbf170e72485a7de2183513f71bd
-  data.tar.gz: 36f1d3207327b416667438ecb304882dbf3ac1b6da9fc066033efc6d47098995a863eb3096cc19d2ff064d09ae7d452a0e9a53b7f6f378d2bb30de66650ea578
+  metadata.gz: ce2712664d1d3bca8475d37e4e358a3b1beacbd7f6fb1f2398e1be8bab19a51796bfaf1827f8294735e82073e87bc2587f9539ae7bf797401fcc4b028813cabd
+  data.tar.gz: 7f3112824f98bb008784b50550000ece752c62b09f94e6978822e1ca78fd78f43e08c33cdf8c461b1e0ba290c7a3a166797008a205991492e14a0a8a9ea642ef

data/lib/kennel/console.rb

@@ -18,7 +18,7 @@ module Kennel
       def ask?(question)
         Kennel.err.printf color(:red, "#{question} -  press 'y' to continue: ", force: true)
         begin
-          STDIN.gets.chomp == "y"
+          Kennel.in.gets.chomp == "y"
         rescue Interrupt # do not show a backtrace if user decides to Ctrl+C here
           Kennel.err.print "\n"
           exit 1

data/lib/kennel/models/monitor.rb

@@ -23,7 +23,8 @@ module Kennel
         no_data_timeframe: nil, # this works out ok since if notify_no_data is on, it would never be nil
         groupby_simple_monitor: false,
         variables: nil,
-        on_missing_data: "default" # "default" is "evaluate as zero"
+        on_missing_data: "default", # "default" is "evaluate as zero"
+        notification_preset_name: nil
       }.freeze
       DEFAULT_ESCALATION_MESSAGE = ["", nil].freeze
       ALLOWED_PRIORITY_CLASSES = [NilClass, Integer].freeze
@@ -32,7 +33,8 @@ 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, :scheduling_options, :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,
+        :notification_preset_name
       )
 
       defaults(
@@ -55,7 +57,8 @@ module Kennel
         scheduling_options: -> { nil },
         priority: -> { MONITOR_DEFAULTS.fetch(:priority) },
         variables: -> { MONITOR_OPTION_DEFAULTS.fetch(:variables) },
-        on_missing_data: -> { MONITOR_OPTION_DEFAULTS.fetch(:on_missing_data) }
+        on_missing_data: -> { MONITOR_OPTION_DEFAULTS.fetch(:on_missing_data) },
+        notification_preset_name: -> { MONITOR_OPTION_DEFAULTS.fetch(:notification_preset_name) }
       )
 
       def build_json
@@ -137,6 +140,11 @@ module Kennel
           options.delete :no_data_timeframe
         end
 
+        # only set when needed to avoid big diff
+        if (notification_preset_name = notification_preset_name())
+          options[:notification_preset_name] = notification_preset_name
+        end
+
         data
       end
 

data/lib/kennel/syncer.rb

@@ -47,7 +47,7 @@ module Kennel
 
     def confirm
       return false if internal_plan.empty?
-      return true if ENV["CI"] || !STDIN.tty? || !Kennel.err.tty?
+      return true if ENV["CI"] || !Kennel.in.tty? || !Kennel.err.tty?
       Console.ask?("Execute Plan ?")
     end
 

data/lib/kennel/tasks.rb

@@ -82,15 +82,17 @@ namespace :kennel do
     bad = []
     Dir["generated/**/*.json"].each do |f|
       next unless message = JSON.parse(File.read(f))["message"]
-      used = message.scan(/\s(@[^\s{,'"]+)/).flatten(1)
+      used = message
+        .scan(/(?:^|\s)(@[^\s{,'"]+)/)
+        .flatten(1)
         .grep(/^@.*@|^@.*-/) # ignore @here etc handles ... datadog uses @foo@bar.com for emails and @foo-bar for integrations
       (used - known).each { |v| bad << [f, v] }
     end
 
     if bad.any?
       url = Kennel::Utils.path_to_url "/account/settings"
-      puts "Invalid mentions found, either ignore them by adding to `KNOWN` env var or add them via #{url}"
-      bad.each { |f, v| puts "Invalid mention #{v} in monitor message of #{f}" }
+      Kennel.out.puts "Invalid mentions found, either ignore them by adding to `KNOWN` env var or add them via #{url}"
+      bad.each { |f, v| Kennel.out.puts "Invalid mention #{v} in monitor message of #{f}" }
       Kennel::Tasks.abort ENV["KNOWN_WARNING"]
     end
   end
@@ -105,14 +107,14 @@ namespace :kennel do
   desc "show planned datadog changes (scope with PROJECT=name)"
   task plan: :environment do
     Kennel::Tasks.kennel.preload
-    Kennel::Tasks.kennel.generate
+    Kennel::Tasks.kennel.generate unless ENV["KENNEL_NO_GENERATE"]
     Kennel::Tasks.kennel.plan
   end
 
   desc "update datadog (scope with PROJECT=name)"
   task update_datadog: :environment do
     Kennel::Tasks.kennel.preload
-    Kennel::Tasks.kennel.generate
+    Kennel::Tasks.kennel.generate unless ENV["KENNEL_NO_GENERATE"]
     Kennel::Tasks.kennel.update
   end
 

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -47,9 +47,10 @@ module Kennel
   GenerationAbortedError = Class.new(StandardError)
 
   class << self
-    attr_accessor :out, :err
+    attr_accessor :in, :out, :err
   end
 
+  self.in = $stdin
   self.out = $stdout
   self.err = $stderr
 

metadata

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