kennel 1.150.0 → 1.152.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29514740a2760f494ce7958c4156f5dd864635e61abdca7c5c805226bc56e255
-  data.tar.gz: 58d17b770fa613029bd490d60aeb3131a1e3e036f82ef5d49b87ebe9e1151292
+  metadata.gz: c18c40b3d259f4b19d396f956937f54a50d064e79f9c069204aede3d5e743f1b
+  data.tar.gz: dfabe30c42756650cda60fc0d90268f672284841e8dfff76db1d08f9e956f3b5
 SHA512:
-  metadata.gz: d9a379ff67c951e8b8bb346272da47d420ba95cd9ac856dd592a94696b564dc4010db13945fbeaa42480f10288baf441886bea5f0e03981356231e210cfc1d6b
-  data.tar.gz: 99d921199f21e237880ee6a38f51e62ab7ff2d94bdf886f3553a3102defea51b33cc7366a7775a6dcb9ccac869594bcb7bc653d1ed09fdd35a7771b418defb06
+  metadata.gz: adb30eab75ab3e4cc7a5f86ac0f7c465441c07e53fe19534f339e67ac56d14719e40e598260bb6e2a123183badd1bd38aabe8eab12d8fcfe03b89cc57f244930
+  data.tar.gz: 69b9d6e6bbedf62d9325d58fee3e9aa76b1f79693a9b36d7232cd6771327c1803ea26e91e09bb23078b710c32f2f13fd9b1974d71fc13539fa33e5071aaa73ba

data/Readme.md

@@ -342,6 +342,7 @@ so they can be created in a single update and can be re-created if any of them i
 |Dashboard|uptime|`monitor: {id: "foo:bar"}`|
 |Dashboard|alert_graph|`alert_id: "foo:bar"`|
 |Dashboard|slo|`slo_id: "foo:bar"`|
+|Dashboard|timeseries|`queries: [{ data_source: "slo", slo_id: "foo:bar" }]`|
 |Monitor|composite|`query: -> { "%{foo:bar} && %{foo:baz}" }`|
 |Monitor|slo alert|`query: -> { "error_budget(\"%{foo:bar}\").over(\"7d\") > 123.0" }`|
 |Slo|monitor|`monitor_ids: -> ["foo:bar"]`|

data/lib/kennel/importer.rb

@@ -2,8 +2,15 @@
 
 module Kennel
   class Importer
+    # title will have the lock symbol we need to remove when re-importing
     TITLES = [:name, :title].freeze
-    SORT_ORDER = [*TITLES, :id, :kennel_id, :type, :tags, :query, *Models::Record.subclasses.map { |k| k::TRACKING_FIELDS }, :template_variables].freeze
+
+    # bring important fields to the top
+    SORT_ORDER = [
+      *TITLES, :id, :kennel_id, :type, :tags, :query, :sli_specification,
+      *Models::Record.subclasses.flat_map { |k| k::TRACKING_FIELDS },
+      :template_variables
+    ].freeze
 
     def initialize(api)
       @api = api
@@ -19,6 +26,7 @@ module Kennel
         raise(ArgumentError, "#{resource} is not supported")
 
       data = @api.show(model.api_resource, id)
+
       id = data.fetch(:id) # keep native value
       model.normalize({}, data) # removes id
       data[:id] = id

data/lib/kennel/models/dashboard.rb

@@ -195,6 +195,14 @@ module Kennel
             if id = definition[:slo_id]
               definition[:slo_id] = resolve(id, :slo, id_map, **args) || id
             end
+          when "timeseries"
+            definition[:requests]&.each do |request|
+              request[:queries]&.each do |query|
+                if query[:data_source] == "slo" && (slo_id = query[:slo_id])
+                  query[:slo_id] = resolve(slo_id, :slo, id_map, **args) || slo_id
+                end
+              end
+            end
           end
         end
       end

data/lib/kennel/models/slo.rb

@@ -4,7 +4,10 @@ module Kennel
     class Slo < Record
       include TagsValidation
 
-      READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [:type_id, :monitor_tags, :target_threshold, :timeframe, :warning_threshold]
+      READONLY_ATTRIBUTES = [
+        *superclass::READONLY_ATTRIBUTES,
+        :type_id, :monitor_tags, :target_threshold, :timeframe, :warning_threshold
+      ].freeze
       TRACKING_FIELD = :description
       DEFAULTS = {
         description: nil,
@@ -14,7 +17,7 @@ module Kennel
         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 },
@@ -35,7 +38,9 @@ module Kennel
           type: type
         )
 
-        if v = query
+        if type == "time_slice"
+          data[:sli_specification] = sli_specification
+        elsif v = query
           data[:query] = v
         end
 

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -324,6 +324,7 @@ so they can be created in a single update and can be re-created if any of them i
 |Dashboard|uptime|`monitor: {id: "foo:bar"}`|
 |Dashboard|alert_graph|`alert_id: "foo:bar"`|
 |Dashboard|slo|`slo_id: "foo:bar"`|
+|Dashboard|timeseries|`queries: [{ data_source: "slo", slo_id: "foo:bar" }]`|
 |Monitor|composite|`query: -> { "%{foo:bar} && %{foo:baz}" }`|
 |Monitor|slo alert|`query: -> { "error_budget(\"%{foo:bar}\").over(\"7d\") > 123.0" }`|
 |Slo|monitor|`monitor_ids: -> ["foo:bar"]`|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.150.0
+  version: 1.152.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs