fluent-plugin-jfrog-metrics 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00c423ab9491557efdbe34b16c0ce13efa20a311e8f91fe9d89a6385e95d9db
-  data.tar.gz: b2bb9ea1003ce8b06bef69fbd6a8d28605e928e7842b2a85cbe6a490c10854d7
+  metadata.gz: b93ecb5ecea1f1ab7144d5f1032951346c68427c6f2797a9c1799562ab609835
+  data.tar.gz: baa93977ee4ee4015fa1779a3d2c7ae4dc442e1084b730d944e5820664a1ff40
 SHA512:
-  metadata.gz: 860cdc25af5d5922732a15a82ec3fa597e66e6acf51f90a827397e10469b0dfe45b2b4d83b58c4f24635743b1e612b41c45ab779f64f2f7d34565d3257faefba
-  data.tar.gz: 664974e6bdcd74531c020381b015ff5783080124bf3d16eec9ef72b6861819b9fa1a5c1759a4616aa99640bbee231c5b044797836a705e56e5ba539c52c48b4c
+  metadata.gz: e6fc16c13405a355a325f4bd91e0be810e7b84325fdacb638ffa5403c3a6e1fff3d4914231916378d484725f439903ea0e720f5b62c9d6e1270d5f9c867dd871
+  data.tar.gz: d50066d93ceec87c01396a5730531d6bc0018fe50c6ba3f63c62832db5db38009c22b0d1d0a8773c959625b0aa46885ab26e21601d3ac0036079c230993b32cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-jfrog-metrics (0.2.4)
+    fluent-plugin-jfrog-metrics (0.2.6)
       fluentd (>= 0.14.10, < 2)
       rest-client (~> 2.0)
 
@@ -14,17 +14,17 @@ GEM
     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.4'
+  spec.version = '0.2.6'
   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 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
+          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/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
@@ -36,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
@@ -54,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 == ''
@@ -76,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
@@ -97,6 +99,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.4
+  version: 0.2.6
 platform: ruby
 authors:
 - MahithaB, VasukiN, giri-vsr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2024-02-26 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