fluent-plugin-jfrog-metrics 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2ae50efd3530bcd0b047c79aca24ee8509c76c972fe834bd2092a55b0d9f807
-  data.tar.gz: 5eb9ead9094b261942d23f8e7181913b41bb08326fb5ec86cc784a29dafd5328
+  metadata.gz: bc48b6c9f8a51df6c59f938a6283e17751649320e9e02ec811ad05f2dd58fc0e
+  data.tar.gz: 8996298f2223575ae661e115a9eedf695d5fb14732bedc29e4b634bc69c20fa4
 SHA512:
-  metadata.gz: 3bde97c36506f91725cc8a13fae533929a6d6bb461822f701095e205e96c421e10df47213b94e3c7b12cc284880ff7361eb401202b84acf07bb16c781ccd42e5
-  data.tar.gz: 8b5096c569210002908e19f416a5e605ece7d26e725037e10c2d9c57be06a28624bb0456d4dcaed8afee732c3bbd1c9bc77ebde1782bb571f3ebc577e12ae9c0
+  metadata.gz: eee23ebb31284a6a358f618f30a2e6a735e12fc6956c92a22b347db1f128d1b27b908f508a110b4ee93372032f017a4b397c04a98d83662643275ea0137d0915
+  data.tar.gz: 30837a031c859b1a3882b42e7ba20665d097531bb116ef63434315476a6141d338cc11c7d5f3373d03131d6062987ff219e73e3d7d6abe3b431fac15052ea087

data/fluent-plugin-jfrog-metrics.gemspec

@@ -3,8 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-jfrog-metrics'
-  spec.version = '0.2.5'
-  spec.authors = ['MahithaB, VasukiN, giri-vsr']
+  spec.version = '0.2.7'
+  spec.authors = ['MahithaB, BenHarosh']
   spec.email   = ['cpe-support@jfrog.com']
 
   spec.summary       = %q{Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics (Prometheus Exposition Format) to target observability platform format (Splunk HEC, New Relic, Elastic)}

data/lib/fluent/plugin/datadog_metrics_parser.rb

@@ -20,23 +20,17 @@ class DatadogMetricsParser < BaseMetricsParser
       points = []
       if interim_data =~ /{/ && interim_data =~ /}/
         metric_name, additional_dims, metric_val_and_time = interim_data.match(/(.*){(.*)}(.*)/i).captures
-        if additional_dims =~ /,/
-          additional_dims.split(/,/).map do |interim_data|
-            interim_data_value = interim_data.split(/=/)[1].gsub(/"/, '') if interim_data =~ /=/
-            interim_data_key = interim_data.split(/=/)[0]
-            interim_data_tag = interim_data_key + ':' + interim_data_value
-            tags << interim_data_tag
-          end
-        else
-          attribute_name, attribute_value = additional_dims.split('=')
-          attribute_value = attribute_value.delete_prefix('"').delete_suffix('"')
-          attribute_tag = attribute_name + ':' + attribute_value
-          tags << attribute_tag
+        additional_dims.split("\",").each do |interim_data|
+          pair_data = interim_data.gsub("\"", "").gsub("{", "").gsub("}", "")
+          interim_data_value = pair_data.split("=", 2)[1]
+          interim_data_key = pair_data.split("=", 2)[0]
+          interim_data_tag = interim_data_key + ':' + interim_data_value
+          tags << interim_data_tag
         end
         if metric_val_and_time =~ / /
           metrics_hash['metric'] = prefix + separator + metric_name
           metric_timestamp = metric_val_and_time.strip.split[1]
-          point['timestamp'] = metric_timestamp[0,10].to_i
+          point['timestamp'] = metric_timestamp[0,10].to_i if metric_timestamp != nil
           point['value'] = metric_val_and_time.strip.split[0] =~ /^\S*\.\S*$/ ? metric_val_and_time.strip.split[0].to_f : metric_val_and_time.strip.split[0].to_i
           points << point
           metrics_hash['points'] = points

data/lib/fluent/plugin/in_jfrog_metrics.rb

@@ -37,7 +37,8 @@ module Fluent
       config_param :username, :string, default: ''
       config_param :apikey, :string, default: '', :secret => true
       config_param :token, :string, default: '', :secret => true
-      config_param :interval, :time, default: 10
+      config_param :execution_interval, :time, default: 10
+      config_param :timeout_interval, :time, default: 30
       config_param :metric_prefix, :string, default: ''
       config_param :target_platform, :string, default: 'SPLUNK'
       config_param :common_jpd, :bool, default: false
@@ -55,8 +56,6 @@ module Fluent
 
         raise Fluent::ConfigError, 'Must define the apikey or token for authentication.' if @token == '' &&  @apikey == ''
 
-        raise Fluent::ConfigError, 'Must define the interval to use for gathering the metrics.' if @interval == ''
-
         raise Fluent::ConfigError, 'Must define the metric_prefix to use for getting the metrics.' if @metric_prefix == ''
 
         raise Fluent::ConfigError, 'Must define the vendor to use for getting the metrics.' if @target_platform == ''
@@ -77,17 +76,19 @@ module Fluent
 
       def run
         puts('Preparing metrics collection, creating timer task')
-        timer_task = Concurrent::TimerTask.new(execution_interval: @interval, timeout_interval: 30, run_now: true) do
+        timer_task = Concurrent::TimerTask.new(execution_interval: @execution_interval, timeout_interval: @timeout_interval, run_now: true) do
           puts('Timer task execution')
           do_execute
         end
         timer_task.execute
+        sleep 100
       end
 
       def do_execute
         puts('Executing metrics collection')
         metrics_helper = MetricsHelper.new(@metric_prefix, @jpd_url, @username, @apikey, @token, @common_jpd)
         platform_metrics = metrics_helper.get_metrics
+
         additional_metrics = metrics_helper.get_additional_metrics
         if !additional_metrics.nil? && additional_metrics != ''
           platform_metrics += additional_metrics.to_s

data/lib/fluent/plugin/newrelic_metrics_parser.rb

@@ -13,18 +13,18 @@ class NewRelicMetricsParser < BaseMetricsParser
     hash_data_array = []
     data_hash = {}
     data_array = []
+    puts cleaned_data
     cleaned_data.each do |interim_data|
       metrics_hash = {}
       if interim_data =~ /{/ && interim_data =~ /}/
         attributes = {}
         metric_name, additional_dims, metric_val_and_time = interim_data.match(/(.*){(.*)}(.*)/i).captures
-        if additional_dims =~ /,/
-          additional_dims.split(/,/).map do |interim_data|
-            attributes[interim_data.split(/=/)[0]] = interim_data.split(/=/)[1].gsub(/"/, '') if interim_data =~ /=/
-          end
-        else
-          attribute_name, attribute_value = additional_dims.split('=')
-          attributes[attribute_name] = attribute_value.delete_prefix('"').delete_suffix('"')
+        additional_dims.split("\",").each do |interim_data|
+          puts interim_data
+          pair_data = interim_data.gsub("\"", "").gsub("{", "").gsub("}", "")
+          interim_data_value = pair_data.split("=", 2)[1]
+          interim_data_key = pair_data.split("=", 2)[0]
+          attributes[interim_data_key] = interim_data_value
         end
         if metric_val_and_time =~ / /
           metrics_hash['name'] = prefix + separator + metric_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jfrog-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
-- MahithaB, VasukiN, giri-vsr
+- MahithaB, BenHarosh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics (Prometheus