datadog-exporter 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 179182c9b8d56a269d1f5c27dd4b1f8017123d9f392147c7abc06fe5e707400d
-  data.tar.gz: ddc8dee960a3770b6b5a90122b5aef17bbc08befa0702599b34b4d0b9cdb05a7
+  metadata.gz: 6382559bfdfc5253fef3781c39450805a266aa5ef2912b16bd4e4eaba4ea94fc
+  data.tar.gz: 869c9670567a052c6310c126cad2feabc779a1d3197bca5f053458859eed3d3f
 SHA512:
-  metadata.gz: 935ec9316bb8658244ab27f6531a4c9ab9f1d0e59f841bb0eff1a0d7f023517574eefbbcc2247af9ba3bbbec89f9f2746420d3253db873c84e193205e98638df
-  data.tar.gz: 9c13205263070078039b50a0c3996f7babef73b5b8292416b0f9852c60499f4a60c262b9cabdde3ff968790e9016ac86c6bd8a0f0d5248d89f13d1dd7b01b44b
+  metadata.gz: f2631aa925d8577f653a180687c5560296e1087c99fc8899aa5c1f6aa8ab843a8621395d6eb4d09fa71b5e3c4372d7084efeef03a84da9e7215e0b7840379219
+  data.tar.gz: a0970ff4712a47fe56b5f4df0e37f1be7d8164aa1ee006c6aa45dc61445901f2cb658104bd8a3d0f95b72187a00b5f0e0f218a6008c5b4383741165c90bcc419

data/lib/datadog_exporter/monitors/export.rb

@@ -21,6 +21,10 @@ module DatadogExporter
         @file_class = file_class
       end
 
+      def list(tag: nil, &)
+        monitors(tag:).each(&)
+      end
+
       ##
       # Exports Datadog monitors configuration in YAML files.
       # If no tag is provided, it exports all the monitors.
@@ -31,7 +35,7 @@ module DatadogExporter
       def export(tag: nil)
         reset_monitors_dir
 
-        monitors(tag:).each { |exported_datadog_hash| save_original(exported_datadog_hash) }
+        list(tag:) { |exported_datadog_hash| save_original(exported_datadog_hash) }
 
         config.logger.info("Exported #{@monitors.count} monitors to #{@monitors_base_path}")
       end
@@ -48,7 +52,7 @@ module DatadogExporter
       def export_as_template(tag: nil)
         reset_monitors_dir
 
-        monitors(tag:).each { |exported_datadog_hash| save_template(exported_datadog_hash) }
+        list(tag:) { |exported_datadog_hash| save_template(exported_datadog_hash) }
 
         config.logger.info(
           "Exported #{@monitors.count} monitor templates to #{@monitors_base_path}",

data/lib/datadog_exporter/monitors/import.rb

@@ -10,13 +10,19 @@ module DatadogExporter
         client: DatadogExporter::Client.new(config:),
         request: DatadogExporter::DatadogApiRequests::Monitors.new(config:, client:),
         template_manager: Utilities::TemplateManager.new(config:),
-        file_class: File
+        file_class: File,
+        existent_monitors_service: DatadogExporter::Monitors::Export.new
       )
         @config = config
         @request = request
         @monitors_base_path = config.base_path.join(DatadogExporter::Monitors::EXPORT_FOLDER)
         @template_manager = template_manager
         @file_class = file_class
+        @existent_monitors_service = existent_monitors_service
+      end
+
+      def list(tag: nil, &)
+        monitors.select { |monitor| tag.nil? || monitor[:tags].include?(tag) }.each(&)
       end
 
       ##
@@ -25,24 +31,47 @@ module DatadogExporter
       #   * Loops all exported monitors in the base_path/monitors folder.
       #   * Transforms the monitor into a template with placeholders.
       #   * Replace the placeholders with the environment values
+      #   * Checks if the monitor already exists in the Datadog environment.
       #   * Creates the monitor in the Datadog environment.
       #
       # If a tag is provided, it imports only the monitors with that tag.
       #
       # @param [Symbol] to The environment (defined in your organizations_config_filename) where the monitors will be imported
+      # @param [Symbol] from (optional) The environment (defined in your organizations_config_filename) where the placeholders are defined
       # @param [String] tag (optional) A tag defined in the Datadog monitors
-      def import(to:, tag: nil)
-        monitors
-          .select { |monitor| tag.nil? || monitor[:tags].include?(tag) }
-          .each do |monitor|
-            template = @template_manager.create_template(monitor)
-            target_monitor = @template_manager.create_monitor(template, environment: to)
-            @request.create(target_monitor) if accepted?(target_monitor, to)
+      def import(to:, from: :base, tag: nil)
+        monitors = []
+
+        list(tag: tag) do |monitor|
+          template = @template_manager.create_template(monitor, environment: from)
+          monitor = @template_manager.create_monitor(template, environment: to)
+
+          if exists?(monitor)
+            puts "Monitor `#{monitor[:name]}` already exists on #{to}"
+          elsif accepted?(monitor, to)
+            monitors << @request.create(monitor)
           end
+        end
+
+        puts "monitors created: #{monitors.count}"
       end
 
       private
 
+      def exists?(monitor_to_import)
+        existent_monitor =
+          existent_monitors.find { |monitor| monitor[:name] == monitor_to_import[:name] }
+
+        existent_monitor.inspect == monitor_to_import.inspect
+      end
+
+      def existent_monitors
+        @existent_monitors ||=
+          @existent_monitors_service.list.map do |monitor|
+            @template_manager.filter_by_template_keys(monitor)
+          end
+      end
+
       def monitors
         @monitors_base_path
           .glob("*.yml")

data/lib/datadog_exporter/monitors/utilities/template_manager.rb

@@ -18,6 +18,8 @@ module DatadogExporter
             replaced_string = original_string.dup
 
             placeholders.each do |placeholder_name, matching_text|
+              raise "Unknown placeholder value for #{placeholder_name}" if matching_text == ""
+
               placeholder = "#{placeholder_name}_placeholder"
               original_string.include?(matching_text) &&
                 replaced_string.gsub!(matching_text, placeholder)
@@ -75,14 +77,14 @@ module DatadogExporter
           replace_placeholders_with_values(placeholders, filter_by_template_keys(template))
         end
 
-        private
-
         def filter_by_template_keys(datadog_hash)
           return datadog_hash if template_keys.empty?
 
           datadog_hash.slice(*template_keys)
         end
 
+        private
+
         def replace_values_with_placeholders(hash_data, placeholders)
           return hash_data if placeholders.nil?
 

data/lib/datadog_exporter/version.rb

@@ -1,3 +1,3 @@
 module DatadogExporter
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-exporter
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Fran Martinez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datadog_api_client