kennel 1.44.3 → 1.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82488fef0ae45c53bb50527a0c4b2f8505e7351b92ac93da52ad55116a24cb05
-  data.tar.gz: 1f37533c21b572a27156970599c47e4be9de463145c45ebfc2ec2d0b0f10eea8
+  metadata.gz: ee0eb25c1eeee5339b2c15799af781497ff2b3725c81232ec022e875c8a74662
+  data.tar.gz: df97a57586b6a096c1a08a6c97eb3dc6af45ff9915d3bb611d943dc9a4388b33
 SHA512:
-  metadata.gz: d92161b6b85b7a3f248e8419211f4c6ec135e7bd94d09cf3307d99682c711cc4fd6f1ec08bdc6c14853d33deaefe3f25ac7d339e858939cba78d698e8a6b0c5f
-  data.tar.gz: 55c31707217384ee4c182ceab20015f6685854a864a0aad4dcb794b298905732d8e3bfc2c863c27aff68e4a661a46bd02e7f25610a68edb760bb4a434972fd95
+  metadata.gz: ac7738e1a4b05d806829f61a5f7ecda1b46d148d73247af9a161a976e7c7a35d5086ccef49c24da35b973bb2a13fef51523edda741733521f3ef79889d40157d
+  data.tar.gz: 66d620fe6f03d72cf5cf7d4b6a122941e761c1906a0dd8cbbada22dd7fdb8387476a374da3dfa92d59a06c5bacb83322ea4f9a3b643c4d6c711b54610becb7aa

data/Readme.md

@@ -167,7 +167,7 @@ To link to existing monitors via their kennel_id
  - figure out project name by converting the class name to snake-case
  - run `PROJECT=foo bundle exec rake kennel:update_datadog` to test changes for a single project
 
-### Listing umuted alerts
+### Listing un-muted alerts
 
 Run `rake kennel:alerts TAG=service:my-service` to see all un-muted alerts for a given datadog monitor tag.
 

data/lib/kennel.rb

@@ -21,7 +21,6 @@ require "kennel/models/base"
 require "kennel/models/monitor"
 require "kennel/models/dash"
 require "kennel/models/dashboard"
-require "kennel/models/screen"
 
 # settings
 require "kennel/models/project"

data/lib/kennel/syncer.rb

@@ -123,7 +123,6 @@ module Kennel
       Utils.parallel(api_resources.compact.uniq) 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.each { |r| r[:id] = Integer(r[:id]) if r[:id] =~ /\A\d+\z/ } # screen ids are integers as strings
         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.44.3"
+  VERSION = "1.45.0"
 end

data/template/Readme.md

@@ -149,7 +149,7 @@ To link to existing monitors via their kennel_id
  - figure out project name by converting the class name to snake-case
  - run `PROJECT=foo bundle exec rake kennel:update_datadog` to test changes for a single project
 
-### Listing umuted alerts
+### Listing un-muted alerts
 
 Run `rake kennel:alerts TAG=service:my-service` to see all un-muted alerts for a given datadog monitor tag.
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.44.3
+  version: 1.45.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -69,7 +69,6 @@ files:
 - lib/kennel/models/dashboard.rb
 - lib/kennel/models/monitor.rb
 - lib/kennel/models/project.rb
-- lib/kennel/models/screen.rb
 - lib/kennel/models/team.rb
 - lib/kennel/optional_validations.rb
 - lib/kennel/progress.rb

data/lib/kennel/models/screen.rb

@@ -1,173 +0,0 @@
-# frozen_string_literal: true
-module Kennel
-  module Models
-    class Screen < Base
-      include TemplateVariables
-      include OptionalValidations
-
-      API_LIST_INCOMPLETE = true
-      COPIED_WIDGET_VALUES = [:board_id, :isShared].freeze
-      WIDGET_DEFAULTS = {
-        time: {},
-        timeframe: "1h"
-      }.freeze
-      READONLY_ATTRIBUTES = (Base::READONLY_ATTRIBUTES + [
-        :disableCog,
-        :disableEditing,
-        :isIntegration,
-        :isShared,
-        :original_title,
-        :read_only,
-        :resource,
-        :title,
-        :title_edited,
-        :created_by,
-        :board_bgtype,
-        :height,
-        :width,
-        :showGlobalTimeOnboarding,
-        :originalHeight,
-        :originalWidth,
-        :new_id
-      ]).freeze
-      SCREEN_DEFAULTS = { template_variables: [] }.freeze
-
-      settings :id, :board_title, :description, :widgets, :kennel_id
-
-      defaults(
-        description: -> { "" },
-        widgets: -> { [] },
-        id: -> { nil }
-      )
-
-      attr_reader :project
-
-      def initialize(project, *args)
-        @project = project
-        super(*args)
-      end
-
-      def self.api_resource
-        "screen"
-      end
-
-      def as_json
-        return @json if @json
-        @json = {
-          id: id,
-          board_title: "#{board_title}#{LOCK}",
-          description: description,
-          widgets: render_widgets,
-          template_variables: render_template_variables
-        }
-
-        validate_json(@json) if validate
-
-        @json
-      end
-
-      def self.normalize(expected, actual)
-        super
-
-        (actual[:widgets] || []).each do |w|
-          # api randomly returns time.live_span or timeframe or empty time hash
-          if w.dig(:time, :live_span)
-            w[:timeframe] = w[:time].delete(:live_span)
-          end
-
-          COPIED_WIDGET_VALUES.each { |v| w.delete v }
-        end
-
-        ignore_default expected, actual, SCREEN_DEFAULTS
-        ignore_defaults expected[:widgets], actual[:widgets], WIDGET_DEFAULTS
-        ignore_request_defaults expected, actual, :widgets, :tile_def
-      end
-
-      def url(id)
-        Utils.path_to_url "/screen/#{id}"
-      end
-
-      def resolve_linked_tracking_ids(id_map)
-        as_json[:widgets].each do |widget|
-          case widget[:type]
-          when "uptime"
-            resolve_link(widget, [:monitor, :id], id_map)
-          when "alert_graph"
-            resolve_link(widget, [:alert_id], id_map)
-          end
-        end
-      end
-
-      private
-
-      def validate_json(data)
-        super
-
-        # check for fields that are unsettable
-        data[:widgets].each do |w|
-          COPIED_WIDGET_VALUES.each do |ignored|
-            if w.key?(ignored)
-              invalid! "remove definition #{ignored}, it is unsettable and will always produce a diff"
-            end
-          end
-        end
-      end
-
-      def render_widgets
-        widgets.map do |widget|
-          widget = widget_defaults(widget[:type]).merge(widget)
-          if tile = widget[:tile_def]
-            tile[:autoscale] = true unless widget[:tile_def].key?(:autoscale) # TODO: use ignore_default
-          end
-          widget
-        end
-      end
-
-      def widget_defaults(type)
-        basics = {
-          title_size: 16,
-          title_align: "left",
-          height: 20,
-          width: 30
-        }
-
-        custom =
-          case type
-          when "free_text"
-            {
-              font_size: "auto",
-              text_align: "left",
-              title_text: "",
-              title: true,
-              color: "#4d4d4d"
-            }
-          when "timeseries"
-            {
-              title: true,
-              legend: false,
-              legend_size: "0"
-            }
-          else
-            {}
-          end
-
-        basics.merge(custom)
-      end
-
-      def resolve_link(widget, key, id_map)
-        id = widget.dig(*key)
-        return unless tracking_id?(id)
-
-        *id_path, id_key = key
-        monitor_path = (id_path.empty? ? widget : widget.dig(*id_path))
-        monitor_path[id_key] =
-          id_map[id] ||
-          Kennel.err.puts("Unable to find #{id} in existing monitors (they need to be created first to link them)")
-      end
-
-      def tracking_id?(id)
-        id.is_a?(String) && !id.match?(/\A\d+\z/)
-      end
-    end
-  end
-end