fluent-plugin-jfrog-metrics 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21102bd90a5d5cb08bc3277e641dc23d00f11a6beb7d4bd5c1256efc1b354d30
-  data.tar.gz: 6bd16774a36b1d1ffa6f1286e43e11915aae029faae8ba9eb6f0df93b240b639
+  metadata.gz: b2ae50efd3530bcd0b047c79aca24ee8509c76c972fe834bd2092a55b0d9f807
+  data.tar.gz: 5eb9ead9094b261942d23f8e7181913b41bb08326fb5ec86cc784a29dafd5328
 SHA512:
-  metadata.gz: 28b40128a2fa43f3d74d78bdfe6e322adcafd70492cf4eb6363990596c02e78b7c0e13391ccef7a8771fe96e443f9ab27060d7e71f5e87297f95c8262c5b63f4
-  data.tar.gz: 7cd90e2cd932bf0cd2c0717cea0711cff814d5403d7e3be9cd7ccefd8611f717af6afa60f334d2e579d3f72c5a74a1c7a0fc654ba8d6dd658db980f90727e49a
+  metadata.gz: 3bde97c36506f91725cc8a13fae533929a6d6bb461822f701095e205e96c421e10df47213b94e3c7b12cc284880ff7361eb401202b84acf07bb16c781ccd42e5
+  data.tar.gz: 8b5096c569210002908e19f416a5e605ece7d26e725037e10c2d9c57be06a28624bb0456d4dcaed8afee732c3bbd1c9bc77ebde1782bb571f3ebc577e12ae9c0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-jfrog-metrics (0.2.3)
+    fluent-plugin-jfrog-metrics (0.2.5)
       fluentd (>= 0.14.10, < 2)
       rest-client (~> 2.0)
 
@@ -10,21 +10,21 @@ 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)
-    fluentd (1.14.5)
+    fluentd (1.16.1)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.2.5, < 3.0.0)
+      serverengine (>= 2.3.2, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
-      webrick (>= 1.4.2, < 1.8.0)
+      webrick (~> 1.4)
       yajl-ruby (~> 1.0)
     http-accept (1.7.0)
     http-cookie (1.0.4)
@@ -39,7 +39,7 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    msgpack (1.4.5)
+    msgpack (1.7.1)
     netrc (0.11.0)
     power_assert (2.0.1)
     rake (12.3.3)
@@ -49,21 +49,21 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     ruby-progressbar (1.11.0)
-    serverengine (2.2.5)
+    serverengine (2.3.2)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     strptime (0.2.5)
     test-unit (3.5.0)
       power_assert
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.5)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8)
-    webrick (1.7.0)
-    yajl-ruby (1.4.1)
+    webrick (1.8.1)
+    yajl-ruby (1.4.3)
 
 PLATFORMS
   ruby

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.3'
+  spec.version = '0.2.5'
   spec.authors = ['MahithaB, VasukiN, giri-vsr']
   spec.email   = ['cpe-support@jfrog.com']
 

data/lib/fluent/plugin/datadog_metrics_parser.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+require 'json'
+require_relative 'base_metrics_parser'
+
+class DatadogMetricsParser < BaseMetricsParser
+  def initialize(metric_prefix, router, tag)
+    @metric_prefix = metric_prefix
+    @router = router
+    @tag = tag
+  end
+
+  def format_data(cleaned_data = [], prefix = '', separator = '')
+    hash_data_array = []
+    data_hash = {}
+    data_array = []
+    cleaned_data.each do |interim_data|
+      metrics_hash = {}
+      tags = []
+      point = {}
+      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
+        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['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
+          metrics_hash['tags'] = tags
+        end
+      else
+        metrics_hash['metric'], metric_value, metric_timestamp = interim_data.split
+        metrics_hash['metric'] = prefix + separator + metrics_hash['metric']
+        point['value'] = metric_value =~ /^\S*\.\S*$/ ? metric_value.to_f : metric_value.to_i
+        point['timestamp'] = metric_timestamp[0,10].to_i
+        points << point
+        metrics_hash['points'] = points
+      end
+      metrics_hash['type'] = 3
+      data_array << metrics_hash
+    end
+    data_hash["series"] = data_array
+    hash_data_array.push(data_hash)
+    hash_data_array
+  end
+
+end

data/lib/fluent/plugin/elastic_metrics_parser.rb

@@ -20,12 +20,11 @@ class ElasticMetricsParser < BaseMetricsParser
         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_dim_fields[prefix + separator + metric_name] = metric_val_and_time.strip.split[0].to_f
         hash_data_with_labels << hash_data_with_dim_fields
       else
         metric_name, value, = interim_data.split
-        hash_data[prefix + separator + metric_name] =
-            value =~ /^\S*\.\S*$/ ? value.to_f : value.to_i
+        hash_data[prefix + separator + metric_name] = value.to_f
       end
     end
     hash_data_array << hash_data

data/lib/fluent/plugin/in_jfrog_metrics.rb

@@ -22,6 +22,7 @@ require_relative 'metrics_helper'
 require_relative 'newrelic_metrics_parser'
 require_relative 'splunk_metrics_parser'
 require_relative 'elastic_metrics_parser'
+require_relative 'datadog_metrics_parser'
 
 module Fluent
   module Plugin
@@ -97,6 +98,8 @@ module Fluent
           parser = ElasticMetricsParser.new(@metric_prefix, router, @tag)
         elsif @target_platform == 'NEWRELIC'
           parser = NewRelicMetricsParser.new(@metric_prefix, router, @tag)
+        elsif @target_platform == 'DATADOG'
+          parser = DatadogMetricsParser.new(@metric_prefix, router, @tag)
         else
           raise 'Parser Type is not valid.Should be SPLUNK or ELASTIC or NEWRELIC'
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jfrog-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - MahithaB, VasukiN, giri-vsr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,7 @@ files:
 - Rakefile
 - fluent-plugin-jfrog-metrics.gemspec
 - lib/fluent/plugin/base_metrics_parser.rb
+- lib/fluent/plugin/datadog_metrics_parser.rb
 - lib/fluent/plugin/elastic_metrics_parser.rb
 - lib/fluent/plugin/in_jfrog_metrics.rb
 - lib/fluent/plugin/metrics_helper.rb