fluent-plugin-prometheus-pull 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a0a3f5b93d2e46f80149be477104c931901251c2f5f14c1df5661986566f663
-  data.tar.gz: e4b68baef6a5150c8df33ae2784d67e5d6660dfe78d81678e48c01b10056802e
+  metadata.gz: 4bf56d6a19e8eb5e8e032434ebc12267e845cb539ee6b0ceeedd29f8c83e8e1f
+  data.tar.gz: df7deb6aee0408f7f8200d852b2ad63ce969cb9f74fba75ac9c3dc7eb5907693
 SHA512:
-  metadata.gz: 5589dd9e1cd671bf1d2fccec26af649715d583dafc44cb63a312805c440a76260c935004721d853fba54164ef67fee70d1593ee88f164a16e57e974577d70da3
-  data.tar.gz: b31a56ca58efc9bc8aab602d6f2620d16397a1e34184fd57625e27d6870160d6c9898752cc86d624fab87499e9deca13250d78bc1b837848eeadc9f112f2ced3
+  metadata.gz: ab1ee690706221a9b3943cea0218da2e529f103c309f3dfed01f1de5f879de20c6b196a63dd7628b20c215b100430c36dc583b25262b66b83ae2d6c652f7512f
+  data.tar.gz: 72bb075b1a1e15f441a1b2d0d4ef82e89072c5227ff35a337c9c0fe9af4799a1fb3f4bf41d0898d466bd6118552f08881edf3df724702852d5f28ddbe9787381

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-prometheus-pull (0.3.0)
+    fluent-plugin-prometheus-pull (0.4.0)
       fluentd (>= 0.14.10, < 2)
 
 GEM

data/README.md

@@ -11,11 +11,11 @@ Pull http prometheus metric endpoint.
 
 with options:
 
-| options       | default | usage                                            |
-|---------------|---------|--------------------------------------------------|
-|               |         |                                                  |
-| event_url_key | nil     | add in generated event, key to store fetched url |
-|               |         |                                                  |
+| options             | default | usage                                                |
+|---------------------|---------|------------------------------------------------------|
+|                     |         |                                                      |
+| event_url_key       | nil     | define the key that will store the fetched url       |
+| event_url_label_key | nil     | define the key that will store the fetched url label |
 
 Example:
 
@@ -74,6 +74,6 @@ plugin will work with:
 
 ## Copyright
 
-* Copyright(c) 2023- Thomas Tych
+* Copyright(c) 2023-2024 Thomas Tych
 * License
   * Apache License, Version 2.0

data/fluent-plugin-prometheus-pull.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-prometheus-pull'
-  spec.version = '0.3.0'
+  spec.version = '0.4.0'
   spec.authors = ['Thomas Tych']
   spec.email   = ['thomas.tych@gmail.com']
 

data/lib/fluent/plugin/in_prometheus_pull.rb

@@ -20,6 +20,8 @@ require 'uri'
 
 require 'fluent/plugin/input'
 
+require_relative 'prometheus_pull/labeled_url'
+
 module Fluent
   module Plugin
     # input / source
@@ -27,6 +29,8 @@ module Fluent
     class PrometheusPullInput < Fluent::Plugin::Input
       Fluent::Plugin.register_input('prometheus_pull', self)
 
+      attr_reader :labeled_urls
+
       helpers :timer, :parser, :compat_parameters
 
       desc 'The tag of the event'
@@ -65,6 +69,8 @@ module Fluent
 
       desc 'Event URL key'
       config_param :event_url_key, :string, default: nil
+      desc 'Event URL label key'
+      config_param :event_url_label_key, :string, default: nil
 
       def configure(conf)
         compat_parameters_convert(conf, :parser)
@@ -78,6 +84,8 @@ module Fluent
 
         super
 
+        @labeled_urls = urls.map { |url| parse_url(url) }
+
         @parser = parser_create(conf: parser_config)
       end
 
@@ -88,13 +96,15 @@ module Fluent
       end
 
       def pull
-        urls.each do |url|
+        labeled_urls.each do |url|
           pull_time = Fluent::EventTime.now
-          raw_metrics = fetch(url)
+          raw_metrics = fetch(url.url)
           parser.parse(raw_metrics) do |time, record|
             begin
               time ||= pull_time
-              record[event_url_key] = url if event_url_key
+              record[event_url_key] = url.url if event_url_key
+              record[event_url_label_key] = url.label if event_url_label_key && url.label
+
               router.emit(tag, time, record)
             rescue StandardError => e
               error("error #{e}, while emitting #{record}")
@@ -157,6 +167,10 @@ module Fluent
 
         log.error(message)
       end
+
+      def parse_url(labeled_url)
+        PrometheusPull::LabeledUrl.parse_labeled_url(labeled_url)
+      end
     end
   end
 end

data/lib/fluent/plugin/prometheus_pull/labeled_url.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Fluent
+  module Plugin
+    module PrometheusPull
+      class LabeledUrl
+        LABELED_URL_RE = /^(?:@(?<label>[^@]*)@)?(?<url>.*)$/.freeze
+
+        attr_reader :url, :label
+
+        def initialize(url:, label: nil)
+          @url = url
+          @label = label
+        end
+
+        def to_s
+          url
+        end
+
+        def self.parse_labeled_url(url)
+          match_data = LABELED_URL_RE.match(url)
+
+          raise Fluent::ConfigError, "unable to use url '#{url}'" unless match_data
+
+          new(url: match_data[:url],
+              label: match_data[:label])
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus-pull
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Thomas Tych
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-17 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -199,6 +199,7 @@ files:
 - fluent-plugin-prometheus-pull.gemspec
 - lib/fluent/plugin/in_prometheus_pull.rb
 - lib/fluent/plugin/parser_prometheus_text.rb
+- lib/fluent/plugin/prometheus_pull/labeled_url.rb
 homepage: https://gitlab.com/ttych/fluent-plugin-prometheus-pull.git
 licenses:
 - Apache-2.0