fluent-plugin-jfrog-metrics 0.2.12.2 → 0.2.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38cfa0bcb5a231e76d279f77fcc986f593d0b3419a382db75b7fbbced8462afd
-  data.tar.gz: 569d77cf394b138961124c823e90672d941e1c207acdfcf2eb682632d29b5e05
+  metadata.gz: 8b4d1c7705dae2a6fb816d3aef9e5372648b533a809b9a967bf1f94c024b20e8
+  data.tar.gz: 6a84d71c12bd89350b51608c738aa30d9f9e86e430213d8f8486ba51c9f12a63
 SHA512:
-  metadata.gz: bcca22a3705f8d6c7b711748203ba7bd3ea06d9779b9dfe4082e1990a19af5d2ed74926e91150f624c9023b830209080594514459dc05ca9faf65c930a568713
-  data.tar.gz: a218f823e45bf3ff3ac0674d1384c69342fb1e6bffd96ed3fc98b6fb8b3f8d1259af492632f1af7d80d0f0585741858adeedb02c0afb9faae3feae6ea17d28c7
+  metadata.gz: f4ddb5c65a5760460f48ca17e32fe6ae07a8190ea5020bd5e82ba408902d21d1e0d46728ebdadbe2f26140ab36309e20e6d06f2c47c7b174bd0a105e20ceaa36
+  data.tar.gz: 3ca8608a7f5e675b435cf650998e6907f733ce77b14154a9ac5cc1764a316a22ff0ed6ec52a6ceb5951e362467bc4f004d45b0dd851730d0af2c3b04c5b1fa9a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-jfrog-metrics (0.2.12.2)
+    fluent-plugin-jfrog-metrics (0.2.12.3)
       fluentd (>= 0.14.10, < 2)
       rest-client (~> 2.1.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.12.2'
+  spec.version = '0.2.12.3'
   spec.authors = ['MahithaB, BenHarosh']
   spec.email   = ['cpe-support@jfrog.com']
 

data/lib/fluent/plugin/in_jfrog_metrics.rb

@@ -108,6 +108,10 @@ module Fluent
           metrics_helper = MetricsHelper.new($logger, @metric_prefix, @jpd_url, @username, @apikey, @token, @common_jpd, @verify_ssl, @request_timeout)
           platform_metrics = metrics_helper.get_metrics
 
+          if platform_metrics.nil?
+            raise "Error while fetching platform metrics. Metrics response was null"
+          end
+
           additional_metrics = metrics_helper.get_additional_metrics
           if !additional_metrics.nil? && additional_metrics != ''
             platform_metrics += additional_metrics.to_s

data/lib/fluent/plugin/metrics_helper.rb

@@ -30,12 +30,14 @@ class MetricsHelper
           end
     
     @logger.info("Executing #{@metric_prefix} metrics collection from: #{url}")
+    metrics = nil
     if !@token.nil? && @token != ''
-      execute_rest_call(url, @username, nil, @token, true, @verify_ssl, @request_timeout)
+      metrics = execute_rest_call(url, @username, nil, @token, true, @verify_ssl, @request_timeout)
     elsif !@apikey.nil? && @apikey != ''
-      execute_rest_call(url, @username, @apikey, nil, false, @verify_ssl, @request_timeout)
+      metrics = execute_rest_call(url, @username, @apikey, nil, false, @verify_ssl, @request_timeout)
     end
     @logger.debug("Get metrics finished")
+    return metrics
   end
 
   def get_additional_metrics
@@ -44,9 +46,10 @@ class MetricsHelper
       url = "#{@jpd_url}/observability/api/v1/metrics"
       @logger.info("Collecting additional metrics from: #{url}")
       check_endpoint(url, @token, @verify_ssl, @request_timeout) if @@obs_endpoint_exists == nil? || !@@obs_endpoint_exists
-      execute_rest_call(url, @username, nil, @token, true, @verify_ssl, @request_timeout) if @@obs_endpoint_exists
+      additional_metrics = execute_rest_call(url, @username, nil, @token, true, @verify_ssl, @request_timeout) if @@obs_endpoint_exists
     end
     @logger.info("Aadditional metrics collection finished")
+    return additional_metrics
   end
 
   def check_endpoint(url, token, verify_ssl, request_timeout)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jfrog-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.12.2
+  version: 0.2.12.3
 platform: ruby
 authors:
 - MahithaB, BenHarosh