fluent-plugin-jfrog-metrics 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153623916b501853ef025525cefc4551ec8d5d329676ef05d3ad551407c3ab0b
-  data.tar.gz: 2b745e254c5c26595fdf613a86db2481043d9200d67e8992fd0916a70ea39148
+  metadata.gz: a5d5ad46df6caec2199b42f521c9722ce27552d988fda9950d8f5dac659e40ed
+  data.tar.gz: 4ec636b979f8cae25013c698d977d3b9021b68325b806b8c415f3fa356396593
 SHA512:
-  metadata.gz: fede67bdc22edb80a3b0e70a6c88d11982bd42ea34e3b4f97e4cb5c515f8a1438bc05c6eea9ef4c25fb5dca4a5afba09728765e4a57fc4578fca58580f626830
-  data.tar.gz: 9a5200078dec8a016e424af221ad02c0708802f35dba1603ab5b1f415720657f20b0bce18ec78e27fd6313e9b9cac62e24d78b4f7ee644917fbe5b8f15c236aa
+  metadata.gz: c0e1bc0f53fd024f6f200b27a4e0c39f98833b1412bf2fcaebbd24c743e7188dd8107c5a5f5e31c12cf8c0d9a88387ffe19bc5852e53c38afbe1b29dc18eebfa
+  data.tar.gz: f1db053da0248b953b9c023d092b101bd22dbf8a2a7a7379efacc675d6fb3ca8e161ea1dc66d43f01483da9e898057b0f373b4961781efe924a38420a585643a

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.13'
+  spec.version = '0.2.14'
   spec.authors = ['MahithaB, BenHarosh']
   spec.email   = ['cpe-support@jfrog.com']
 

data/lib/fluent/plugin/datadog_metrics_parser.rb

@@ -27,15 +27,20 @@ class DatadogMetricsParser < BaseMetricsParser
           interim_data_tag = interim_data_key + ':' + interim_data_value
           tags << interim_data_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
+        parts = metric_val_and_time.strip.split
+        metrics_hash['metric'] = prefix + separator + metric_name
+        if parts.length >= 2
+          # Metric WITH timestamp - use existing timestamp
+          metric_timestamp = parts[1]
+          point['timestamp'] = metric_timestamp[0,10].to_i
+        else
+          # Metric WITHOUT timestamp - use current time
+          point['timestamp'] = Time.now.to_i
         end
+        point['value'] = parts[0].to_f
+        points << point
+        metrics_hash['points'] = points
+        metrics_hash['tags'] = tags
       else
         metrics_hash['metric'], metric_value, metric_timestamp = interim_data.split
         metrics_hash['metric'] = prefix + separator + metrics_hash['metric']

data/lib/fluent/plugin/metrics_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rest-client'
+require_relative 'proxy_helper'
 
 class MetricsHelper
   @@obs_endpoint_exists = false
@@ -54,6 +55,9 @@ class MetricsHelper
 
   def check_endpoint(url, token, verify_ssl, request_timeout)
     @logger.debug("Checking connectivity to endpoint: #{url} started")
+    # Configure proxy with NO_PROXY support
+    ProxyHelper.configure_rest_client_proxy(url, nil, @logger)
+    
     request = RestClient::Request.new(
       method: :get,
       url: url,
@@ -76,6 +80,9 @@ class MetricsHelper
 
   def execute_rest_call(url, user, password, token, use_token, verify_ssl, request_timeout)
     @logger.debug("Rest call to fetch metrics started")
+    # Configure proxy with NO_PROXY support
+    ProxyHelper.configure_rest_client_proxy(url, nil, @logger)
+    
     request = if use_token == true
       @logger.debug("Using token for authentication")
       RestClient::Request.new(

data/lib/fluent/plugin/proxy_helper.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'uri'
+
+module ProxyHelper
+  # Check if a host should bypass the proxy based on NO_PROXY environment variable
+  def self.should_bypass_proxy?(url, logger = nil)
+    no_proxy = ENV['NO_PROXY'] || ENV['no_proxy']
+    return false if no_proxy.nil? || no_proxy.empty?
+
+    begin
+      target_host = URI.parse(url).host
+      return false if target_host.nil?
+
+      no_proxy_hosts = no_proxy.split(',').map(&:strip)
+
+      no_proxy_hosts.each do |pattern|
+        next if pattern.empty?
+
+        # Remove leading dot if present (e.g., ".example.com" -> "example.com")
+        # Downcase both for case-insensitive matching (domain names are case-insensitive per RFC 1035)
+        pattern = pattern.sub(/^\./, '').downcase
+        target_host_lower = target_host.downcase
+
+        # Check for exact match or subdomain match
+        if target_host_lower == pattern || target_host_lower.end_with?(".#{pattern}")
+          logger&.debug("Host '#{target_host}' matches NO_PROXY pattern '#{pattern}', bypassing proxy")
+          return true
+        end
+
+        # Check for wildcard
+        if pattern == '*'
+          logger&.debug("NO_PROXY contains '*', bypassing proxy for all hosts")
+          return true
+        end
+      end
+    rescue URI::InvalidURIError => e
+      logger&.warn("Failed to parse URL '#{url}': #{e.message}")
+      return false
+    end
+
+    false
+  end
+
+  # Get the proxy URL to use for a given target URL
+  # Returns nil if proxy should be bypassed, otherwise returns the proxy URL
+  def self.get_proxy_for_url(url, http_proxy_param = nil, logger = nil)
+    # Check if this URL should bypass proxy
+    if should_bypass_proxy?(url, logger)
+      return nil
+    end
+
+    # Return proxy URL in order of precedence
+    if http_proxy_param && !http_proxy_param.empty?
+      logger&.debug("Using http_proxy param for request. Proxy url: #{http_proxy_param}")
+      return http_proxy_param
+    elsif ENV['HTTP_PROXY'] && !ENV['HTTP_PROXY'].empty?
+      logger&.debug("Using 'HTTP_PROXY' environment variable for request. Proxy url: #{ENV['HTTP_PROXY']}")
+      return ENV['HTTP_PROXY']
+    elsif ENV['http_proxy'] && !ENV['http_proxy'].empty?
+      logger&.debug("Using 'http_proxy' environment variable for request. Proxy url: #{ENV['http_proxy']}")
+      return ENV['http_proxy']
+    elsif ENV['HTTPS_PROXY'] && !ENV['HTTPS_PROXY'].empty?
+      logger&.debug("Using 'HTTPS_PROXY' environment variable for request. Proxy url: #{ENV['HTTPS_PROXY']}")
+      return ENV['HTTPS_PROXY']
+    elsif ENV['https_proxy'] && !ENV['https_proxy'].empty?
+      logger&.debug("Using 'https_proxy' environment variable for request. Proxy url: #{ENV['https_proxy']}")
+      return ENV['https_proxy']
+    end
+
+    nil
+  end
+
+  # Configure RestClient proxy for a given URL
+  def self.configure_rest_client_proxy(url, http_proxy_param = nil, logger = nil)
+    proxy_url = get_proxy_for_url(url, http_proxy_param, logger)
+    
+    if proxy_url.nil?
+      RestClient.proxy = nil
+      logger&.debug("Proxy disabled for URL: #{url}")
+    else
+      RestClient.proxy = proxy_url
+      logger&.debug("Proxy enabled for URL: #{url}, using: #{proxy_url}")
+    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.13
+  version: 0.2.14
 platform: ruby
 authors:
 - MahithaB, BenHarosh
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2026-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,7 @@ files:
 - lib/fluent/plugin/in_jfrog_metrics.rb
 - lib/fluent/plugin/metrics_helper.rb
 - lib/fluent/plugin/newrelic_metrics_parser.rb
+- lib/fluent/plugin/proxy_helper.rb
 - lib/fluent/plugin/splunk_metrics_parser.rb
 - spec/fixtures/files/creds.rb
 - spec/fixtures/files/sample_artifactory_metrics.txt
@@ -136,7 +137,7 @@ homepage: https://github.com/jfrog/jfrog-fluentd-plugins/tree/main/fluent-plugin
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+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,