fluent-plugin-jfrog-metrics 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88cb33e3d21ec84017663299f85da2ddc90b61e25857636c3a0aa245d0d46743
-  data.tar.gz: a177ba833cff288de20908ca72b070d48f4b78ba12d08f8fa4c933876a7d5ae1
+  metadata.gz: 21102bd90a5d5cb08bc3277e641dc23d00f11a6beb7d4bd5c1256efc1b354d30
+  data.tar.gz: 6bd16774a36b1d1ffa6f1286e43e11915aae029faae8ba9eb6f0df93b240b639
 SHA512:
-  metadata.gz: 148b0520d4566204d2517f91c755304aeae9da489bdd3c46a355250dedf83baa6e22390282f029c7be99c83ec5f494647d384e9a9ad3c5e84b5287540581a2f0
-  data.tar.gz: 23ec80bd997d31284c30b8afcfa9e739eed77dde584b4104ad798c10c6b7334f3509689eb3ff4ed18377d7da50bc3c86f77f42c5fab6f988b03fdde1c0f701a5
+  metadata.gz: 28b40128a2fa43f3d74d78bdfe6e322adcafd70492cf4eb6363990596c02e78b7c0e13391ccef7a8771fe96e443f9ab27060d7e71f5e87297f95c8262c5b63f4
+  data.tar.gz: 7cd90e2cd932bf0cd2c0717cea0711cff814d5403d7e3be9cd7ccefd8611f717af6afa60f334d2e579d3f72c5a74a1c7a0fc654ba8d6dd658db980f90727e49a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-jfrog-metrics (0.2.0)
+    fluent-plugin-jfrog-metrics (0.2.3)
       fluentd (>= 0.14.10, < 2)
       rest-client (~> 2.0)
 

data/fluent-plugin-jfrog-metrics.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-jfrog-metrics'
-  spec.version = '0.2.0'
+  spec.version = '0.2.3'
   spec.authors = ['MahithaB, VasukiN, giri-vsr']
   spec.email   = ['cpe-support@jfrog.com']
 

data/lib/fluent/plugin/elastic_metrics_parser.rb

@@ -12,22 +12,16 @@ class ElasticMetricsParser < BaseMetricsParser
   def format_data(cleaned_data = [], prefix = '', separator = '')
     hash_data_array = []
     hash_data = {}
+    hash_data_with_labels = []
     cleaned_data.each do |interim_data|
       if interim_data =~ /{/ && interim_data =~ /}/
+        hash_data_with_dim_fields = {}
         metric_name, additional_dims, metric_val_and_time = interim_data.match(/(.*){(.*)}(.*)/i).captures
-        additional_dim_name = ''
-        if additional_dims =~ /,/
-          additional_dims.split(/,/).map do |interim_dim_data|
-            additional_dim_name += '_' unless additional_dim_name.nil? || additional_dim_name.empty?
-            additional_dim_name += interim_dim_data.gsub(/"/, '').gsub(/=/, '_').gsub(/-/, '_') if interim_data =~ /=/
-          end
-        else
-          additional_dim_name = additional_dims.gsub(/"/, '').gsub(/=/, '_').gsub(/-/, '_') if interim_data =~ /=/
-        end
-        if metric_val_and_time =~ / /
-          hash_data["#{prefix}#{separator}#{metric_name}_#{additional_dim_name}"] =
-              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
+        additional_dims.split(/,/).map do |interim_dim_data|
+          hash_data_with_dim_fields[prefix + separator + "label" + separator + interim_dim_data.split(/=/)[0]] = interim_dim_data.split(/=/)[1].gsub(/"/, '') if interim_dim_data =~ /=/
         end
+        hash_data_with_dim_fields[prefix + separator + metric_name] = 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
+        hash_data_with_labels << hash_data_with_dim_fields
       else
         metric_name, value, = interim_data.split
         hash_data[prefix + separator + metric_name] =
@@ -35,5 +29,6 @@ class ElasticMetricsParser < BaseMetricsParser
       end
     end
     hash_data_array << hash_data
+    (hash_data_array << hash_data_with_labels).flatten!
   end
 end

data/lib/fluent/plugin/in_jfrog_metrics.rb

@@ -34,8 +34,8 @@ module Fluent
       config_param :tag, :string, default: ''
       config_param :jpd_url, :string, default: ''
       config_param :username, :string, default: ''
-      config_param :apikey, :string, default: ''
-      config_param :token, :string, default: ''
+      config_param :apikey, :string, default: '', :secret => true
+      config_param :token, :string, default: '', :secret => true
       config_param :interval, :time, default: 10
       config_param :metric_prefix, :string, default: ''
       config_param :target_platform, :string, default: 'SPLUNK'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jfrog-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - MahithaB, VasukiN, giri-vsr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler