Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for time_slice slo #313

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/kennel/importer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Kennel
class Importer
TITLES = [:name, :title].freeze
SORT_ORDER = [*TITLES, :id, :kennel_id, :type, :tags, :query, *Models::Record.subclasses.map { |k| k::TRACKING_FIELDS }, :template_variables].freeze
SORT_ORDER = [*TITLES, :id, :kennel_id, :type, :tags, :query, :sli_specification, *Models::Record.subclasses.map { |k| k::TRACKING_FIELDS }, :template_variables].freeze

def initialize(api)
@api = api
Expand All @@ -19,10 +19,15 @@ def import(resource, id)
raise(ArgumentError, "#{resource} is not supported")

data = @api.show(model.api_resource, id)
# get sli specification before normalization.
sli_specification = data[:sli_specification] || data.dig(:sli_specification, :time_slice)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how can it be in 2 different places ?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... fixed this, we had some temp-fix code that added it to read-only :D


id = data.fetch(:id) # keep native value
model.normalize({}, data) # removes id
data[:id] = id

data[:sli_specification] = sli_specification if sli_specification

title_field = TITLES.detect { |f| data[f] }
title = data.fetch(title_field)
title.tr!(Kennel::Models::Record::LOCK, "") # avoid double lock icon
Expand Down
6 changes: 4 additions & 2 deletions lib/kennel/models/slo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Slo < Record
thresholds: []
}.freeze

settings :type, :description, :thresholds, :query, :tags, :monitor_ids, :monitor_tags, :name, :groups
settings :type, :description, :thresholds, :query, :tags, :monitor_ids, :monitor_tags, :name, :groups, :sli_specification

defaults(
tags: -> { @project.tags },
Expand All @@ -35,7 +35,9 @@ def build_json
type: type
)

if v = query
if type == 'time_slice'
data[:sliSpecification] = :sli_specification
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be the actual call ?

Suggested change
data[:sliSpecification] = :sli_specification
data[:sliSpecification] = sli_specification

elsif v = query
data[:query] = v
end

Expand Down
35 changes: 32 additions & 3 deletions test/kennel/models/slo_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@ class TestSlo < Kennel::Models::Slo

def slo(options = {})
Kennel::Models::Slo.new(
type = options[:type] || "metric"
options.delete(:project) || project,
{
type: -> { "metric" },
slo_options ={
type: -> { type },
name: -> { "Foo" },
kennel_id: -> { "m1" }
}.merge(options)
}
slo_options[:sliSpecification] = -> { options[:sliSpecification] } if type == "time_slice"
kaarolch marked this conversation as resolved.
Show resolved Hide resolved
Kennel::Models::Slo.new(project, slo_options.merge(options))
)
end

Expand Down Expand Up @@ -59,6 +62,32 @@ def slo(options = {})
)
end

it "includes sliSpecification for time slices" do
sli_spec = {
timeSlice: {
query: {
formula: {
formulaExpression: "query1"
},
queries: [{
metricQuery: {
name: "query1",
query: "ewma_7(avg:system_cpu{} by {env})"
}
}]
},
comparator: "<=",
threshold: 40
}
}

expected_basic_json[:sliSpecification] = sli_spec
assert_json_equal(
slo(type: "time_slice", sli_specification: sli_spec).build_json,
expected_basic_json
)
end

it "sets id when updating by id" do
expected_basic_json[:id] = 123
assert_json_equal(
Expand Down
Loading