kennel 1.105.0 → 1.107.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15372f06919044f4751bb25a9aea5b965a16253145841c6b964ee8d109e14d26
-  data.tar.gz: 7f658ed4facabdf0100650a1298e83de855a35000b3ed4da8b12f23d7e108894
+  metadata.gz: 70f6012b2bb28973367faa9bb4ba9bd97e84ea182b6ba0e3c6b0779b4cc717fc
+  data.tar.gz: 2dc559844f4116c56de8d456fb467079476b80e33ae5a03415541bfb3e749985
 SHA512:
-  metadata.gz: 6bf58efda2f995a5903c52f3e0ed58f756638c28009d3e172b34b456f3fc64c494f0bdbb789d147f368ab30ad004453c7a969c6eb644e610557a3874c0c56da7
-  data.tar.gz: d1e3d4eca303de897dee30c357f0e0a03ac0ff7fee9a1de8904c1749c43eb093aa309b0063e7146782d19928664ea0d6e497da7ed8dc92ca0d87da437db97ed2
+  metadata.gz: 8573febe6011241b87f657e5aa205fce7684b18b3db757045d7011132fbe21c5f3538e99c51413bc2209f6a250cc359fac96fdad47c5ecaef1685b1d27f9d847
+  data.tar.gz: a9a43bcacacf819253cbd0d73611e264053b5ed665340ee0390b6e6c4e0b5a3660a469c26fe07bcfaaec2e860b7f5be00adee2e8b0591b65b5d52a2527b6b496

data/lib/kennel/models/dashboard.rb

@@ -61,6 +61,10 @@ module Kennel
           global_time_target: "0",
           title_align: "left",
           title_size: "16"
+        },
+        "query_table" => {
+          title_align: "left",
+          title_size: "16"
         }
       }.freeze
       SUPPORTED_DEFINITION_OPTIONS = [:events, :markers, :precision].freeze
@@ -205,6 +209,12 @@ module Kennel
         end
       end
 
+      def validate_update!(_actuals, diffs)
+        if bad_diff = diffs.find { |diff| diff[1] == "layout_type" }
+          invalid! "Datadog does not allow update of #{bad_diff[1]} (#{bad_diff[2].inspect} -> #{bad_diff[3].inspect})"
+        end
+      end
+
       private
 
       # creates queries from metadata to avoid having to keep q and expression in sync

data/lib/kennel/models/monitor.rb

@@ -126,6 +126,12 @@ module Kennel
         end
       end
 
+      def validate_update!(_actuals, diffs)
+        if bad_diff = diffs.find { |diff| diff[1] == "type" }
+          invalid! "Datadog does not allow update of #{bad_diff[1]} (#{bad_diff[2].inspect} -> #{bad_diff[3].inspect})"
+        end
+      end
+
       def self.api_resource
         "monitor"
       end
@@ -217,6 +223,10 @@ module Kennel
           validate_message_variables(data)
         end
 
+        if type == "service check" && !data[:query].to_s.include?(".by(")
+          invalid! "query must include a .by() at least .by(\"*\")"
+        end
+
         unless ALLOWED_PRIORITY_CLASSES.include?(priority.class)
           invalid! "priority needs to be an Integer"
         end
@@ -243,6 +253,8 @@ module Kennel
           match[1].to_s.split(/\s*,\s*/).map { |k| k.split(":", 2)[-2] } + # {a:b} -> a TODO: does not work for service check
           match[2].to_s.gsub(/["']/, "").split(/\s*,\s*/) # by {a} -> a
 
+        return if allowed.include?("*")
+
         allowed.compact!
         allowed.uniq!
         allowed.map! { |w| "#{w.tr('"', "")}.name" }

data/lib/kennel/models/record.rb

@@ -98,6 +98,9 @@ module Kennel
         self.class.remove_tracking_id(as_json)
       end
 
+      def validate_update!(*)
+      end
+
       private
 
       def resolve(value, type, id_map, force:)

data/lib/kennel/syncer.rb

@@ -9,6 +9,7 @@ module Kennel
       @project_filter = project
       @expected = expected
       calculate_diff
+      validate_plan
       prevent_irreversible_partial_updates
     end
 
@@ -210,6 +211,14 @@ module Kennel
       end
     end
 
+    # We've already validated the desired objects ('generated') in isolation.
+    # Now that we have made the plan, we can perform some more validation.
+    def validate_plan
+      @update.each do |_, expected, actuals, diffs|
+        expected.validate_update!(actuals, diffs)
+      end
+    end
+
     # - do not add tracking-id when working with existing ids on a branch,
     #   so resource do not get deleted when running an update on master (for example merge->CI)
     # - make sure the diff is clean, by kicking out the now noop-update

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -65,7 +65,7 @@ end
  - open [Datadog API Settings](https://app.datadoghq.com/account/settings#api)
  - create a `API Key` or get an existing one from an admin, then add it to `.env` as `DATADOG_API_KEY`
  - open [Datadog API Settings](https://app.datadoghq.com/access/application-keys) and create a new key, then add it to `.env` as `DATADOG_APP_KEY=`
- - change the `DATADOG_SUBDOMAIN=app` in `.env` to your companies subdomain if you have one
+ - if you have a custom subdomain, change the `DATADOG_SUBDOMAIN=app` in `.env`
  - verify it works by running `rake plan`, it might show some diff, but should not crash
 
 ### Adding a team

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.105.0
+  version: 1.107.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday