kennel 1.121.1 → 1.122.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3eb87db53998806797dc41a7a73bacc01e1134655c7165c0498e30d7344e8fb
-  data.tar.gz: 5ce8b48a088fdae20fc4b49211ca229f3f8e028f654eaa489b49ebf6de980646
+  metadata.gz: 43b746ea91f86217a6fc43383a3368ccd654c89936c44003088054380be8c36d
+  data.tar.gz: 5fcd75471c8d0152236d032b023b4769975251047bc276f00219df3b1e60964d
 SHA512:
-  metadata.gz: a22b79c15a1e7c29947011de54e58fbc5a3c71d988bf2a65e046304d6c890e0472405b548c06144b6f1f9f9fe2a6a91ed1a0608e59dcd925fe73b7023f9f91fd
-  data.tar.gz: a3afc60d010f1364a46439d4f649d770cb1a76bb720856c9beada4cd89f4ab932b9aa1dfa8470feb97de969a0230752f94ec3a92f4e5a00275fa18fecdb46651
+  metadata.gz: e9ce639cdd5748f689eeb352da8ea9c14a2a4243350368574b8b3c1b52534dbf470ca3e969ad96ecd685d8df93d368e7e4d5f5c98da2af7e5cc843ccbc8053ce
+  data.tar.gz: 7039072c9129311145694b53823cab5c11263e972ae8f6c586e0b86063a8ab9d375c2ecd1069bd2812f626ce631f2940fe55ca9a018033b435df63bcbef1d355

data/Readme.md

@@ -406,6 +406,14 @@ https://foo.datadog.com/monitor/123
 ### Find all monitors with No-Data
 `rake kennel:nodata TAG=team:foo`
 
+### Finding the tracking id of a resource
+
+When trying to link resources together, this avoids having to go through datadog UI.
+
+```Bash
+rake kennel:tracking_id ID=123 RESOURCE=monitor
+```
+
 <!-- NOT IN template/Readme.md -->
 
 ## Development

data/lib/kennel/github_reporter.rb

@@ -24,7 +24,7 @@ module Kennel
     end
 
     def report(&block)
-      output = Utils.strip_shell_control(Utils.tee_output(&block).strip)
+      output = Utils.tee_output(&block).strip
     rescue StandardError
       output = "Error:\n#{$ERROR_INFO.message}"
       raise

data/lib/kennel/importer.rb

@@ -60,6 +60,8 @@ module Kennel
         data[:critical] = data[:critical].to_i if data[:type] == "event alert"
 
         data[:type] = "query alert" if data[:type] == "metric alert"
+
+        link_composite_monitors(data)
       when "dashboard"
         widgets = data[:widgets]&.flat_map { |widget| widget.dig(:definition, :widgets) || [widget] }
         widgets&.each do |widget|
@@ -91,6 +93,18 @@ module Kennel
 
     private
 
+    def link_composite_monitors(data)
+      if data[:type] == "composite"
+        data[:query].gsub!(/\d+/) do |id|
+          object = Kennel.send(:api).show("monitor", id)
+          tracking_id = Kennel::Models::Monitor.parse_tracking_id(object)
+          tracking_id ? "%{#{tracking_id}}" : id
+        rescue StandardError # monitor not found
+          id # keep the id
+        end
+      end
+    end
+
     # reduce duplication in imports by using dry `q: :metadata` when possible
     def dry_up_widget_metadata!(widget)
       (widget.dig(:definition, :requests) || []).each do |request|

data/lib/kennel/progress.rb

@@ -4,7 +4,9 @@ require "benchmark"
 module Kennel
   class Progress
     # print what we are doing and a spinner until it is done ... then show how long it took
-    def self.progress(name)
+    def self.progress(name, interval: 0.2, &block)
+      return progress_no_tty(name, &block) unless Kennel.err.tty?
+
       Kennel.err.print "#{name} ... "
 
       stop = false
@@ -16,15 +18,20 @@ module Kennel
         loop do
           break if stop
           Kennel.err.print animation[count % animation.size]
-          sleep 0.2
+          sleep interval
           Kennel.err.print "\b"
           count += 1
         end
       end
 
-      time = Benchmark.realtime { result = yield }
+      time = Benchmark.realtime { result = block.call }
 
       stop = true
+      begin
+        spinner.run # wake thread, so it stops itself
+      rescue ThreadError
+        # thread was already dead, but we can't check with .alive? since it's a race condition
+      end
       spinner.join
       Kennel.err.print "#{time.round(2)}s\n"
 
@@ -32,5 +39,17 @@ module Kennel
     ensure
       stop = true # make thread stop without killing it
     end
+
+    class << self
+      private
+
+      def progress_no_tty(name)
+        Kennel.err.puts "#{name} ..."
+        result = nil
+        time = Benchmark.realtime { result = yield }
+        Kennel.err.puts "#{name} ... #{time.round(2)}s"
+        result
+      end
+    end
   end
 end

data/lib/kennel/syncer.rb

@@ -42,7 +42,7 @@ module Kennel
 
     def confirm
       return false if noop?
-      return true if ENV["CI"] || !STDIN.tty?
+      return true if ENV["CI"] || !STDIN.tty? || !Kennel.err.tty?
       Utils.ask("Execute Plan ?")
     end
 

data/lib/kennel/tasks.rb

@@ -233,6 +233,17 @@ namespace :kennel do
     end
   end
 
+  desc "Resolve given id to kennel tracking-id RESOURCE= ID="
+  task tracking_id: "kennel:environment" do
+    resource = ENV.fetch("RESOURCE")
+    id = ENV.fetch("ID")
+    klass =
+      Kennel::Models::Record.subclasses.detect { |s| s.api_resource == resource } ||
+      raise("resource #{resource} not know")
+    object = Kennel.send(:api).show(resource, id)
+    Kennel.out.puts klass.parse_tracking_id(object)
+  end
+
   task :environment do
     Kennel::Tasks.load_environment
   end

data/lib/kennel/utils.rb

@@ -42,7 +42,7 @@ module Kennel
       end
 
       def ask(question)
-        Kennel.err.printf color(:red, "#{question} -  press 'y' to continue: ")
+        Kennel.err.printf color(:red, "#{question} -  press 'y' to continue: ", force: true)
         begin
           STDIN.gets.chomp == "y"
         rescue Interrupt # do not show a backtrace if user decides to Ctrl+C here
@@ -51,12 +51,10 @@ module Kennel
         end
       end
 
-      def color(color, text)
-        "\e[#{COLORS.fetch(color)}m#{text}\e[0m"
-      end
+      def color(color, text, force: false)
+        return text unless force || Kennel.out.tty?
 
-      def strip_shell_control(text)
-        text.gsub(/\e\[\d+m(.*?)\e\[0m/, "\\1").gsub(/.#{Regexp.escape("\b")}/, "")
+        "\e[#{COLORS.fetch(color)}m#{text}\e[0m"
       end
 
       def capture_stdout

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -388,3 +388,11 @@ https://foo.datadog.com/monitor/123
 ### Find all monitors with No-Data
 `rake kennel:nodata TAG=team:foo`
 
+### Finding the tracking id of a resource
+
+When trying to link resources together, this avoids having to go through datadog UI.
+
+```Bash
+rake kennel:tracking_id ID=123 RESOURCE=monitor
+```
+

metadata

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