fluent-plugin-jfrog-metrics 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2ae50efd3530bcd0b047c79aca24ee8509c76c972fe834bd2092a55b0d9f807
-  data.tar.gz: 5eb9ead9094b261942d23f8e7181913b41bb08326fb5ec86cc784a29dafd5328
+  metadata.gz: b93ecb5ecea1f1ab7144d5f1032951346c68427c6f2797a9c1799562ab609835
+  data.tar.gz: baa93977ee4ee4015fa1779a3d2c7ae4dc442e1084b730d944e5820664a1ff40
 SHA512:
-  metadata.gz: 3bde97c36506f91725cc8a13fae533929a6d6bb461822f701095e205e96c421e10df47213b94e3c7b12cc284880ff7361eb401202b84acf07bb16c781ccd42e5
-  data.tar.gz: 8b5096c569210002908e19f416a5e605ece7d26e725037e10c2d9c57be06a28624bb0456d4dcaed8afee732c3bbd1c9bc77ebde1782bb571f3ebc577e12ae9c0
+  metadata.gz: e6fc16c13405a355a325f4bd91e0be810e7b84325fdacb638ffa5403c3a6e1fff3d4914231916378d484725f439903ea0e720f5b62c9d6e1270d5f9c867dd871
+  data.tar.gz: d50066d93ceec87c01396a5730531d6bc0018fe50c6ba3f63c62832db5db38009c22b0d1d0a8773c959625b0aa46885ab26e21601d3ac0036079c230993b32cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-jfrog-metrics (0.2.5)
+    fluent-plugin-jfrog-metrics (0.2.6)
       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.2.2)
+    concurrent-ruby (1.1.9)
     cool.io (1.7.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.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.5'
+  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

@@ -36,7 +36,7 @@ class DatadogMetricsParser < BaseMetricsParser
         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

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.6
 platform: ruby
 authors:
 - MahithaB, VasukiN, giri-vsr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler