kennel 1.64.0 → 1.66.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 371bcfe0f309a53af116ec4b8073ef337c0addf6d949d392486cc7c4165902c5
-  data.tar.gz: 77ddcf3210c004af815a96748c11bb25cbbd7ad2805c0c2dccef2d479f8480eb
+  metadata.gz: 65bf9625be169156f491cb4e987dba3cd1ffa7c4ed4c9875e8a91c6e4ac87c7d
+  data.tar.gz: 3d95cd55b82d4b34c52239509ccd6c0ed57f0147d5494df60b3756df4ad07569
 SHA512:
-  metadata.gz: 2d38d04745a2ff9dd146d9d545131be7e1e94f33d6ce4f0ddc2ac80e3880e6546eb3094e767774fa5f85366c92ad56344ee3223a1c5dea3b363920ec2aa920dd
-  data.tar.gz: 823303375a6d47ec86d0c88e58bffa3afbb6ccfc3380fb03d0d711b8a7f891be107d6d10e244deba69aa5731c1c803b9cef675bd7fca0896de6048bff73808c2
+  metadata.gz: 0c6b78a86ddbf6f9c4d320545f779566270e5f878081c77a5de842e0f10a9821fdf415b6b959c1bef849f27e7fe47901cecac096f972284357b3e5ae49d36b30
+  data.tar.gz: c79b6fbf9adda3958c9d5626e8c7073bcfb0e8b4c3f2d2a29c6931a4d21f205fd4a8609be9236afda97cfe9c5fa0fe4c22b82acbbbf35cf69a3fa294ada59662

data/lib/kennel/api.rb

@@ -43,12 +43,12 @@ module Kennel
     end
 
     def delete(api_resource, id)
-      request :delete, "/api/v1/#{api_resource}/#{id}"
+      request :delete, "/api/v1/#{api_resource}/#{id}", ignore_404: true
     end
 
     private
 
-    def request(method, path, body: nil, params: {})
+    def request(method, path, body: nil, params: {}, ignore_404: false)
       params = params.merge(application_key: @app_key, api_key: @api_key)
       query = Faraday::FlatParamsEncoder.encode(params)
       response = nil
@@ -66,7 +66,7 @@ module Kennel
         Kennel.err.puts "Retrying on server error #{response.status} for #{path}"
       end
 
-      unless response.success?
+      if !response.success? && (response.status != 404 || !ignore_404)
         message = +"Error #{response.status} during #{method.upcase} #{path}\n"
         message << "request:\n#{JSON.pretty_generate(body)}\nresponse:\n" if body
         message << response.body

data/lib/kennel/github_reporter.rb

@@ -7,13 +7,13 @@ module Kennel
     class << self
       def report(token, &block)
         return yield unless token
-        new(token).report(&block)
+        new(token, Utils.capture_sh("git rev-parse HEAD").strip).report(&block)
       end
     end
 
-    def initialize(token)
+    def initialize(token, git_sha)
       @token = token
-      @git_sha = Utils.capture_sh("git rev-parse HEAD").strip
+      @git_sha = git_sha
       origin = ENV["PROJECT_REPOSITORY"] || Utils.capture_sh("git remote -v").split("\n").first
       @repo_part = origin[%r{github\.com[:/](.+?)(\.git|$)}, 1] || raise("no origin found")
     end
@@ -27,8 +27,6 @@ module Kennel
       comment "```\n#{output || "Error"}\n```"
     end
 
-    private
-
     # https://developer.github.com/v3/repos/comments/#create-a-commit-comment
     def comment(body)
       # truncate to maximum allowed comment size for github to avoid 422
@@ -39,6 +37,8 @@ module Kennel
       post "commits/#{@git_sha}/comments", body: body
     end
 
+    private
+
     def post(path, data)
       url = "https://api.github.com/repos/#{@repo_part}/#{path}"
       response = Faraday.post(url, data.to_json, authorization: "token #{@token}")

data/lib/kennel/models/dashboard.rb

@@ -34,14 +34,6 @@ module Kennel
           super
 
           widgets_pairs(expected, actual).each do |pair|
-            # datadog always adds 2 to slo widget height
-            # need to check fir layout since some monitors have height/width in their definition
-            pair[1].each do |widget|
-              if widget.dig(:definition, :type) == "slo" && widget.dig(:layout, :height)
-                widget[:layout][:height] -= 2
-              end
-            end
-
             # conditional_formats ordering is randomly changed by datadog, compare a stable ordering
             pair.each do |widgets|
               widgets.each do |widget|

data/lib/kennel/models/monitor.rb

@@ -5,7 +5,8 @@ module Kennel
       include OptionalValidations
 
       RENOTIFY_INTERVALS = [0, 10, 20, 30, 40, 50, 60, 90, 120, 180, 240, 300, 360, 720, 1440].freeze # minutes
-      QUERY_INTERVALS = ["1m", "5m", "10m", "15m", "30m", "1h", "2h", "4h", "1d"].freeze
+      # 2d and 1w are valid timeframes for anomaly monitors
+      QUERY_INTERVALS = ["1m", "5m", "10m", "15m", "30m", "1h", "2h", "4h", "1d", "2d", "1w"].freeze
       OPTIONAL_SERVICE_CHECK_THRESHOLDS = [:ok, :warning].freeze
       READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [
         :multi, :matching_downtimes, :overall_state_modified, :overall_state, :restricted_roles
@@ -132,7 +133,7 @@ module Kennel
 
         case actual[:type]
         when "event alert"
-          # setting 0 results in thresholds not getting returned from the api
+          # setting nothing results in thresholds not getting returned from the api
           options[:thresholds] ||= { critical: 0 }
 
         when "service check"

data/lib/kennel/models/record.rb

@@ -42,7 +42,10 @@ module Kennel
 
         self.class.send(:normalize, expected, actual)
 
-        HashDiff.diff(actual, expected, use_lcs: false)
+        # strict: ignore Integer vs Float
+        # similarity: show diff when not 100% similar
+        # use_lcs: saner output
+        Hashdiff.diff(actual, expected, use_lcs: false, strict: false, similarity: 1)
       end
 
       def tracking_id

data/lib/kennel/settings_as_methods.rb

@@ -25,8 +25,7 @@ module Kennel
         names.each do |name|
           next if method_defined?(name)
           define_method name do
-            message = "Trying to call #{name} for #{self.class} but it was never set or passed as option"
-            raise_with_location ArgumentError, message
+            raise_with_location ArgumentError, "'#{name}' on #{self.class} was not set or passed as option"
           end
         end
       end

data/lib/kennel/syncer.rb

@@ -3,6 +3,7 @@ module Kennel
   class Syncer
     CACHE_FILE = "tmp/cache/details" # keep in sync with .travis.yml caching
     TRACKING_FIELDS = [:message, :description].freeze
+    DELETE_ORDER = ["dashboard", "slo", "monitor"].freeze # dashboards references monitors + slos, slos reference monitors
 
     def initialize(api, expected, project: nil)
       @api = api
@@ -98,6 +99,8 @@ module Kennel
         ensure_all_ids_found
         @create = @expected.map { |e| [nil, e] }
       end
+
+      @delete.sort_by! { |_, _, a| DELETE_ORDER.index a.fetch(:api_resource) }
     end
 
     # Make diff work even though we cannot mass-fetch definitions

data/lib/kennel/tasks.rb

@@ -111,9 +111,9 @@ namespace :kennel do
     end
   end
 
-  desc "Convert existing resources to copy-pastable definitions to import existing resources RESOURCE=dash ID=1234"
+  desc "Convert existing resources to copy-pastable definitions to import existing resources RESOURCE=[dashboard,monitor,slo] ID=1234"
   task import: :environment do
-    resource = ENV["RESOURCE"] || Kennel::Tasks.abort("Call with RESOURCE=dash") # TODO: add others
+    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)

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.64.0
+  version: 1.66.3
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent-retry
   requirement: !ruby/object:Gem::Requirement