kennel 1.58.4 → 1.60.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kennel.rb +5 -1
- data/lib/kennel/api.rb +3 -1
- data/lib/kennel/models/dashboard.rb +3 -3
- data/lib/kennel/models/monitor.rb +1 -0
- data/lib/kennel/models/project.rb +12 -0
- data/lib/kennel/models/record.rb +13 -7
- data/lib/kennel/models/slo.rb +2 -2
- data/lib/kennel/syncer.rb +3 -8
- data/lib/kennel/tasks.rb +2 -3
- data/lib/kennel/template_variables.rb +4 -1
- data/lib/kennel/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d555de2128376fcfe551b2e7d95dfb724c819adc9f5b401ec155ba2d278607cb
|
4
|
+
data.tar.gz: bfa004cefabf58c7328118878e0cc1ffc10253098a6176b53ce3ae295adc41c6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c02a3b3308a8149e8efb2f014156017dc8e1cf8a5ad06507939f69f807c463f295554cddf48affd07706d0699e5df1a965fb44db2a8cb3459dd97401f511d70d
|
7
|
+
data.tar.gz: 06e3f9c53a1f2d9b7646a0ebc556eb6970957ff700ddcd448869844e46e0fa4564ae91bbc6ab57f5dd7eb713bce351171fbd038399d24de80a177dc7d8e5dee8
|
data/lib/kennel.rb
CHANGED
@@ -29,6 +29,10 @@ require "kennel/models/project"
|
|
29
29
|
require "kennel/models/team"
|
30
30
|
|
31
31
|
module Kennel
|
32
|
+
MISSING_ID = 1
|
33
|
+
class ValidationError < RuntimeError
|
34
|
+
end
|
35
|
+
|
32
36
|
@out = $stdout
|
33
37
|
@err = $stderr
|
34
38
|
|
@@ -68,7 +72,7 @@ module Kennel
|
|
68
72
|
Progress.progress "Generating" do
|
69
73
|
load_all
|
70
74
|
parts = Models::Project.recursive_subclasses.flat_map do |project_class|
|
71
|
-
project_class.new.
|
75
|
+
project_class.new.validated_parts
|
72
76
|
end
|
73
77
|
parts.map(&:tracking_id).group_by { |id| id }.select do |id, same|
|
74
78
|
raise "#{id} is defined #{same.size} times" if same.size != 1
|
data/lib/kennel/api.rb
CHANGED
@@ -27,7 +27,9 @@ module Kennel
|
|
27
27
|
offset += limit
|
28
28
|
end
|
29
29
|
else
|
30
|
-
request :get, "/api/v1/#{api_resource}", params: params
|
30
|
+
result = request :get, "/api/v1/#{api_resource}", params: params
|
31
|
+
result = result.fetch(:dashboards) if api_resource == "dashboard"
|
32
|
+
result
|
31
33
|
end
|
32
34
|
end
|
33
35
|
|
@@ -101,16 +101,16 @@ module Kennel
|
|
101
101
|
when "uptime"
|
102
102
|
if ids = definition[:monitor_ids]
|
103
103
|
definition[:monitor_ids] = ids.map do |id|
|
104
|
-
tracking_id?(id) ? resolve_link(id, id_map
|
104
|
+
tracking_id?(id) ? resolve_link(id, id_map) : id
|
105
105
|
end
|
106
106
|
end
|
107
107
|
when "alert_graph"
|
108
108
|
if (id = definition[:alert_id]) && tracking_id?(id)
|
109
|
-
definition[:alert_id] = resolve_link(id, id_map
|
109
|
+
definition[:alert_id] = resolve_link(id, id_map).to_s
|
110
110
|
end
|
111
111
|
when "slo"
|
112
112
|
if (id = definition[:slo_id]) && tracking_id?(id)
|
113
|
-
definition[:slo_id] = resolve_link(id, id_map
|
113
|
+
definition[:slo_id] = resolve_link(id, id_map).to_s
|
114
114
|
end
|
115
115
|
end
|
116
116
|
end
|
@@ -105,6 +105,7 @@ module Kennel
|
|
105
105
|
def resolve_linked_tracking_ids(id_map)
|
106
106
|
if as_json[:type] == "composite"
|
107
107
|
as_json[:query] = as_json[:query].gsub(/%\{(.*?)\}/) do
|
108
|
+
# need force here since it validates the id exists
|
108
109
|
resolve_link($1, id_map, force: true)
|
109
110
|
end
|
110
111
|
end
|
@@ -14,6 +14,18 @@ module Kennel
|
|
14
14
|
instance_method(method_in_file).source_location.first.sub("#{Bundler.root}/", "")
|
15
15
|
end
|
16
16
|
end
|
17
|
+
|
18
|
+
def validated_parts
|
19
|
+
all = parts
|
20
|
+
validate_parts(all)
|
21
|
+
all
|
22
|
+
end
|
23
|
+
|
24
|
+
private
|
25
|
+
|
26
|
+
# hook for users to add custom validations via `prepend`
|
27
|
+
def validate_parts(parts)
|
28
|
+
end
|
17
29
|
end
|
18
30
|
end
|
19
31
|
end
|
data/lib/kennel/models/record.rb
CHANGED
@@ -13,9 +13,6 @@ module Kennel
|
|
13
13
|
}.freeze
|
14
14
|
API_LIST_INCOMPLETE = false
|
15
15
|
|
16
|
-
class ValidationError < RuntimeError
|
17
|
-
end
|
18
|
-
|
19
16
|
settings :id, :kennel_id
|
20
17
|
|
21
18
|
class << self
|
@@ -81,10 +78,19 @@ module Kennel
|
|
81
78
|
|
82
79
|
private
|
83
80
|
|
84
|
-
def resolve_link(id, id_map, force:)
|
85
|
-
id_map[id]
|
86
|
-
|
87
|
-
|
81
|
+
def resolve_link(id, id_map, force: false)
|
82
|
+
found = id_map[id]
|
83
|
+
return found if found && found != :new
|
84
|
+
|
85
|
+
if found == :new
|
86
|
+
if force
|
87
|
+
invalid! "Monitor #{id} will be created in the current run and can only be used after that"
|
88
|
+
else
|
89
|
+
Kennel.err.puts "Monitor #{id} will be created in the current run, the next run will link it properly"
|
90
|
+
Kennel::MISSING_ID
|
91
|
+
end
|
92
|
+
else
|
93
|
+
invalid! "Unable to find monitor #{id} (does not exist and is not being created by the current run)"
|
88
94
|
end
|
89
95
|
end
|
90
96
|
|
data/lib/kennel/models/slo.rb
CHANGED
@@ -35,7 +35,7 @@ module Kennel
|
|
35
35
|
description: description,
|
36
36
|
thresholds: thresholds,
|
37
37
|
monitor_ids: monitor_ids,
|
38
|
-
tags: tags,
|
38
|
+
tags: tags.uniq,
|
39
39
|
type: type
|
40
40
|
}
|
41
41
|
|
@@ -55,7 +55,7 @@ module Kennel
|
|
55
55
|
|
56
56
|
def resolve_linked_tracking_ids(id_map)
|
57
57
|
as_json[:monitor_ids] = as_json[:monitor_ids].map do |id|
|
58
|
-
id.is_a?(String) ? resolve_link(id, id_map
|
58
|
+
id.is_a?(String) ? resolve_link(id, id_map) : id
|
59
59
|
end
|
60
60
|
end
|
61
61
|
|
data/lib/kennel/syncer.rb
CHANGED
@@ -38,7 +38,6 @@ module Kennel
|
|
38
38
|
def update
|
39
39
|
@create.each do |_, e|
|
40
40
|
reply = @api.create e.class.api_resource, e.as_json
|
41
|
-
reply = unnest(e.class.api_resource, reply)
|
42
41
|
Kennel.out.puts "Created #{e.class.api_resource} #{tracking_id(e.as_json)} #{e.url(reply.fetch(:id))}"
|
43
42
|
end
|
44
43
|
|
@@ -101,21 +100,16 @@ module Kennel
|
|
101
100
|
end
|
102
101
|
end
|
103
102
|
|
104
|
-
#
|
103
|
+
# Make diff work even though we cannot mass-fetch definitions
|
105
104
|
def fill_details(a, cache)
|
106
105
|
resource = a.fetch(:api_resource)
|
107
106
|
args = [resource, a.fetch(:id)]
|
108
107
|
full = cache.fetch(args, a[:modified] || a.fetch(:modified_at)) do
|
109
|
-
|
108
|
+
@api.show(*args)
|
110
109
|
end
|
111
110
|
a.merge!(full)
|
112
111
|
end
|
113
112
|
|
114
|
-
# dashes are nested, others are not
|
115
|
-
def unnest(api_resource, result)
|
116
|
-
result[api_resource.to_sym] || result[:data] || result
|
117
|
-
end
|
118
|
-
|
119
113
|
def details_cache(&block)
|
120
114
|
cache = FileCache.new CACHE_FILE, Kennel::VERSION
|
121
115
|
cache.open(&block)
|
@@ -195,6 +189,7 @@ module Kennel
|
|
195
189
|
|
196
190
|
def resolve_linked_tracking_ids(actual)
|
197
191
|
map = actual.each_with_object({}) { |a, lookup| lookup[tracking_id(a)] = a.fetch(:id) }
|
192
|
+
@expected.each { |e| map[e.tracking_id] ||= :new }
|
198
193
|
@expected.each { |e| e.resolve_linked_tracking_ids(map) }
|
199
194
|
end
|
200
195
|
|
data/lib/kennel/tasks.rb
CHANGED
@@ -18,7 +18,7 @@ end
|
|
18
18
|
namespace :kennel do
|
19
19
|
desc "Ensure there are no uncommited changes that would be hidden from PR reviewers"
|
20
20
|
task no_diff: :generate do
|
21
|
-
result = `git status --porcelain
|
21
|
+
result = `git status --porcelain generated/`.strip
|
22
22
|
Kennel::Tasks.abort "Diff found:\n#{result}\nrun `rake generate` and commit the diff to fix" unless result == ""
|
23
23
|
Kennel::Tasks.abort "Error during diffing" unless $CHILD_STATUS.success?
|
24
24
|
end
|
@@ -45,8 +45,7 @@ namespace :kennel do
|
|
45
45
|
end
|
46
46
|
|
47
47
|
if bad.any?
|
48
|
-
|
49
|
-
url = (subdomain ? "https://zendesk.datadoghq.com" : "") + "/account/settings"
|
48
|
+
url = Kennel::Utils.path_to_url "/account/settings"
|
50
49
|
puts "Invalid mentions found, either ignore them by adding to `KNOWN` env var or add them via #{url}"
|
51
50
|
bad.each { |f, v| puts "Invalid mention #{v} in monitor message of #{f}" }
|
52
51
|
Kennel::Tasks.abort
|
@@ -23,7 +23,10 @@ module Kennel
|
|
23
23
|
end.compact
|
24
24
|
bad = queries.grep_v(/(#{variables.map { |v| Regexp.escape(v) }.join("|")})\b/)
|
25
25
|
if bad.any?
|
26
|
-
invalid!
|
26
|
+
invalid!(
|
27
|
+
"queries #{bad.join(", ")} must use the template variables #{variables.join(", ")}\n" \
|
28
|
+
"If that is not possible, add `validate_template_variables: -> { false } # query foo in bar does not have baz tag`"
|
29
|
+
)
|
27
30
|
end
|
28
31
|
end
|
29
32
|
|
data/lib/kennel/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kennel
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.60.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Michael Grosser
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-12-
|
11
|
+
date: 2019-12-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|