kennel 1.56.0 → 1.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 491e174273f8af94504a4e81d9a2ff7da5820aafe287ea9cb1e78df93d07f0f0
-  data.tar.gz: bf918b4be464d408259e0f8204541a0619d1719670a9843a6e564cc4edc968d1
+  metadata.gz: 7b74c28c8a837145770672b8838930861f8c70355fe32132a234addfc6764f8c
+  data.tar.gz: 896986fa0d5db196515468a6d6b0d81d3cfdd160f65a9616de128f5dad7d1014
 SHA512:
-  metadata.gz: 6ff9000e02764618a7e08c7349f315737778ff7afadf8ca303b7dda8db5648d2bd966412a255e7987ebd2416f8bfd264c3c2979bf143ed0d1f6fdd1a759fc85f
-  data.tar.gz: daf144b7fc436cfb317c4cc298dbbd62d61d252b554261746ed00bcaf5279422bf1a4ab185d45c57974665bc38ebbbf61d0b8e28d8269225c011beb11a451d67
+  metadata.gz: ee5e20d4bc534fc6164ae2da424e59f71266ce6af567d3f55ba047c17eac987af57aec87d5888f0b4f4f4742b818d1ffe612309895689896f1b713428d0defce
+  data.tar.gz: dc1b244a0542b0dc304981450331bbd46b4f0c2961afb072196a000841bb5c32b4467ec2ba45c141570b4a10d37f66cda2a729dd14948515717314d0fe54268b

data/lib/kennel.rb

@@ -20,8 +20,9 @@ require "kennel/models/base"
 require "kennel/models/record"
 
 # records
-require "kennel/models/monitor"
 require "kennel/models/dashboard"
+require "kennel/models/monitor"
+require "kennel/models/slo"
 
 # settings
 require "kennel/models/project"

data/lib/kennel/api.rb

@@ -8,7 +8,8 @@ module Kennel
     end
 
     def show(api_resource, id, params = {})
-      request :get, "/api/v1/#{api_resource}/#{id}", params: params
+      reply = request :get, "/api/v1/#{api_resource}/#{id}", params: params
+      api_resource == "slo" ? reply[:data] : reply
     end
 
     def list(api_resource, params = {})
@@ -16,7 +17,8 @@ module Kennel
     end
 
     def create(api_resource, attributes)
-      request :post, "/api/v1/#{api_resource}", body: attributes
+      reply = request :post, "/api/v1/#{api_resource}", body: attributes
+      api_resource == "slo" ? reply[:data].first : reply
     end
 
     def update(api_resource, id, attributes)

data/lib/kennel/importer.rb

@@ -107,7 +107,9 @@ module Kennel
 
             "\n#{pretty}\n  "
           elsif k == :message
-            "\n    <<~TEXT\n#{v.each_line.map { |l| l.strip.empty? ? "\n" : "      #{l}" }.join}\n    TEXT\n  "
+            "\n    <<~TEXT\n#{v.each_line.map { |l| l.strip.empty? ? "\n" : "      #{l}" }.join}\n      \#{super()}\n    TEXT\n  "
+          elsif k == :tags
+            " super() + #{v.inspect} "
           else
             " #{v.inspect} "
           end

data/lib/kennel/models/dashboard.rb

@@ -33,6 +33,14 @@ module Kennel
           super
 
           base_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.dig(1, :widgets)&.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 |b|
               b[:widgets]&.each do |w|
@@ -100,6 +108,10 @@ module Kennel
             if (id = definition[:alert_id]) && tracking_id?(id)
               definition[:alert_id] = resolve_link(id, id_map, force: false).to_s
             end
+          when "slo"
+            if (id = definition[:slo_id]) && tracking_id?(id)
+              definition[:slo_id] = resolve_link(id, id_map, force: false).to_s
+            end
           end
         end
       end

data/lib/kennel/models/monitor.rb

@@ -101,8 +101,6 @@ module Kennel
         @as_json = data
       end
 
-      # resolve composite monitors ... only works when referenced monitors already exist
-      # since leaving names or bad ids in the query breaks the monitor update
       def resolve_linked_tracking_ids(id_map)
         if as_json[:type] == "composite"
           as_json[:query] = as_json[:query].gsub(/%\{(.*?)\}/) do

data/lib/kennel/models/record.rb

@@ -5,7 +5,7 @@ module Kennel
       LOCK = "\u{1F512}"
       READONLY_ATTRIBUTES = [
         :deleted, :matching_downtimes, :id, :created, :created_at, :creator, :org_id, :modified,
-        :overall_state_modified, :overall_state, :api_resource
+        :modified_at, :overall_state_modified, :overall_state, :api_resource
       ].freeze
       REQUEST_DEFAULTS = {
         style: { width: "normal", palette: "dog_classic", type: "solid" },

data/lib/kennel/models/slo.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+module Kennel
+  module Models
+    class Slo < Record
+      READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [:type_id, :monitor_tags]
+      API_LIST_INCOMPLETE = false
+      DEFAULTS = {
+        description: nil,
+        query: nil,
+        monitor_ids: []
+      }.freeze
+
+      settings :id, :type, :description, :thresholds, :query, :tags, :monitor_ids, :monitor_tags, :kennel_id, :name
+
+      defaults(
+        id: -> { nil },
+        tags: -> { @project.tags },
+        query: -> { DEFAULTS.fetch(:query) },
+        description: -> { DEFAULTS.fetch(:description) },
+        monitor_ids: -> { DEFAULTS.fetch(:monitor_ids) }
+      )
+
+      def as_json
+        return @as_json if @as_json
+        data = {
+          name: "#{name}#{LOCK}",
+          description: description,
+          thresholds: thresholds,
+          monitor_ids: monitor_ids,
+          tags: tags,
+          type: type
+        }
+
+        data[:query] = query if query
+        data[:id] = id if id
+
+        @as_json = data
+      end
+
+      def self.api_resource
+        "slo"
+      end
+
+      def url(id)
+        Utils.path_to_url "/slo?slo_id=#{id}"
+      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, id_map, force: true) : id
+        end
+      end
+
+      def self.normalize(expected, actual)
+        super
+
+        # remove readonly values
+        actual[:thresholds]&.each do |threshold|
+          threshold.delete(:warning_display)
+          threshold.delete(:target_display)
+        end
+
+        # tags come in a semi-random order and order is never updated
+        expected[:tags]&.sort!
+        actual[:tags].sort!
+
+        ignore_default(expected, actual, DEFAULTS)
+      end
+    end
+  end
+end

data/lib/kennel/syncer.rb

@@ -71,28 +71,28 @@ module Kennel
       Progress.progress "Diffing" do
         filter_by_project! actual
 
-        details_cache do |cache|
-          items = actual.map do |a|
-            e = matching_expected(a)
-            if e && @expected.delete(e)
-              [e, a]
-            else
-              [nil, a]
-            end
+        items = actual.map do |a|
+          e = matching_expected(a)
+          if e && @expected.delete(e)
+            [e, a]
+          else
+            [nil, a]
           end
+        end
 
+        details_cache do |cache|
           # fill details of things we need to compare (only do this part in parallel for safety & balancing)
           Utils.parallel(items.select { |e, _| e && e.class::API_LIST_INCOMPLETE }) { |_, a| fill_details(a, cache) }
+        end
 
-          # pick out things to update or delete
-          items.each do |e, a|
-            id = a.fetch(:id)
-            if e
-              diff = e.diff(a)
-              @update << [id, e, a, diff] if diff.any?
-            elsif tracking_id(a) # was previously managed
-              @delete << [id, nil, a]
-            end
+        # pick out things to update or delete
+        items.each do |e, a|
+          id = a.fetch(:id)
+          if e
+            diff = e.diff(a)
+            @update << [id, e, a, diff] if diff.any?
+          elsif tracking_id(a) # was previously managed
+            @delete << [id, nil, a]
           end
         end
 
@@ -113,7 +113,7 @@ module Kennel
 
     # dashes are nested, others are not
     def unnest(api_resource, result)
-      result[api_resource.to_sym] || result
+      result[api_resource.to_sym] || result[:data] || result
     end
 
     def details_cache(&block)
@@ -124,7 +124,7 @@ module Kennel
     def download_definitions
       Utils.parallel(Models::Record.subclasses.map(&:api_resource)) do |api_resource|
         results = @api.list(api_resource, with_downtimes: false) # lookup monitors without adding unnecessary downtime information
-        results = results[results.keys.first] if results.is_a?(Hash) # dashes/screens are nested in {dash: {}}
+        results = results[results.keys.first] if results.is_a?(Hash) # dashboards are nested in {dashboards: []}
         results.each { |c| c[:api_resource] = api_resource } # store api resource for later diffing
       end.flatten(1)
     end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.56.0
+  version: 1.57.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -69,6 +69,7 @@ files:
 - lib/kennel/models/monitor.rb
 - lib/kennel/models/project.rb
 - lib/kennel/models/record.rb
+- lib/kennel/models/slo.rb
 - lib/kennel/models/team.rb
 - lib/kennel/optional_validations.rb
 - lib/kennel/progress.rb