kennel 1.57.0 → 1.58.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b74c28c8a837145770672b8838930861f8c70355fe32132a234addfc6764f8c
-  data.tar.gz: 896986fa0d5db196515468a6d6b0d81d3cfdd160f65a9616de128f5dad7d1014
+  metadata.gz: 27642045f1b97eac7f2a3184ccc0988a090ac9d4ad3d530120dc614a2b4e5670
+  data.tar.gz: 1f7d6b79d90b4fd1a5a76194af9a5c856920b190fbe0aa50b86499414976003e
 SHA512:
-  metadata.gz: ee5e20d4bc534fc6164ae2da424e59f71266ce6af567d3f55ba047c17eac987af57aec87d5888f0b4f4f4742b818d1ffe612309895689896f1b713428d0defce
-  data.tar.gz: dc1b244a0542b0dc304981450331bbd46b4f0c2961afb072196a000841bb5c32b4467ec2ba45c141570b4a10d37f66cda2a729dd14948515717314d0fe54268b
+  metadata.gz: cbd7460160bbb5e65fb1d509a1d0f9eee36229b895591f1555a1e972a2add145646fe24e3956f663bb2b0c501592cdb4a3b52b788d3811210b98a515a0d4658e
+  data.tar.gz: 2f896e594c59774d29d4273b885a0e4ee7ace8dcad4d3a16621d606a5b64bdb4da5ca75bb2afe52b1a137fe0d14cb46a62aa41c771830c868d3b38019a3881a2

data/lib/kennel/models/dashboard.rb

@@ -15,7 +15,7 @@ module Kennel
       }.freeze
       SUPPORTED_DEFINITION_OPTIONS = [:events, :markers, :precision].freeze
 
