kennel 1.57.1 → 1.58.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Readme.md +1 -0
- data/lib/kennel/models/dashboard.rb +1 -1
- data/lib/kennel/models/monitor.rb +5 -4
- data/lib/kennel/models/record.rb +5 -2
- data/lib/kennel/models/slo.rb +12 -4
- data/lib/kennel/tasks.rb +19 -8
- data/lib/kennel/version.rb +1 -1
- data/template/Readme.md +1 -0
- 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: d6eb8595b53bd765cb23745ba69474537f573d5359eec2d381e21bfba4d906c6
|
4
|
+
data.tar.gz: 57868385f03594a028c6140389be0f92b5899ec6953cd0d4a7f504122da2301d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 72304befa0ab9ad0a0ac92b0112d3a37f2b0176f7940d6167eb761be8aadec2de30c12942ad6b495dd39da35a2d47153b769e2d2b7be41f3f71635c7a1afeee2
|
7
|
+
data.tar.gz: f927605bda707be196eeb7ff18987f4fd6737d2ba6c619e331b8c12832079051663445477ff57ffe2bfd79ca5bf38851b79c379f90d136eba22d448252f1517f
|
data/Readme.md
CHANGED
@@ -45,6 +45,7 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
|
|
45
45
|
- copy any `API Key` and add it to `.env` as `DATADOG_API_KEY`
|
46
46
|
- find or create (check last page) your personal "Application Key" and add it to `.env` as `DATADOG_APP_KEY=`
|
47
47
|
- change the `DATADOG_SUBDOMAIN=app` in `.env` to your companies subdomain if you have one
|
48
|
+
- verify it works by running `rake plan`, it might show some diff, but should not crash
|
48
49
|
-->
|
49
50
|
|
50
51
|
### Adding a team
|
@@ -15,7 +15,7 @@ module Kennel
|
|
15
15
|
}.freeze
|
16
16
|
SUPPORTED_DEFINITION_OPTIONS = [:events, :markers, :precision].freeze
|
17
17
|
|
18
|
-
settings :
|
18
|
+
settings :title, :description, :definitions, :widgets, :layout_type
|
19
19
|
|
20
20
|
defaults(
|
21
21
|
description: -> { "" },
|
@@ -4,11 +4,12 @@ module Kennel
|
|
4
4
|
class Monitor < Record
|
5
5
|
include OptionalValidations
|
6
6
|
|
7
|
-
API_LIST_INCOMPLETE = false
|
8
7
|
RENOTIFY_INTERVALS = [0, 10, 20, 30, 40, 50, 60, 90, 120, 180, 240, 300, 360, 720, 1440].freeze # minutes
|
9
8
|
QUERY_INTERVALS = ["1m", "5m", "10m", "15m", "30m", "1h", "2h", "4h", "1d"].freeze
|
10
9
|
OPTIONAL_SERVICE_CHECK_THRESHOLDS = [:ok, :warning].freeze
|
11
|
-
READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [
|
10
|
+
READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [
|
11
|
+
:multi, :matching_downtimes, :overall_state_modified, :overall_state
|
12
|
+
]
|
12
13
|
|
13
14
|
# defaults that datadog uses when options are not sent, so safe to leave out if our values match their defaults
|
14
15
|
MONITOR_OPTION_DEFAULTS = {
|
@@ -21,8 +22,8 @@ module Kennel
|
|
21
22
|
DEFAULT_ESCALATION_MESSAGE = ["", nil].freeze
|
22
23
|
|
23
24
|
settings(
|
24
|
-
:query, :name, :message, :escalation_message, :critical, :
|
25
|
-
:ok, :
|
25
|
+
:query, :name, :message, :escalation_message, :critical, :type, :renotify_interval, :warning, :timeout_h, :evaluation_delay,
|
26
|
+
:ok, :no_data_timeframe, :notify_no_data, :notify_audit, :tags, :critical_recovery, :warning_recovery, :require_full_window,
|
26
27
|
:threshold_windows, :new_host_delay
|
27
28
|
)
|
28
29
|
|
data/lib/kennel/models/record.rb
CHANGED
@@ -4,18 +4,20 @@ module Kennel
|
|
4
4
|
class Record < Base
|
5
5
|
LOCK = "\u{1F512}"
|
6
6
|
READONLY_ATTRIBUTES = [
|
7
|
-
:deleted, :
|
8
|
-
:modified_at, :overall_state_modified, :overall_state, :api_resource
|
7
|
+
:deleted, :id, :created, :created_at, :creator, :org_id, :modified, :modified_at, :api_resource
|
9
8
|
].freeze
|
10
9
|
REQUEST_DEFAULTS = {
|
11
10
|
style: { width: "normal", palette: "dog_classic", type: "solid" },
|
12
11
|
conditional_formats: [],
|
13
12
|
aggregator: "avg"
|
14
13
|
}.freeze
|
14
|
+
API_LIST_INCOMPLETE = false
|
15
15
|
|
16
16
|
class ValidationError < RuntimeError
|
17
17
|
end
|
18
18
|
|
19
|
+
settings :id, :kennel_id
|
20
|
+
|
19
21
|
class << self
|
20
22
|
private
|
21
23
|
|
@@ -56,6 +58,7 @@ module Kennel
|
|
56
58
|
attr_reader :project
|
57
59
|
|
58
60
|
def initialize(project, *args)
|
61
|
+
raise ArgumentError, "First argument must be a project, not #{project.class}" unless project.is_a?(Project)
|
59
62
|
@project = project
|
60
63
|
super(*args)
|
61
64
|
end
|
data/lib/kennel/models/slo.rb
CHANGED
@@ -3,23 +3,31 @@ module Kennel
|
|
3
3
|
module Models
|
4
4
|
class Slo < Record
|
5
5
|
READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [:type_id, :monitor_tags]
|
6
|
-
API_LIST_INCOMPLETE = false
|
7
6
|
DEFAULTS = {
|
8
7
|
description: nil,
|
9
8
|
query: nil,
|
10
|
-
monitor_ids: []
|
9
|
+
monitor_ids: [],
|
10
|
+
thresholds: []
|
11
11
|
}.freeze
|
12
12
|
|
13
|
-
settings :
|
13
|
+
settings :type, :description, :thresholds, :query, :tags, :monitor_ids, :monitor_tags, :name
|
14
14
|
|
15
15
|
defaults(
|
16
16
|
id: -> { nil },
|
17
17
|
tags: -> { @project.tags },
|
18
18
|
query: -> { DEFAULTS.fetch(:query) },
|
19
19
|
description: -> { DEFAULTS.fetch(:description) },
|
20
|
-
monitor_ids: -> { DEFAULTS.fetch(:monitor_ids) }
|
20
|
+
monitor_ids: -> { DEFAULTS.fetch(:monitor_ids) },
|
21
|
+
thresholds: -> { DEFAULTS.fetch(:thresholds) }
|
21
22
|
)
|
22
23
|
|
24
|
+
def initialize(*)
|
25
|
+
super
|
26
|
+
if thresholds.any? { |t| t[:warning] && t[:warning].to_f <= t[:critical].to_f }
|
27
|
+
raise ValidationError, "Threshold warning must be greater-than critical value"
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
23
31
|
def as_json
|
24
32
|
return @as_json if @as_json
|
25
33
|
data = {
|
data/lib/kennel/tasks.rb
CHANGED
@@ -4,12 +4,23 @@ require "kennel"
|
|
4
4
|
require "kennel/unmuted_alerts"
|
5
5
|
require "kennel/importer"
|
6
6
|
|
7
|
+
module Kennel
|
8
|
+
module Tasks
|
9
|
+
class << self
|
10
|
+
def abort(message = nil)
|
11
|
+
Kennel.err.puts message if message
|
12
|
+
raise SystemExit.new(1), message
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
7
18
|
namespace :kennel do
|
8
19
|
desc "Ensure there are no uncommited changes that would be hidden from PR reviewers"
|
9
20
|
task no_diff: :generate do
|
10
21
|
result = `git status --porcelain`.strip
|
11
|
-
abort "Diff found:\n#{result}\nrun `rake generate` and commit the diff to fix" unless result == ""
|
12
|
-
abort "Error during diffing" unless $CHILD_STATUS.success?
|
22
|
+
Kennel::Tasks.abort "Diff found:\n#{result}\nrun `rake generate` and commit the diff to fix" unless result == ""
|
23
|
+
Kennel::Tasks.abort "Error during diffing" unless $CHILD_STATUS.success?
|
13
24
|
end
|
14
25
|
|
15
26
|
# 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
|
|
38
49
|
url = (subdomain ? "https://zendesk.datadoghq.com" : "") + "/account/settings"
|
39
50
|
puts "Invalid mentions found, either ignore them by adding to `KNOWN` env var or add them via #{url}"
|
40
51
|
bad.each { |f, v| puts "Invalid mention #{v} in monitor message of #{f}" }
|
41
|
-
abort
|
52
|
+
Kennel::Tasks.abort
|
42
53
|
end
|
43
54
|
end
|
44
55
|
|
@@ -76,16 +87,16 @@ namespace :kennel do
|
|
76
87
|
|
77
88
|
desc "show unmuted alerts filtered by TAG, for example TAG=team:foo"
|
78
89
|
task alerts: :environment do
|
79
|
-
tag = ENV["TAG"] || abort("Call with TAG=foo:bar")
|
90
|
+
tag = ENV["TAG"] || Kennel::Tasks.abort("Call with TAG=foo:bar")
|
80
91
|
Kennel::UnmutedAlerts.print(Kennel.send(:api), tag)
|
81
92
|
end
|
82
93
|
|
83
94
|
desc "show monitors with no data by TAG, for example TAG=team:foo"
|
84
95
|
task nodata: :environment do
|
85
|
-
tag = ENV["TAG"] || abort("Call with TAG=foo:bar")
|
96
|
+
tag = ENV["TAG"] || Kennel::Tasks.abort("Call with TAG=foo:bar")
|
86
97
|
monitors = Kennel.send(:api).list("monitor", monitor_tags: tag, group_states: "no data")
|
87
98
|
monitors.select! { |m| m[:overall_state] == "No Data" }
|
88
|
-
monitors.reject! { |m| m[:tags].include?
|
99
|
+
monitors.reject! { |m| m[:tags].include? "nodata:ignore" }
|
89
100
|
if monitors.any?
|
90
101
|
Kennel.err.puts <<~TEXT
|
91
102
|
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
|
|
103
114
|
|
104
115
|
desc "Convert existing resources to copy-pastable definitions to import existing resources RESOURCE=dash ID=1234"
|
105
116
|
task import: :environment do
|
106
|
-
resource = ENV["RESOURCE"] || abort("Call with RESOURCE=dash") # TODO: add others
|
107
|
-
id = ENV["ID"] || abort("Call with ID=1234")
|
117
|
+
resource = ENV["RESOURCE"] || Kennel::Tasks.abort("Call with RESOURCE=dash") # TODO: add others
|
118
|
+
id = ENV["ID"] || Kennel::Tasks.abort("Call with ID=1234")
|
108
119
|
id = Integer(id) if id =~ /^\d+$/ # dashboards can have alphanumeric ids
|
109
120
|
puts Kennel::Importer.new(Kennel.send(:api)).import(resource, id)
|
110
121
|
end
|
data/lib/kennel/version.rb
CHANGED
data/template/Readme.md
CHANGED
@@ -28,6 +28,7 @@ Keep datadog monitors/dashboards/etc in version control, avoid chaotic managemen
|
|
28
28
|
- copy any `API Key` and add it to `.env` as `DATADOG_API_KEY`
|
29
29
|
- find or create (check last page) your personal "Application Key" and add it to `.env` as `DATADOG_APP_KEY=`
|
30
30
|
- change the `DATADOG_SUBDOMAIN=app` in `.env` to your companies subdomain if you have one
|
31
|
+
- verify it works by running `rake plan`, it might show some diff, but should not crash
|
31
32
|
|
32
33
|
### Adding a team
|
33
34
|
|
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.58.3
|
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-
|
11
|
+
date: 2019-12-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|