kennel 1.66.1 → 1.69.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97bb44fcc344bb6e906a6cd364ccbd8e00cdbe499257b349ed3b30190087fa58
-  data.tar.gz: 17db69d7a4de5599aed07dac93db2563943be29bfa456099f330efd5f0dc2c55
+  metadata.gz: daadbdb69c86de7a0dcdec2bc1eeaedd4b0c2221e2059d241db57e717a8876b6
+  data.tar.gz: 1d93147d3d88468564c6c9fcfd0a1fa3926df23d44961b876273e24ac642c851
 SHA512:
-  metadata.gz: 7385074e9d4d3b2e1868f501d74850510f9e6412474a55b8bb3b863c637e02bd4ca2ba065429c1566b86044ef66978e4e4aabff25bb6a3501d22cf388c009f79
-  data.tar.gz: 62c6acd58e137e577016e8f79b690a85ab9637ffab527382e94fdbf07cd752b767371ed468e9413f154c0d8dd61198c105be37a968b86ce814013d84c5ba86c1
+  metadata.gz: 7737e951ba0e6f34bdec5c4c000e64852acfcc1939d19385a7a92d9b88821c5d6efe0f29f1d8a292692c3ae8b85bd248af0f05ed3e591595da5d2ee41382fd37
+  data.tar.gz: 62989fb72a5bc60f052449ecf4d380f59f7e945a8d1857e7f3e789549d8625eac8ffd51c2a946b4f0367cd2d439b2ecb02eb99f79cb42202bb020dadf8a6b612

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
@@ -198,7 +199,7 @@ module Kennel
           allowed = data.fetch(:query)[/by\s*{([^\}]+)}/, 1].to_s.split(/\s*,\s*/)
           unsupported = used - allowed
           if unsupported.any?
-            invalid! "is_match used with unsupported dimensions #{unsupported}, allowed dimensions are #{allowed}"
+            invalid! "is_match used with #{unsupported}, but metric is only grouped by #{allowed}"
           end
         end
       end

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

@@ -19,6 +19,7 @@ module Kennel
       end
       @expected.each { |e| add_tracking_id e }
       calculate_diff
+      prevent_irreversible_partial_updates
     end
 
     def plan
@@ -42,7 +43,6 @@ module Kennel
         Kennel.out.puts "Created #{e.class.api_resource} #{tracking_id(e.as_json)} #{e.url(reply.fetch(:id))}"
       end
 
-      block_irreversible_partial_updates
       @update.each do |id, e|
         @api.update e.class.api_resource, id, e.as_json
         Kennel.out.puts "Updated #{e.class.api_resource} #{tracking_id(e.as_json)} #{e.url(id)}"
@@ -151,7 +151,7 @@ module Kennel
       return if list.empty?
       list.each do |_, e, a, diff|
         api_resource = (e ? e.class.api_resource : a.fetch(:api_resource))
-        Kennel.out.puts Utils.color(color, "#{step} #{api_resource} #{tracking_id(e&.as_json || a)}")
+        Kennel.out.puts Utils.color(color, "#{step} #{api_resource} #{e&.tracking_id || tracking_id(a)}")
         print_diff(diff) if diff # only for update
       end
     end
@@ -159,12 +159,12 @@ module Kennel
     def print_diff(diff)
       diff.each do |type, field, old, new|
         if type == "+"
-          temp = new.inspect
-          new = old.inspect
+          temp = Utils.pretty_inspect(new)
+          new = Utils.pretty_inspect(old)
           old = temp
         else # ~ and -
-          old = old.inspect
-          new = new.inspect
+          old = Utils.pretty_inspect(old)
+          new = Utils.pretty_inspect(new)
         end
 
         if (old + new).size > 100
@@ -177,18 +177,30 @@ module Kennel
       end
     end
 
-    def block_irreversible_partial_updates
+    # Do not add tracking-id when working with existing ids on a branch,
+    # so resource do not get deleted from merges to master.
+    # Also make sure the diff still makes sense, by kicking out the now noop-update.
+    #
+    # Note: ideally we'd never add tracking in the first place, but at that point we do not know the diff yet
+    def prevent_irreversible_partial_updates
       return unless @project_filter
-      return if @update.none? do |_, e, _, diff|
-        e.id && diff.any? do |_, field, old, new = nil|
-          TRACKING_FIELDS.include?(field.to_sym) && tracking_value(old) != tracking_value(new)
+      @update.select! do |_, e, _, diff|
+        next true unless e.id # short circuit for performance
+
+        diff.select! do |field_diff|
+          (_, field, old, new) = field_diff
+          next true unless tracking_field?(field)
+
+          if (old_tracking = tracking_value(old))
+            old_tracking == tracking_value(new) || raise("do not update! (atm unreachable)")
+          else
+            field_diff[3] = remove_tracking_id(e) # make plan output match update
+            old != field_diff[3]
+          end
         end
+
+        !diff.empty?
       end
-      raise <<~TEXT
-        Updates with PROJECT= filter should not update tracking id in #{TRACKING_FIELDS.join("/")} of resources with a set `id:`,
-        since this makes them get deleted by a full update.
-        Remove the `id:` to test them out, which will result in a copy being created and later deleted.
-      TEXT
     end
 
     def resolve_linked_tracking_ids(actual)
@@ -212,6 +224,13 @@ module Kennel
       json[field] = "#{json[field]}\n-- Managed by kennel #{e.tracking_id} in #{e.project.class.file_location}, do not modify manually".lstrip
     end
 
+    def remove_tracking_id(e)
+      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}")
+    end
+
     def tracking_id(a)
       tracking_value a[tracking_field(a)]
     end
@@ -223,5 +242,9 @@ module Kennel
     def tracking_field(a)
       TRACKING_FIELDS.detect { |f| a.key?(f) }
     end
+
+    def tracking_field?(field)
+      TRACKING_FIELDS.include?(field.to_sym)
+    end
   end
 end

data/lib/kennel/tasks.rb

@@ -130,6 +130,14 @@ namespace :kennel do
     require "kennel"
     gem "dotenv"
     require "dotenv"
-    Dotenv.load
+    source = ".env"
+
+    # warn when users have things like DATADOG_TOKEN already set and it will not be loaded from .env
+    unless ENV["KENNEL_SILENCE_UPDATED_ENV"]
+      updated = Dotenv.parse(source).select { |k, v| ENV[k] && ENV[k] != v }
+      warn "Environment variables #{updated.keys.join(", ")} need to be unset to be sourced from #{source}" if updated.any?
+    end
+
+    Dotenv.load(source)
   end
 end

data/lib/kennel/utils.rb

@@ -142,6 +142,17 @@ module Kennel
         else []
         end
       end
+
+      # TODO: use awesome-print or similar, but it has too many monkey-patches
+      # https://github.com/amazing-print/amazing_print/issues/36
+      def pretty_inspect(object)
+        string = object.inspect
+        string.gsub!(/:([a-z_]+)=>/, "\\1: ")
+        10.times do
+          string.gsub!(/{(\S.*?\S)}/, "{ \\1 }") || break
+        end
+        string
+      end
     end
   end
 end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.66.1
+  version: 1.69.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent-retry
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 description: 
 email: michael@grosser.it
 executables: []
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Keep datadog monitors/dashboards/etc in version control, avoid chaotic management