kennel 1.24.0 → 1.25.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kennel/models/monitor.rb +5 -4
- data/lib/kennel/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 04415dfd456a6fee8e4c924a8424e352ec56a517c2fd30978d713e6e71ed3fcf
|
4
|
+
data.tar.gz: 3f44e7c4ee40a3b1e7acaef70d7f14bd74e0f7d9ab1466e51ccf3c556a1e392b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7ecab7b149be13704a2e812585fc72344090d7ca77a49c2efe50f3eb3ada40f0e2c9cb677892e2ef4f2746b3db2fe7a138a57266f9b6ae5423b1ee08b1abd660
|
7
|
+
data.tar.gz: 3ebdd13c2e756e4c0a27ed1130844bf5547a5355b432085f6470e047b7318236c5392fbf504a095fac9e1025fea4fe2ba683f8b8465ed2cc308e71627236822b
|
@@ -11,7 +11,7 @@ module Kennel
|
|
11
11
|
NON_MULTI_TYPES = ["query alert", "log alert"].freeze # NOTE: event alerts don't seem to return their multi setting
|
12
12
|
|
13
13
|
settings(
|
14
|
-
:query, :name, :message, :escalation_message, :critical, :kennel_id, :type, :renotify_interval, :warning, :timeout_h,
|
14
|
+
:query, :name, :message, :escalation_message, :critical, :kennel_id, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
|
15
15
|
:ok, :id, :no_data_timeframe, :notify_no_data, :notify_audit, :tags, :multi, :critical_recovery, :warning_recovery, :require_full_window
|
16
16
|
)
|
17
17
|
defaults(
|
@@ -27,7 +27,8 @@ module Kennel
|
|
27
27
|
notify_audit: -> { true },
|
28
28
|
tags: -> { @project.tags },
|
29
29
|
timeout_h: -> { 0 },
|
30
|
-
|
30
|
+
evaluation_delay: -> { nil },
|
31
|
+
multi: -> { !NON_MULTI_TYPES.include?(type) || query.include?(" by ") },
|
31
32
|
critical_recovery: -> { nil },
|
32
33
|
warning_recovery: -> { nil }
|
33
34
|
)
|
@@ -57,7 +58,7 @@ module Kennel
|
|
57
58
|
new_host_delay: 300,
|
58
59
|
include_tags: true,
|
59
60
|
escalation_message: Utils.presence(escalation_message.strip),
|
60
|
-
evaluation_delay:
|
61
|
+
evaluation_delay: evaluation_delay,
|
61
62
|
locked: false, # setting this to true prevents any edit and breaks updates when using replace workflow
|
62
63
|
renotify_interval: renotify_interval || 0,
|
63
64
|
thresholds: {
|
@@ -124,7 +125,7 @@ module Kennel
|
|
124
125
|
end
|
125
126
|
end
|
126
127
|
|
127
|
-
# nil
|
128
|
+
# nil / "" / 0 are not returned from the api when set via the UI
|
128
129
|
options[:evaluation_delay] ||= nil
|
129
130
|
end
|
130
131
|
|
data/lib/kennel/version.rb
CHANGED