kennel 1.69.0 → 1.72.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daadbdb69c86de7a0dcdec2bc1eeaedd4b0c2221e2059d241db57e717a8876b6
-  data.tar.gz: 1d93147d3d88468564c6c9fcfd0a1fa3926df23d44961b876273e24ac642c851
+  metadata.gz: 9dec3dd3c3595176bc3340b7fcfd0227cca53a09ab56db9911da90546f8cc125
+  data.tar.gz: '019ee1e8e9c7e37d3218f77790ab5cc5ef08504fd0a603ee710a4623e36f72fa'
 SHA512:
-  metadata.gz: 7737e951ba0e6f34bdec5c4c000e64852acfcc1939d19385a7a92d9b88821c5d6efe0f29f1d8a292692c3ae8b85bd248af0f05ed3e591595da5d2ee41382fd37
-  data.tar.gz: 62989fb72a5bc60f052449ecf4d380f59f7e945a8d1857e7f3e789549d8625eac8ffd51c2a946b4f0367cd2d439b2ecb02eb99f79cb42202bb020dadf8a6b612
+  metadata.gz: a49dda9dcff0d0a8d330a68f2c9a6e69fb20624067bc24b9fae57c3e7f9cfe94ea9f3cb412acc456a4743ca5b61643a7494e5599833d296e92893372ee39be9a
+  data.tar.gz: 11a86599302eb683e8b7f37df641af3d0965ac52ace5ee00375d2a3644cc35e0b4844c31f1cdd71a98a9eec5e91002a7b20d23a611dd51ce902de5c93df462cf

data/Readme.md

@@ -23,7 +23,7 @@ Manage datadog monitors/dashboards/slos as code
     ```
  - add a basic projects and teams so others can copy-paste to get started
  - setup travis build for your repo
- - uncomment `.travis.yml` section for automated github PR feedback and datadog updates on merge
+ - uncomment `.travis.yml` section for automated PR planing and datadog updates on merge
  - follow `Setup` in your repos Readme.md
 <!-- NOT IN -->
 
@@ -72,7 +72,7 @@ end
 ### Updating an existing monitor
  - use [datadog monitor UI](https://app.datadoghq.com/monitors/manage) to find a monitor
  - get the `id` from the url
- - run `RESOURCE=monitor ID=12345 bundle exec rake kennel:import` and copy the output
+ - run `URL='https://app.datadoghq.com/monitors/123' bundle exec rake kennel:import` and copy the output
  - find or create a project in `projects/`
  - add the monitor to `parts: [` list, for example:
   ```Ruby
@@ -118,7 +118,7 @@ end
 ### Updating an existing dashboard
  - go to [datadog dashboard UI](https://app.datadoghq.com/dashboard/lists) and click on _New Dashboard_ to find a dashboard
  - get the `id` from the url
- - run `RESOURCE=dashboard ID=abc-def-ghi bundle exec rake kennel:import` and copy the output
+ - run `URL='https://app.datadoghq.com/dashboard/bet-foo-bar' bundle exec rake kennel:import` and copy the output
  - find or create a project in `projects/`
  - add a dashboard to `parts: [` list, for example:
   ```Ruby

data/lib/kennel/github_reporter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# Not used in here, but in our templated repo ... so keeping it around for now.
 module Kennel
   class GithubReporter
     MAX_COMMENT_SIZE = 65536

data/lib/kennel/models/dashboard.rb

@@ -16,12 +16,13 @@ module Kennel
       TIMESERIES_DEFAULTS = { show_legend: false, legend_size: "0" }.freeze
       SUPPORTED_DEFINITION_OPTIONS = [:events, :markers, :precision].freeze
 
-      settings :title, :description, :definitions, :widgets, :layout_type
+      settings :title, :description, :definitions, :widgets, :layout_type, :template_variable_presets
 
       defaults(
         description: -> { "" },
         definitions: -> { [] },
         widgets: -> { [] },
+        template_variable_presets: -> { [] },
         id: -> { nil }
       )
 
@@ -102,6 +103,7 @@ module Kennel
           title: "#{title}#{LOCK}",
           description: description,
           template_variables: render_template_variables,
+          template_variable_presets: template_variable_presets,
           widgets: all_widgets
         }
 
@@ -116,6 +118,10 @@ module Kennel
         Utils.path_to_url "/dashboard/#{id}"
       end
 
+      def self.parse_url(url)
+        url[/\/dashboard\/([a-z\d-]+)/, 1]
+      end
+
       def resolve_linked_tracking_ids(id_map)
         widgets = as_json[:widgets].flat_map { |w| [w, *w.dig(:definition, :widgets) || []] }
         widgets.each do |widget|
@@ -163,6 +169,10 @@ module Kennel
         super
 
         validate_template_variables data, :widgets
+
+        # Avoid diff from datadog presets sorting.
+        presets = data[:template_variable_presets]
+        invalid! "template_variable_presets must be sorted by name" if presets != presets.sort_by { |p| p[:name] }
       end
 
       def render_definitions

data/lib/kennel/models/monitor.rb

@@ -120,6 +120,12 @@ module Kennel
         Utils.path_to_url "/monitors##{id}/edit"
       end
 
+      # datadog uses both / and # as separator in it's links
+      def self.parse_url(url)
+        return unless id = url[/\/monitors[\/#](\d+)/, 1]
+        Integer(id)
+      end
+
       def self.normalize(expected, actual)
         super
         options = actual.fetch(:options)
@@ -196,7 +202,7 @@ module Kennel
           # verify is_match uses available variables
           message = data.fetch(:message)
           used = message.scan(/{{\s*#is_match\s*"([a-zA-Z\d_.-]+).name"/).flatten.uniq
-          allowed = data.fetch(:query)[/by\s*{([^\}]+)}/, 1].to_s.split(/\s*,\s*/)
+          allowed = data.fetch(:query)[/by\s*[\({]([^\}\)]+)[}\)]/, 1].to_s.gsub(/["']/, "").split(/\s*,\s*/)
           unsupported = used - allowed
           if unsupported.any?
             invalid! "is_match used with #{unsupported}, but metric is only grouped by #{allowed}"

data/lib/kennel/models/record.rb

@@ -11,6 +11,14 @@ module Kennel
       settings :id, :kennel_id
 
       class << self
+        def parse_any_url(url)
+          subclasses.detect do |s|
+            if id = s.parse_url(url)
+              break s.api_resource, id
+            end
+          end
+        end
+
         private
 
         def normalize(_expected, actual)

data/lib/kennel/models/slo.rb

@@ -62,6 +62,10 @@ module Kennel
         Utils.path_to_url "/slo?slo_id=#{id}"
       end
 
+      def self.parse_url(url)
+        url[/\/slo\?slo_id=([a-z\d]+)/, 1]
+      end
+
       def resolve_linked_tracking_ids(id_map)
         as_json[:monitor_ids] = as_json[:monitor_ids].map do |id|
           id.is_a?(String) ? resolve_link(id, :monitor, id_map) : id

data/lib/kennel/syncer.rb

@@ -228,7 +228,7 @@ module Kennel
       json = e.as_json
       field = tracking_field(json)
       value = json[field]
-      json[field] = value.dup.sub!(/\n-- Managed by kennel .*/, "") || raise("did not find tracking id in #{value}")
+      json[field] = value.dup.sub!(/\n?-- Managed by kennel .*/, "") || raise("did not find tracking id in #{value}")
     end
 
     def tracking_id(a)

data/lib/kennel/tasks.rb

@@ -68,7 +68,7 @@ namespace :kennel do
     Kennel.update
   end
 
-  desc "update if this is a push to the default branch, otherwise plan (report to github with GITHUB_TOKEN)"
+  desc "update if this is a push to the default branch, otherwise plan"
   task :travis do
     on_default_branch = (ENV["TRAVIS_BRANCH"] == (ENV["DEFAULT_BRANCH"] || "master"))
     is_push = (ENV["TRAVIS_PULL_REQUEST"] == "false")
@@ -79,9 +79,7 @@ namespace :kennel do
         "kennel:plan" # show plan in travis logs
       end
 
-    Kennel::GithubReporter.report(ENV["GITHUB_TOKEN"]) do
-      Rake::Task[task_name].invoke
-    end
+    Rake::Task[task_name].invoke
   end
 
   desc "show unmuted alerts filtered by TAG, for example TAG=team:foo"
@@ -111,12 +109,18 @@ namespace :kennel do
     end
   end
 
-  desc "Convert existing resources to copy-pastable definitions to import existing resources RESOURCE=[dashboard,monitor,slo] ID=1234"
+  desc "Convert existing resources to copy-pasteable definitions to import existing resources (call with URL= or call with RESOURCE= and ID=)"
   task import: :environment do
-    resource = ENV["RESOURCE"] || Kennel::Tasks.abort("Call with RESOURCE=dashboard or monitor or slo")
-    id = ENV["ID"] || Kennel::Tasks.abort("Call with ID=1234")
-    id = Integer(id) if id =~ /^\d+$/ # dashboards can have alphanumeric ids
-    puts Kennel::Importer.new(Kennel.send(:api)).import(resource, id)
+    if (id = ENV["ID"]) && (resource = ENV["RESOURCE"])
+      id = Integer(id) if id =~ /^\d+$/ # dashboards can have alphanumeric ids
+    elsif (url = ENV["URL"])
+      resource, id = Kennel::Models::Record.parse_any_url(url) || Kennel::Tasks.abort("Unable to parse url")
+    else
+      possible_resources = Kennel::Models::Record.subclasses.map(&:api_resource)
+      Kennel::Tasks.abort("Call with URL= or call with RESOURCE=#{possible_resources.join(" or ")} and ID=")
+    end
+
+    Kennel.out.puts Kennel::Importer.new(Kennel.send(:api)).import(resource, id)
   end
 
   desc "Dump ALL of datadog config as raw json ... useful for grep/search TYPE=slo|monitor|dashboard"

data/lib/kennel/utils.rb

@@ -19,6 +19,7 @@ module Kennel
           .gsub(/::/, "_") # Foo::Bar -> foo_bar
           .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2') # FOOBar -> foo_bar
           .gsub(/([a-z\d])([A-Z])/, '\1_\2') # fooBar -> foo_bar
+          .tr("-", "_") # foo-bar -> foo_bar
           .downcase
       end
 

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -54,7 +54,7 @@ end
 ### Updating an existing monitor
  - use [datadog monitor UI](https://app.datadoghq.com/monitors/manage) to find a monitor
  - get the `id` from the url
- - run `RESOURCE=monitor ID=12345 bundle exec rake kennel:import` and copy the output
+ - run `URL='https://app.datadoghq.com/monitors/123' bundle exec rake kennel:import` and copy the output
  - find or create a project in `projects/`
  - add the monitor to `parts: [` list, for example:
   ```Ruby
@@ -100,7 +100,7 @@ end
 ### Updating an existing dashboard
  - go to [datadog dashboard UI](https://app.datadoghq.com/dashboard/lists) and click on _New Dashboard_ to find a dashboard
  - get the `id` from the url
- - run `RESOURCE=dashboard ID=abc-def-ghi bundle exec rake kennel:import` and copy the output
+ - run `URL='https://app.datadoghq.com/dashboard/bet-foo-bar' bundle exec rake kennel:import` and copy the output
  - find or create a project in `projects/`
  - add a dashboard to `parts: [` list, for example:
   ```Ruby

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.69.0
+  version: 1.72.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday