fluent-plugin-jfrog-metrics 0.2.14 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5d5ad46df6caec2199b42f521c9722ce27552d988fda9950d8f5dac659e40ed
-  data.tar.gz: 4ec636b979f8cae25013c698d977d3b9021b68325b806b8c415f3fa356396593
+  metadata.gz: 335f7170ad6eed8eb8237cfe912c0e6c547825a7b16904ebbd84c0247e51dbf6
+  data.tar.gz: 73c094c9e41b5e163e5a6f604073a7ec84530fc9376033cc555aa15df58d21e5
 SHA512:
-  metadata.gz: c0e1bc0f53fd024f6f200b27a4e0c39f98833b1412bf2fcaebbd24c743e7188dd8107c5a5f5e31c12cf8c0d9a88387ffe19bc5852e53c38afbe1b29dc18eebfa
-  data.tar.gz: f1db053da0248b953b9c023d092b101bd22dbf8a2a7a7379efacc675d6fb3ca8e161ea1dc66d43f01483da9e898057b0f373b4961781efe924a38420a585643a
+  metadata.gz: 84d8410b8fcccefdca9b76071cbf1a2e42cba33fde5fb973e52e09939f52b08d779f533189220c982af2a131b231807dcc76b2293661c327acf323cbf6cf495b
+  data.tar.gz: 58cb4bd996293b1ec508b35281f39788f5be88a32900da0faa941377328a9f9accd383b8673be109b3251c65176d9c7df9fde24e6084917fff96f4ca8f9d4272

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+
+## v0.2.16
+- Added RTFS (Real-Time File Store) metrics endpoint support ([JOBS-1897](https://jfrog-int.atlassian.net/browse/JOBS-1897))
+- New metric_prefix `jfrog.rtfs` maps to `/artifactory/service/rtfs/api/v1/metrics`
+
+## v0.2.13
+- Added fix to parse metrics without timestamps (JOBS-1801)
+- Honour NO_PROXY environment variable for log analytics solutions (JOBS-1732)
+
+## v0.2.12
+- Add FluentD logger option to metrics plugins (PTRENG-6541)
+- Fix wrapper for gzip stream handling (PTRENG-6489)
+- Enhance HTTP request timeout handling (PTRENG-6489)
+
+## v0.2.11
+- Add support for verify_ssl flag (PTRENG-6164)
+- Add http_proxy param support for API calls to vendors (PTRENG-6261)

data/fluent-plugin-jfrog-metrics.gemspec

@@ -3,12 +3,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-jfrog-metrics'
-  spec.version = '0.2.14'
+  spec.version = '0.2.16'
   spec.authors = ['MahithaB, BenHarosh']
   spec.email   = ['cpe-support@jfrog.com']
 
-  spec.summary       = %q{Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics (Prometheus Exposition Format) to target observability platform format (Splunk HEC, New Relic, DataDog)}
-  spec.description   = %q{Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics (Prometheus Exposition Format) to target observability platform format (Splunk HEC, New Relic, DataDog)}
+  spec.summary       = %q{Fluentd Plugin for converting JFrog Artifactory, Xray, RTFS generated metrics (Prometheus Exposition Format) to target observability platform format (Splunk HEC, New Relic, DataDog)}
+  spec.description   = %q{Fluentd Plugin for converting JFrog Artifactory, Xray, RTFS generated metrics (Prometheus Exposition Format) to target observability platform format (Splunk HEC, New Relic, DataDog)}
 
   spec.homepage      = 'https://github.com/jfrog/jfrog-fluentd-plugins/tree/main/fluent-plugin-jfrog-metrics'
   spec.license       = 'Apache-2.0'

data/lib/fluent/plugin/datadog_metrics_parser.rb

@@ -19,7 +19,7 @@ class DatadogMetricsParser < BaseMetricsParser
       point = {}
       points = []
       if interim_data =~ /{/ && interim_data =~ /}/
-        metric_name, additional_dims, metric_val_and_time = interim_data.match(/(.*){(.*)}(.*)/i).captures
+        metric_name, additional_dims, metric_val_and_time = interim_data.match(/(.*?){(.*)}(.*)/i).captures
         additional_dims.split("\",").each do |interim_data|
           pair_data = interim_data.gsub("\"", "").gsub("{", "").gsub("}", "")
           interim_data_value = pair_data.split("=", 2)[1]

data/lib/fluent/plugin/metrics_helper.rb

@@ -26,6 +26,8 @@ class MetricsHelper
             "#{@jpd_url}/artifactory/api/v1/metrics"
           when 'jfrog.xray'
             "#{@jpd_url}/xray/api/v1/metrics"
+          when 'jfrog.rtfs'
+            "#{@jpd_url}/rtfs/api/v1/metrics"
           else
             "#{@jpd_url}/artifactory/api/v1/metrics"
           end

data/lib/fluent/plugin/newrelic_metrics_parser.rb

@@ -17,7 +17,7 @@ class NewRelicMetricsParser < BaseMetricsParser
       metrics_hash = {}
       if interim_data =~ /{/ && interim_data =~ /}/
         attributes = {}
-        metric_name, additional_dims, metric_val_and_time = interim_data.match(/(.*){(.*)}(.*)/i).captures
+        metric_name, additional_dims, metric_val_and_time = interim_data.match(/(.*?){(.*)}(.*)/i).captures
         additional_dims.split("\",").each do |interim_data|
           pair_data = interim_data.gsub("\"", "").gsub("{", "").gsub("}", "")
           interim_data_value = pair_data.split("=", 2)[1]

data/lib/fluent/plugin/splunk_metrics_parser.rb

@@ -20,7 +20,7 @@ class SplunkMetricsParser < BaseMetricsParser
   def generate_hash_from_data(data = '', prefix = '', separator = '')
     metrics_hash = {}
     if data =~ /{/ && data =~ /}/
-      metric_name, additional_dims, metric_val_and_time = data.match(/(.*){(.*)}(.*)/i).captures
+      metric_name, additional_dims, metric_val_and_time = data.match(/(.*?){(.*)}(.*)/i).captures
       if metric_val_and_time =~ / /
         metrics_hash['metric_name'] = prefix + separator + metric_name
         metrics_hash['value'] =

data/spec/lib/datadog_metrics_parser_spec.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+[
+  File.join(File.dirname(__FILE__), '..'),
+  File.join(File.dirname(__FILE__), '..', 'lib/fluent/plugin'),
+  File.join(File.dirname(__FILE__), '..', 'spec'),
+].each do |dir|
+  $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir)
+end
+
+require 'datadog_metrics_parser'
+require 'date'
+require 'rspec'
+
+
+RSpec.describe DatadogMetricsParser do
+  describe "#emit_parsed_metrics" do
+    it 'should read sample Artifactory metrics data and verify the size of parsed data > 1' do
+      platform_metrics = File.read('./spec/fixtures/files/sample_artifactory_metrics.txt')
+      expect(platform_metrics.size).to be > 1
+
+      parser = DatadogMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      expect(normalized_data.size).to be > 1
+
+      cleaned_data = parser.clean_data(normalized_data)
+      expect(cleaned_data.size).to be > 1
+
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.artifactory', '.')
+      expect(hash_data_array.size).to be 1
+      expect(hash_data_array[0]['series'].size).to be > 1
+
+      serialized_data = parser.serialize_data(hash_data_array)
+      expect(serialized_data.size).to be 1
+    end
+
+    it 'should read sample Xray metrics data and verify the size of parsed data > 1' do
+      platform_metrics = File.read('./spec/fixtures/files/sample_xray_metrics.txt')
+      expect(platform_metrics.size).to be > 1
+
+      parser = DatadogMetricsParser.new('jfrog.xray', '', 'jfrog.xray.metrics')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      expect(normalized_data.size).to be > 1
+
+      cleaned_data = parser.clean_data(normalized_data)
+      expect(cleaned_data.size).to be > 1
+
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.xray', '.')
+      expect(hash_data_array.size).to be 1
+      expect(hash_data_array[0]['series'].size).to be > 1
+
+      serialized_data = parser.serialize_data(hash_data_array)
+      expect(serialized_data.size).to be 1
+    end
+
+    it 'should parse RTFS metrics with jfrog.rtfs prefix and verify all metric names are prefixed' do
+      platform_metrics = File.read('./spec/fixtures/files/sample_artifactory_metrics.txt')
+      expect(platform_metrics.size).to be > 1
+
+      parser = DatadogMetricsParser.new('jfrog.rtfs', '', 'jfrog.metrics.rtfs')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      expect(normalized_data.size).to be > 1
+
+      cleaned_data = parser.clean_data(normalized_data)
+      expect(cleaned_data.size).to be > 1
+
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.rtfs', '.')
+      expect(hash_data_array.size).to be 1
+      expect(hash_data_array[0]['series'].size).to be > 1
+
+      hash_data_array[0]['series'].each do |metric|
+        expect(metric['metric']).to start_with('jfrog.rtfs.')
+        expect(metric['points']).not_to be_nil
+        expect(metric['points'].size).to be >= 1
+        expect(metric['points'][0]['value']).to be_a(Numeric)
+      end
+
+      serialized_data = parser.serialize_data(hash_data_array)
+      expect(serialized_data.size).to be 1
+    end
+
+    it 'should parse a single RTFS metric line correctly' do
+      single_metric = "sys_memory_used_bytes 3836522496 1645738619452"
+
+      parser = DatadogMetricsParser.new('jfrog.rtfs', '', 'jfrog.metrics.rtfs')
+
+      hash_data_array = parser.format_data([single_metric], 'jfrog.rtfs', '.')
+      expect(hash_data_array.size).to be 1
+      expect(hash_data_array[0]['series'].size).to be 1
+
+      metric = hash_data_array[0]['series'][0]
+      expect(metric['metric']).to eq('jfrog.rtfs.sys_memory_used_bytes')
+      expect(metric['points'][0]['value']).to eq(3836522496)
+      expect(metric['points'][0]['timestamp']).to eq(1645738619)
+      expect(metric['type']).to eq(3)
+    end
+  end
+end

data/spec/lib/newrelic_metrics_parser_spec.rb

@@ -51,5 +51,29 @@ RSpec.describe NewRelicMetricsParser do
       serialized_data = parser.serialize_data(hash_data_array)
       expect(serialized_data.size).to be  1
     end
+
+    it 'should parse RTFS metrics with jfrog.rtfs prefix and verify all metric names are prefixed' do
+      platform_metrics = File.read('./spec/fixtures/files/sample_artifactory_metrics.txt')
+      expect(platform_metrics.size).to be > 1
+
+      parser = NewRelicMetricsParser.new('jfrog.rtfs', '', 'jfrog.metrics.rtfs')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      expect(normalized_data.size).to be > 1
+
+      cleaned_data = parser.clean_data(normalized_data)
+      expect(cleaned_data.size).to be > 1
+
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.rtfs', '.')
+      expect(hash_data_array.size).to be 1
+
+      hash_data_array[0]['metrics'].each do |metric|
+        expect(metric['name']).to start_with('jfrog.rtfs.')
+        expect(metric['value']).to be_a(Numeric)
+      end
+
+      serialized_data = parser.serialize_data(hash_data_array)
+      expect(serialized_data.size).to be 1
+    end
   end
 end

data/spec/lib/splunk_metrics_parser_spec.rb

@@ -51,5 +51,29 @@ RSpec.describe SplunkMetricsParser do
       serialized_data = parser.serialize_data(hash_data_array)
       expect(serialized_data.size).to be > 1
     end
+
+    it 'should parse RTFS metrics with jfrog.rtfs prefix and verify all metric names are prefixed' do
+      platform_metrics = File.read('./spec/fixtures/files/sample_artifactory_metrics.txt')
+      expect(platform_metrics.size).to be > 1
+
+      parser = SplunkMetricsParser.new('jfrog.rtfs', '', 'jfrog.metrics.rtfs')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      expect(normalized_data.size).to be > 1
+
+      cleaned_data = parser.clean_data(normalized_data)
+      expect(cleaned_data.size).to be > 1
+
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.rtfs', '.')
+      expect(hash_data_array.size).to be > 1
+
+      hash_data_array.each do |metric|
+        expect(metric['metric_name']).to start_with('jfrog.rtfs.')
+        expect(metric['value']).to be_a(Numeric)
+      end
+
+      serialized_data = parser.serialize_data(hash_data_array)
+      expect(serialized_data.size).to be > 1
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jfrog-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.16
 platform: ruby
 authors:
 - MahithaB, BenHarosh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-01-19 00:00:00.000000000 Z
+date: 2026-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,9 +100,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
-description: Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics
-  (Prometheus Exposition Format) to target observability platform format (Splunk HEC,
-  New Relic, DataDog)
+description: Fluentd Plugin for converting JFrog Artifactory, Xray, RTFS generated
+  metrics (Prometheus Exposition Format) to target observability platform format (Splunk
+  HEC, New Relic, DataDog)
 email:
 - cpe-support@jfrog.com
 executables: []
@@ -111,6 +111,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -127,6 +128,7 @@ files:
 - spec/fixtures/files/creds.rb
 - spec/fixtures/files/sample_artifactory_metrics.txt
 - spec/fixtures/files/sample_xray_metrics.txt
+- spec/lib/datadog_metrics_parser_spec.rb
 - spec/lib/metrics_helper_spec.rb
 - spec/lib/newrelic_metrics_parser_spec.rb
 - spec/lib/splunk_metrics_parser_spec.rb
@@ -155,13 +157,14 @@ requirements: []
 rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
-summary: Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics (Prometheus
-  Exposition Format) to target observability platform format (Splunk HEC, New Relic,
-  DataDog)
+summary: Fluentd Plugin for converting JFrog Artifactory, Xray, RTFS generated metrics
+  (Prometheus Exposition Format) to target observability platform format (Splunk HEC,
+  New Relic, DataDog)
 test_files:
 - spec/fixtures/files/creds.rb
 - spec/fixtures/files/sample_artifactory_metrics.txt
 - spec/fixtures/files/sample_xray_metrics.txt
+- spec/lib/datadog_metrics_parser_spec.rb
 - spec/lib/metrics_helper_spec.rb
 - spec/lib/newrelic_metrics_parser_spec.rb
 - spec/lib/splunk_metrics_parser_spec.rb