-      settings :id, :title, :description, :definitions, :widgets, :kennel_id, :layout_type
+      settings :title, :description, :definitions, :widgets, :layout_type
 
       defaults(
         description: -> { "" },

data/lib/kennel/models/monitor.rb

@@ -4,11 +4,12 @@ module Kennel
     class Monitor < Record
       include OptionalValidations
 
-      API_LIST_INCOMPLETE = false
       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
       OPTIONAL_SERVICE_CHECK_THRESHOLDS = [:ok, :warning].freeze
-      READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [:multi]
+      READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [
+        :multi, :matching_downtimes, :overall_state_modified, :overall_state
+      ]
 
       # defaults that datadog uses when options are not sent, so safe to leave out if our values match their defaults
       MONITOR_OPTION_DEFAULTS = {
@@ -21,8 +22,8 @@ module Kennel
       DEFAULT_ESCALATION_MESSAGE = ["", nil].freeze
 
       settings(
-        :query, :name, :message, :escalation_message, :critical, :kennel_id, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
-        :ok, :id, :no_data_timeframe, :notify_no_data, :notify_audit, :tags, :critical_recovery, :warning_recovery, :require_full_window,
+        :query, :name, :message, :escalation_message, :critical, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
+        :ok, :no_data_timeframe, :notify_no_data, :notify_audit, :tags, :critical_recovery, :warning_recovery, :require_full_window,
         :threshold_windows, :new_host_delay
       )
 

data/lib/kennel/models/record.rb

@@ -4,18 +4,20 @@ module Kennel
     class Record < Base
       LOCK = "\u{1F512}"
       READONLY_ATTRIBUTES = [
-        :deleted, :matching_downtimes, :id, :created, :created_at, :creator, :org_id, :modified,
-        :modified_at, :overall_state_modified, :overall_state, :api_resource
+        :deleted, :id, :created, :created_at, :creator, :org_id, :modified, :modified_at, :api_resource
       ].freeze
       REQUEST_DEFAULTS = {
         style: { width: "normal", palette: "dog_classic", type: "solid" },
         conditional_formats: [],
         aggregator: "avg"
       }.freeze
+      API_LIST_INCOMPLETE = false
 
       class ValidationError < RuntimeError
       end
 
+      settings :id, :kennel_id
+
       class << self
         private
 
@@ -56,6 +58,7 @@ module Kennel
       attr_reader :project
 
       def initialize(project, *args)
+        raise ArgumentError, "First argument must be a project, not #{project.class}" unless project.is_a?(Project)
         @project = project
         super(*args)
       end

data/lib/kennel/models/slo.rb

@@ -3,23 +3,31 @@ 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: []
+        monitor_ids: [],
+        thresholds: []
       }.freeze
 
-      settings :id, :type, :description, :thresholds, :query, :tags, :monitor_ids, :monitor_tags, :kennel_id, :name
+      settings :type, :description, :thresholds, :query, :tags, :monitor_ids, :monitor_tags, :name
 
       defaults(
         id: -> { nil },
         tags: -> { @project.tags },
         query: -> { DEFAULTS.fetch(:query) },
         description: -> { DEFAULTS.fetch(:description) },
-        monitor_ids: -> { DEFAULTS.fetch(:monitor_ids) }
+        monitor_ids: -> { DEFAULTS.fetch(:monitor_ids) },
+        thresholds: -> { DEFAULTS.fetch(:thresholds) }
       )
 
+      def initialize(*)
+        super
+        if thresholds.any? { |t| t[:warning] && t[:warning].to_f <= t[:critical].to_f }
+          raise ValidationError, "Threshold warning must be greater-than critical value"
+        end
+      end
+
       def as_json
         return @as_json if @as_json
         data = {
@@ -47,7 +55,7 @@ module Kennel
 
       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
+          id.is_a?(String) ? resolve_link(id, id_map, force: false) || 1 : id
         end
       end
 

data/lib/kennel/tasks.rb

@@ -4,12 +4,23 @@ require "kennel"
 require "kennel/unmuted_alerts"
 require "kennel/importer"
 
+module Kennel
+  module Tasks
+    class << self
+      def abort(message = nil)
+        Kennel.err.puts message if message
+        raise SystemExit.new(1), message
+      end
+    end
+  end
+end
+
 namespace :kennel do
   desc "Ensure there are no uncommited changes that would be hidden from PR reviewers"
   task no_diff: :generate do
     result = `git status --porcelain`.strip
-    abort "Diff found:\n#{result}\nrun `rake generate` and commit the diff to fix" unless result == ""
-    abort "Error during diffing" unless $CHILD_STATUS.success?
+    Kennel::Tasks.abort "Diff found:\n#{result}\nrun `rake generate` and commit the diff to fix" unless result == ""
+    Kennel::Tasks.abort "Error during diffing" unless $CHILD_STATUS.success?
   end
 
   # ideally do this on every run, but it's slow (~1.5s) and brittle (might not find all + might find false-positives)
@@ -38,7 +49,7 @@ namespace :kennel do
       url = (subdomain ? "https://zendesk.datadoghq.com" : "") + "/account/settings"
       puts "Invalid mentions found, either ignore them by adding to `KNOWN` env var or add them via #{url}"
       bad.each { |f, v| puts "Invalid mention #{v} in monitor message of #{f}" }
-      abort
+      Kennel::Tasks.abort
     end
   end
 
@@ -76,16 +87,16 @@ namespace :kennel do
 
   desc "show unmuted alerts filtered by TAG, for example TAG=team:foo"
   task alerts: :environment do
-    tag = ENV["TAG"] || abort("Call with TAG=foo:bar")
+    tag = ENV["TAG"] || Kennel::Tasks.abort("Call with TAG=foo:bar")
     Kennel::UnmutedAlerts.print(Kennel.send(:api), tag)
   end
 
   desc "show monitors with no data by TAG, for example TAG=team:foo"
   task nodata: :environment do
-    tag = ENV["TAG"] || abort("Call with TAG=foo:bar")
+    tag = ENV["TAG"] || Kennel::Tasks.abort("Call with TAG=foo:bar")
     monitors = Kennel.send(:api).list("monitor", monitor_tags: tag, group_states: "no data")
     monitors.select! { |m| m[:overall_state] == "No Data" }
-    monitors.reject! { |m| m[:tags].include? ["nodata:ignore"] }
+    monitors.reject! { |m| m[:tags].include? "nodata:ignore" }
     if monitors.any?
       Kennel.err.puts <<~TEXT
         This is a useful task to find monitors that have mis-spelled metrics or never received data at any time.
@@ -103,8 +114,8 @@ namespace :kennel do
 
   desc "Convert existing resources to copy-pastable definitions to import existing resources RESOURCE=dash ID=1234"
   task import: :environment do
-    resource = ENV["RESOURCE"] || abort("Call with RESOURCE=dash") # TODO: add others
-    id = ENV["ID"] || abort("Call with ID=1234")
+    resource = ENV["RESOURCE"] || Kennel::Tasks.abort("Call with RESOURCE=dash") # TODO: add others
+    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)
   end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.57.0
+  version: 1.58.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday