kennel 1.29.2 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 229f19e47fa5fc86a83edd798e20daa9b9d92ac6ad768cef2b7dc368b30a8221
-  data.tar.gz: 2b1adf572d3aa78b7a69942dc624cf2ef516b24c00213ad61b0662ae2f815c06
+  metadata.gz: 55d07417188bb69c72a8f7129b3ce9f511dd65194e2205abf72f5b0b83f10f84
+  data.tar.gz: c45f228ccccd085fd93083c6cad65d6f6695c9f7ec4193ce14055fa05746c88d
 SHA512:
-  metadata.gz: 12ebf47095ee170975cf6ca11b6b14440504bdaf94f16d7d59408923552c52a2d70f18a7972b6af1de2bafa3b87d209d61cb0ef248fcb1ac558e0e8110abf2e4
-  data.tar.gz: 3ac2807816386dd5574c09a68504b7640ab984ae9426cc0d5a03c49df36d403e752c731370451fec65d0af53eb82abc7ce042cef2ca224b7ccb8e09fc2bd7918
+  metadata.gz: f516120e702ea779bd61ed025fafbb5bcb22282f35ed4cc837622c73c5abe4e72ede39cf0a10cf536000a4d333be5cd6620f6fc47392c061c1f5ca61d27c8094
+  data.tar.gz: 4480905ca7260a493ba626555a388299ca4f490b2078f936316443cc57a3e673a45792aa3108cf0bac8490f4239a10f625090d0bea22be9ef75bb00a5a5e92e8

data/lib/kennel/models/monitor.rb

@@ -8,7 +8,7 @@ module Kennel
       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
-      NON_MULTI_TYPES = ["query alert", "log alert", "composite"].freeze # NOTE: event alerts don't seem to return their multi setting
+      READONLY_ATTRIBUTES = Base::READONLY_ATTRIBUTES + [:multi]
       MONITOR_DEFAULTS = {
         escalation_message: nil,
         evaluation_delay: nil,
@@ -17,7 +17,7 @@ module Kennel
 
       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, :multi, :critical_recovery, :warning_recovery, :require_full_window,
+        :ok, :id, :no_data_timeframe, :notify_no_data, :notify_audit, :tags, :critical_recovery, :warning_recovery, :require_full_window,
         :threshold_windows
       )
       defaults(
@@ -33,7 +33,6 @@ module Kennel
         tags: -> { @project.tags },
         timeout_h: -> { 0 },
         evaluation_delay: -> { nil },
-        multi: -> { !NON_MULTI_TYPES.include?(type) || query.include?(" by ") },
         critical_recovery: -> { nil },
         warning_recovery: -> { nil },
         threshold_windows: -> { nil }
@@ -54,7 +53,6 @@ module Kennel
           query: query.strip,
           message: message.strip,
           tags: tags.uniq,
-          multi: multi,
           options: {
             timeout_h: timeout_h,
             notify_no_data: notify_no_data,

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.29.2
+  version: 1.30.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday