fluent-plugin-prometheus 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0015d77e131a78ad42b181d8d57a981b07398298
-  data.tar.gz: 69cb9279858bef00990af84ee4f82533bb5b4b78
+  metadata.gz: 2e788403193d1cee84b22745fc1df7daff846687
+  data.tar.gz: 2daaa89406fd5fdfd40af646e0710f0f852b4a9e
 SHA512:
-  metadata.gz: 8b51025e9ec268a8dc2252c58a99b80a67d019a15933ea763b05f1c5260a2e1ed5c8f282103ed4f0bfc48ab531e73decb1d74c71a294a3b1f147aa5f147165e2
-  data.tar.gz: ce3da1320eb05ee4d5e5fc258ee4b671a6647a84d7e4960fbed6769240ea6c99ece2be130af334436f32b0d5e40e6061e69730ae61366721022b75fbd7a2e148
+  metadata.gz: b74333d759e146f0ca7c0ab6a6457cefa771f6018fbdd5f20dcae0ac13d74b0ce4b028791ee9045124abe9a9d243a900f341538797b774e56426223e9f66c4d5
+  data.tar.gz: 438a688500a58fd8084b4401987ff192c551405cda063838221041cdfe632db6ea6641aac0ca9a48e5420a9adcfc42837cd117e039f1e05f07558b176114bbce

data/fluent-plugin-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-prometheus"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["Masahiro Sano"]
   spec.email         = ["sabottenda@gmail.com"]
   spec.summary       = %q{A fluent plugin that collects metrics and exposes for Prometheus.}
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "fluentd"
   spec.add_dependency "prometheus-client"
-  spec.add_development_dependency "bundler", ">= 0.12.13"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "test-unit"

data/lib/fluent/plugin/in_prometheus_monitor.rb

@@ -17,10 +17,10 @@ module Fluent
       super
       hostname = Socket.gethostname
       expander = Fluent::Prometheus.placeholder_expnader(log)
-      expander.prepare_placeholders(Time.now.to_i, {}, {'hostname' => hostname})
+      placeholders = expander.prepare_placeholders({'hostname' => hostname})
       @base_labels = Fluent::Prometheus.parse_labels_elements(conf)
       @base_labels.each do |key, value|
-        @base_labels[key] = expander.expand(value)
+        @base_labels[key] = expander.expand(value, placeholders)
       end
 
       @monitor_agent = MonitorAgentInput.new

data/lib/fluent/plugin/prometheus.rb

@@ -67,16 +67,17 @@ module Fluent
     end
 
     def instrument(tag, es, metrics)
-      placeholder_options = {
+      placeholder_values = {
         'tag' => tag,
         'hostname' => @hostname,
       }
 
       es.each do |time, record|
-        @placeholder_expander.prepare_placeholders(time, record, placeholder_options)
+        placeholders = record.merge(placeholder_values)
+        placeholders = @placeholder_expander.prepare_placeholders(placeholders)
         metrics.each do |metric|
           begin
-            metric.instrument(record, @placeholder_expander)
+            metric.instrument(record, @placeholder_expander, placeholders)
           rescue => e
             log.warn "prometheus: failed to instrument a metric.", error_class: e.class, error: e, tag: tag, name: metric.name
             router.emit_error_event(tag, time, record, e)
@@ -106,10 +107,10 @@ module Fluent
         @base_labels = labels.merge(@base_labels)
       end
 
-      def labels(record, expander)
+      def labels(record, expander, placeholders)
         label = {}
         @base_labels.each do |k, v|
-          label[k] = expander.expand(v)
+          label[k] = expander.expand(v, placeholders)
         end
         label
       end
@@ -143,9 +144,9 @@ module Fluent
         end
       end
 
-      def instrument(record, expander)
+      def instrument(record, expander, placeholders)
         if record[@key]
-          @gauge.set(labels(record, expander), record[@key])
+          @gauge.set(labels(record, expander, placeholders), record[@key])
         end
       end
     end
@@ -160,14 +161,14 @@ module Fluent
         end
       end
 
-      def instrument(record, expander)
+      def instrument(record, expander, placeholders)
         # use record value of the key if key is specified, otherwise just increment
         value = @key ? record[@key] : 1
 
         # ignore if record value is nil
         return if value.nil?
 
-        @counter.increment(labels(record, expander), value)
+        @counter.increment(labels(record, expander, placeholders), value)
       end
     end
 
@@ -185,9 +186,9 @@ module Fluent
         end
       end
 
-      def instrument(record, expander)
+      def instrument(record, expander, placeholders)
         if record[@key]
-          @summary.add(labels(record, expander), record[@key])
+          @summary.add(labels(record, expander, placeholders), record[@key])
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Masahiro Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.13
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.13
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement