fluent-plugin-jfrog-metrics 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b93ecb5ecea1f1ab7144d5f1032951346c68427c6f2797a9c1799562ab609835
-  data.tar.gz: baa93977ee4ee4015fa1779a3d2c7ae4dc442e1084b730d944e5820664a1ff40
+  metadata.gz: bc48b6c9f8a51df6c59f938a6283e17751649320e9e02ec811ad05f2dd58fc0e
+  data.tar.gz: 8996298f2223575ae661e115a9eedf695d5fb14732bedc29e4b634bc69c20fa4
 SHA512:
-  metadata.gz: e6fc16c13405a355a325f4bd91e0be810e7b84325fdacb638ffa5403c3a6e1fff3d4914231916378d484725f439903ea0e720f5b62c9d6e1270d5f9c867dd871
-  data.tar.gz: d50066d93ceec87c01396a5730531d6bc0018fe50c6ba3f63c62832db5db38009c22b0d1d0a8773c959625b0aa46885ab26e21601d3ac0036079c230993b32cf
+  metadata.gz: eee23ebb31284a6a358f618f30a2e6a735e12fc6956c92a22b347db1f128d1b27b908f508a110b4ee93372032f017a4b397c04a98d83662643275ea0137d0915
+  data.tar.gz: 30837a031c859b1a3882b42e7ba20665d097531bb116ef63434315476a6141d338cc11c7d5f3373d03131d6062987ff219e73e3d7d6abe3b431fac15052ea087

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-jfrog-metrics (0.2.6)
+    fluent-plugin-jfrog-metrics (0.2.5)
       fluentd (>= 0.14.10, < 2)
       rest-client (~> 2.0)
 
@@ -10,7 +10,7 @@ GEM
   specs:
     ansi (1.5.0)
     builder (3.2.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
     cool.io (1.7.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)

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.6'
-  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,18 +20,12 @@ 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

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.6
+  version: 0.2.7
 platform: ruby
 authors:
-- MahithaB, VasukiN, giri-vsr
+- MahithaB, BenHarosh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-26 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