kennel 1.70.0 → 1.72.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 857c5d57edd43c806560c9a97b579398f440ed311dd7b8541e1262af03de51bd
-  data.tar.gz: b75bf7667bcdd473732d1e69231a52a37bdd90366462890a85d39d6325004593
+  metadata.gz: 1aa2b3776b0249a4013afd8ef6b078f4a783b9df6461193a83ed25b4b4721ce7
+  data.tar.gz: 4b60552e08b14ce5e124dde66329d74983abf5306b9aa4e4e0ae66414fc42a16
 SHA512:
-  metadata.gz: 51662e560022e916c3b2e7254cb9dcc4ec331468f06cc29c47f45ea857c1dc49ded3496b9313a06073848abc782576c46d0bfcd410099ababdc5571a19cccc28
-  data.tar.gz: de5dd05943415b655efc290399417853a68477a81a88c098b4812d908e83a19ff06594dbb143f6b3120a41caca2cbbe8d86ef27a8eee449e2d34bc05b1da5140
+  metadata.gz: 04bdf0ba96f2c3911215d9f611b397a763c1890f7404bff62f050605b017944bb7e820ec2ba13697b7e29a7e007ddeb70324dfba30be6b896bf05f4f4ed1218c
+  data.tar.gz: '08cb0890b0235e1af195a465e9026f8465c5fed46ab1828e78c27f69002720c8a7c0c3ec58c0b6821da12d5ef57013c58a1cf7798435f30067daa84cf6f4c8f8'

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 -->
 

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,17 @@ 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
+      DEFAULTS = {
+        template_variable_presets: nil
+      }.freeze
+
+      settings :title, :description, :definitions, :widgets, :layout_type, :template_variable_presets
 
       defaults(
         description: -> { "" },
         definitions: -> { [] },
         widgets: -> { [] },
+        template_variable_presets: -> { nil },
         id: -> { nil }
       )
 
@@ -33,6 +38,8 @@ module Kennel
         def normalize(expected, actual)
           super
 
+          ignore_default(expected, actual, DEFAULTS)
+
           widgets_pairs(expected, actual).each do |pair|
             # conditional_formats ordering is randomly changed by datadog, compare a stable ordering
             pair.each do |widgets|
@@ -102,6 +109,7 @@ module Kennel
           title: "#{title}#{LOCK}",
           description: description,
           template_variables: render_template_variables,
+          template_variable_presets: template_variable_presets,
           widgets: all_widgets
         }
 
@@ -167,6 +175,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 != presets.sort_by { |p| p[:name] }
       end
 
       def render_definitions

data/lib/kennel/models/monitor.rb

@@ -202,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/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"

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.70.0"
+  VERSION = "1.72.2"
 end

metadata

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