kennel 1.37.0 → 1.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bf1bff85597080daf90caa450fecb57f9ca8341e8614406af63152f6e4df7c2
-  data.tar.gz: 357fc17fcd3a0dd9dd609882af10cd7aeb5f01be0e55b59a9fc684a42ac9bddd
+  metadata.gz: 5a96e8b2291bb1c3d4c1ab62a60fc77615a6b950edde80a44a33163b98cfc52c
+  data.tar.gz: e95efb468b68784b0411f9bb773c6ed733219ba74980e5afe9a724c7902193d8
 SHA512:
-  metadata.gz: 5b50a7f5530b6db9f3df7f8bc994df714ea54e6f024edde3f5b375dcb0d4930aa7a5ba3034e8031babf59f3c6bbb3afa77b4872cc4073e99f153585c6446f868
-  data.tar.gz: 393619de9576f30173fd55c9a43bc61d3f71f1785f098a76812b7c0497e8ffebccb24dc6eae46ddcb0635daf2401e746898c07df188c70085abc3e80ca66ed49
+  metadata.gz: 534e2b021f1e88000e08a514339e02540686031aa7b91d6624f195d5f6adc28f88939c39894ce9276187619c728ecc3d1775638c03eb06f9011c8392db8050df
+  data.tar.gz: 4ec6f62c45ab64bb111cee7302cd2f6c08ea5fdfcb24204af0ecbde0fe9485bb554fb89b609bfb5f779b028c9189bd4c85638d487f77c071e803a0d7084ab444

data/lib/kennel/models/monitor.rb

@@ -69,31 +69,32 @@ module Kennel
             escalation_message: Utils.presence(escalation_message.strip),
             evaluation_delay: evaluation_delay,
             locked: false, # setting this to true prevents any edit and breaks updates when using replace workflow
-            renotify_interval: renotify_interval || 0,
-            thresholds: {}
+            renotify_interval: renotify_interval || 0
           }
         }
 
         options = data[:options]
-        thresholds = options[:thresholds]
-        thresholds[:critical] = critical unless type == "composite"
+        if data.fetch(:type) != "composite"
+          thresholds = (options[:thresholds] = { critical: critical })
 
-        data[:id] = id if id
+          data[:id] = id if id
 
-        # warning, ok, critical_recovery, and warning_recovery are optional
-        [:warning, :ok, :critical_recovery, :warning_recovery].each do |key|
-          if value = send(key)
-            thresholds[key] = value
+          # warning, ok, critical_recovery, and warning_recovery are optional
+          [:warning, :ok, :critical_recovery, :warning_recovery].each do |key|
+            if value = send(key)
+              thresholds[key] = value
+            end
           end
-        end
 
-        case data.fetch(:type)
-        when "service check"
-          # avoid diff for default values of 1
-          OPTIONAL_SERVICE_CHECK_THRESHOLDS.each { |t| thresholds[t] ||= 1 }
-        when "query alert"
-          # metric and query values are stored as float by datadog
-          thresholds.each { |k, v| thresholds[k] = Float(v) }
+          thresholds[:critical] = critical unless
+          case data.fetch(:type)
+          when "service check"
+            # avoid diff for default values of 1
+            OPTIONAL_SERVICE_CHECK_THRESHOLDS.each { |t| thresholds[t] ||= 1 }
+          when "query alert"
+            # metric and query values are stored as float by datadog
+            thresholds.each { |k, v| thresholds[k] = Float(v) }
+          end
         end
 
         if windows = threshold_windows
@@ -166,7 +167,7 @@ module Kennel
         end
 
         # verify query includes critical value
-        if query_value = data.fetch(:query)[/\s*[<>]\s*(\d+(\.\d+)?)\s*$/, 1]
+        if query_value = data.fetch(:query)[/\s*[<>]=?\s*(\d+(\.\d+)?)\s*$/, 1]
           if Float(query_value) != Float(data.dig(:options, :thresholds, :critical))
             invalid! "critical and value used in query must match"
           end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.37.0
+  version: 1.37.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday