kennel 1.88.1 → 1.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1091fcd44daba6435e7a9321610a27b8ac2510451cf97e8183d6ab744e080288
-  data.tar.gz: f137076ec36e4018eaa1c1d60dd2da187f33bdb41fc3fe5c384be4787ddd9c77
+  metadata.gz: bdedd0f9bbcb9abf873cd2f9be0414700f77d2ea864e609db79773d1b3193e8e
+  data.tar.gz: 336875475665fac019c12daced64e474fb8e85e216e158d4328b62b287785e6a
 SHA512:
-  metadata.gz: 52cd265a23705e8a8afca55f819c9fed1c2ae467e8de1cba5e696cd6191619458168fd649f26f5c00da33702e4002490e13f804335dad10e2204a96d16cf12a8
-  data.tar.gz: d2cc461399929023573e22f55bc89699d952c9338f5e415cea9328af00d212b5e87fe2061837327ec88c4b60a2a277e1f272a511e85a9de0014142c51073f60e
+  metadata.gz: 0041e466ce433d82f9db8252829f8c64652815d7bf932ec93596d57af76dc13aaa9dfce963bbf82888e09d424937b597364954edc1cff14344143f0661e8e274
+  data.tar.gz: a286f227e597686085049ef0227b2e36b26d33ef41a7d96d13a535af73e1530254de6bf68ead11ebdd0c394d1562766a91a478c794ee17f35c288a7f102d46b7

data/Readme.md

@@ -114,6 +114,7 @@ end
  - use [datadog monitor UI](https://app.datadoghq.com/monitors/manage) to find a monitor
  - get the `id` from the url
  - run `URL='https://app.datadoghq.com/monitors/123' bundle exec rake kennel:import` and copy the output
+ - import task also works with SLO alerts, e.g. `URL='https://app.datadoghq.com/slo/edit/123abc456def123/alerts/789' bundle exec rake kennel:import`
  - find or create a project in `projects/`
  - add the monitor to `parts: [` list, for example:
   ```Ruby

data/lib/kennel/models/base.rb

@@ -11,7 +11,7 @@ module Kennel
 
       def kennel_id
         name = self.class.name
-        if name.start_with?("Kennel::")
+        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

data/lib/kennel/models/monitor.rb

@@ -129,9 +129,15 @@ module Kennel
         Utils.path_to_url "/monitors##{id}/edit"
       end
 
-      # datadog uses / for show and # for edit as separator in it's links
       def self.parse_url(url)
-        return unless id = url[/\/monitors[\/#](\d+)/, 1]
+        # datadog uses / for show and # for edit as separator in it's links
+        id = url[/\/monitors[\/#](\d+)/, 1]
+
+        # slo alert url
+        id ||= url[/\/slo\/edit\/[a-z\d]{10,}\/alerts\/(\d+)/, 1]
+
+        return unless id
+
         Integer(id)
       end
 

data/lib/kennel/models/record.rb

@@ -74,7 +74,11 @@ module Kennel
       end
 
       def tracking_id
-        "#{project.kennel_id}:#{kennel_id}"
+        @tracking_id ||= begin
+          id = "#{project.kennel_id}:#{kennel_id}"
+          raise ValidationError, "#{id} kennel_id cannot include whitespace" if id.match?(/\s/) # <-> parse_tracking_id
+          id
+        end
       end
 
       def resolve_linked_tracking_ids!(*)

data/lib/kennel/models/slo.rb

@@ -64,7 +64,7 @@ module Kennel
       end
 
       def self.parse_url(url)
-        url[/\/slo(\?.*slo_id=|\/edit\/)([a-z\d]{10,})/, 2]
+        url[/\/slo(\?.*slo_id=|\/edit\/)([a-z\d]{10,})(&|$)/, 2]
       end
 
       def resolve_linked_tracking_ids!(id_map, **args)

data/lib/kennel/syncer.rb

@@ -2,6 +2,7 @@
 module Kennel
   class Syncer
     DELETE_ORDER = ["dashboard", "slo", "monitor"].freeze # dashboards references monitors + slos, slos reference monitors
+    LINE_UP = "\e[1A"
 
     def initialize(api, expected, project: nil)
       @api = api
@@ -37,23 +38,29 @@ module Kennel
 
     def update
       each_resolved @create do |_, e|
+        message = "#{e.class.api_resource} #{e.tracking_id}"
+        Kennel.out.puts "Creating #{message}"
         reply = @api.create e.class.api_resource, e.as_json
         reply[:klass] = e.class # store api resource class for later use
         id = reply.fetch(:id)
         populate_id_map [reply] # allow resolving ids we could previously no resolve
-        Kennel.out.puts "Created #{e.class.api_resource} #{e.tracking_id} #{e.class.url(id)}"
+        Kennel.out.puts "#{LINE_UP}Created #{message} #{e.class.url(id)}"
       end
 
       each_resolved @update do |id, e|
+        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
-        Kennel.out.puts "Updated #{e.class.api_resource} #{e.tracking_id} #{e.class.url(id)}"
+        Kennel.out.puts "#{LINE_UP}Updated #{message}"
       end
 
       @delete.each do |id, _, a|
         klass = a.fetch(:klass)
-        @api.delete klass.api_resource, id
         tracking_id = klass.parse_tracking_id(a)
-        Kennel.out.puts "Deleted #{klass.api_resource} #{tracking_id} #{id}"
+        message = "#{klass.api_resource} #{tracking_id} #{id}"
+        Kennel.out.puts "Deleting #{message}"
+        @api.delete klass.api_resource, id
+        Kennel.out.puts "#{LINE_UP}Deleted #{message}"
       end
     end
 

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -96,6 +96,7 @@ end
  - use [datadog monitor UI](https://app.datadoghq.com/monitors/manage) to find a monitor
  - get the `id` from the url
  - run `URL='https://app.datadoghq.com/monitors/123' bundle exec rake kennel:import` and copy the output
+ - import task also works with SLO alerts, e.g. `URL='https://app.datadoghq.com/slo/edit/123abc456def123/alerts/789' bundle exec rake kennel:import`
  - find or create a project in `projects/`
  - add the monitor to `parts: [` list, for example:
   ```Ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.88.1
+  version: 1.89.0
 platform: ruby
 authors:
 - Michael Grosser