fluent-plugin-prometheus-smarter 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c2cda69af325db41ca82963d27f977bf9f538292722d45081ee679db4beceb1
-  data.tar.gz: 39972b2ffe7e899412df2906979e6477acd5f794cad39dfe5cefdb6b5f2919c9
+  metadata.gz: f1fa3d38332098758e8a5503518f0952613e248cf0bc31fef028122f5325dc51
+  data.tar.gz: d134b4080167f1411d603be959133d6188001481b198d59a807f8e11677f0668
 SHA512:
-  metadata.gz: d4758adde70167f804d93c031105127db3993fa9a1a02620543f9cc183aacc7587e2dd4bcac4cabb35b48c2ea149f3aa42a0d86ce72a08256d13ff6e1df1dffc
-  data.tar.gz: 8569c124ee96a4c88868ab1fe601c96e49b3d12fa01046c3331d996c39207f421d572d1e0d14975db27075215f58e0fea3e694aa8a8a3b393ef98b2383967e43
+  metadata.gz: b8297dfaab8ac867534ece51cd1f4849c2c04fb1b4ad012274cdeb016a5bb617db78082e149fdb39f0bbf9cbb4d92d2ee42da831a511cce09dbb952c5a188ec5
+  data.tar.gz: 50f762bb5613a2c4ac96481ffdcfc426e430a24910d26355622fa85bf6a2229fa3ae59513ea5936412757263e9b6952ca7cf40986668ecad444db920d5a25bb3

data/fluent-plugin-prometheus.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-prometheus-smarter"
-  spec.version       = "1.8.5"
-  spec.authors       = ["Masahiro Sano, Josh Minor"]
-  spec.email         = ["sabottenda@gmail.com"]
+  spec.version       = "1.8.6"
+  spec.authors       = ["Masahiro Sano", "Josh Minor"]
+  spec.email         = ["jishminor@gmail.com"]
   spec.summary       = %q{A fluent plugin that collects metrics and exposes for Prometheus.}
   spec.description   = %q{A fluent plugin that collects metrics and exposes for Prometheus.}
-  spec.homepage      = "https://github.com/fluent/fluent-plugin-prometheus"
+  spec.homepage      = "https://github.com/jishminor/fluent-plugin-prometheus"
   spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/fluent/plugin/out_prometheus_metric.rb

@@ -0,0 +1,71 @@
+require 'fluent/plugin/output'
+require 'fluent/plugin/prometheus'
+
+module Fluent::Plugin
+  class PrometheusOutput < Fluent::Plugin::Output
+    Fluent::Plugin.register_output('prometheus_metric', self)
+    include Fluent::Plugin::PrometheusLabelParser
+    include Fluent::Plugin::Prometheus
+
+    def initialize
+      super
+      @registry = ::Prometheus::Client.registry
+    end
+
+    def multi_workers_ready?
+      true
+    end
+
+    config_param :key, :string
+
+    def labels(record, expander)
+      label = {}
+      labels.each do |k, v|
+        if v.is_a?(String)
+          label[k] = expander.expand(v)
+        else
+          label[k] = v.call(record)
+        end
+      end
+      label
+    end
+
+    def configure(conf)
+      super
+      @labels = parse_labels_elements(conf)
+      @placeholder_values = {}
+      @placeholder_expander_builder = Fluent::Plugin::Prometheus.placeholder_expander(log)
+      @hostname = Socket.gethostname
+    end
+
+    def process(tag, es)
+      placeholder_values = {
+        'tag' => tag,
+        'hostname' => @hostname,
+        'worker_id' => fluentd_worker_id,
+      }
+      
+      # Create metric if not exists
+      begin
+        gauge = registry.gauge(tag.to_sym)
+      rescue ::Prometheus::Client::Registry::AlreadyRegisteredError
+        gauge = registry.get(tag.to_sym)
+      end
+
+      # Write out values in event stream to Registry
+      es.each do |time, record|
+        placeholders = record.merge(placeholder_values)
+        expander = @placeholder_expander_builder.build(placeholders)
+        if @key.is_a?(String)
+          value = record[@key]
+        else
+          value = @key.call(record)
+        end
+        if value
+          gauge.set(labels(record, expander), value)
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus-smarter
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6
 platform: ruby
 authors:
-- Masahiro Sano, Josh Minor
+- Masahiro Sano
+- Josh Minor
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -102,7 +103,7 @@ dependencies:
         version: '0'
 description: A fluent plugin that collects metrics and exposes for Prometheus.
 email:
-- sabottenda@gmail.com
+- jishminor@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -121,6 +122,7 @@ files:
 - lib/fluent/plugin/in_prometheus_output_monitor.rb
 - lib/fluent/plugin/in_prometheus_tail_monitor.rb
 - lib/fluent/plugin/out_prometheus.rb
+- lib/fluent/plugin/out_prometheus_metric.rb
 - lib/fluent/plugin/prometheus.rb
 - lib/fluent/plugin/prometheus/placeholder_expander.rb
 - lib/fluent/plugin/prometheus_metrics.rb
@@ -137,7 +139,7 @@ files:
 - spec/fluent/plugin/prometheus_metrics_spec.rb
 - spec/fluent/plugin/shared.rb
 - spec/spec_helper.rb
-homepage: https://github.com/fluent/fluent-plugin-prometheus
+homepage: https://github.com/jishminor/fluent-plugin-prometheus
 licenses:
 - Apache-2.0
 metadata: {}
@@ -156,8 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A fluent plugin that collects metrics and exposes for Prometheus.