fluent-plugin-prometheus 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8cdb0af95b316cebf86dba1a0beb649d51dca8ebcc2a9148c3a54341510037a
-  data.tar.gz: 348dc37b2707ad5d272a2ad3ea8aba4f2188084fa359bdb1cacd4081467c1227
+  metadata.gz: 1f14f2b2162bace2a18a80f885df28261ed260a7b8e865a12e7828d46af9b02f
+  data.tar.gz: 20749cd6ee743ac3726719e654e1a4f046aa2f953245604e6aa75cd87ed00e62
 SHA512:
-  metadata.gz: 0a014a3ff64dd13721e3c6c0a5b1bc9f7cccf7523cc1040944eeb40d74b9e8c45fa89e47fbf68f83ae968ef36bb19ef461be7cf346b407262e7457d8a38b6bc6
-  data.tar.gz: 395ef53fcfd6d0c6619960dc69b249a4ebf44230c9348c5d688c901980dbcd1aba95f826003fd1a9fa37f22e15d4383b1f5757c6d49ebe1dcd524aca730044d3
+  metadata.gz: 28ca37140a4b634665a9ba184c1615380bc7c458ed745d5548cb75b92d75d3b1069cd342d3119785a11d1beb369e7b41b5fa0319021bb0f69400ffe327dea83e
+  data.tar.gz: b04770fec96856fc37b6943c7129c5e8ef16ce8b1415b425932e4419594e58a3255406de54e3aad1c28af1e3d62074391bd2b40e4aded8b5f598fbece53cab82

data/fluent-plugin-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-prometheus"
-  spec.version       = "1.7.2"
+  spec.version       = "1.7.3"
   spec.authors       = ["Masahiro Sano"]
   spec.email         = ["sabottenda@gmail.com"]
   spec.summary       = %q{A fluent plugin that collects metrics and exposes for Prometheus.}

data/lib/fluent/plugin/in_prometheus_tail_monitor.rb

@@ -29,7 +29,7 @@ module Fluent::Plugin
       super
       hostname = Socket.gethostname
       expander_builder = Fluent::Plugin::Prometheus.placeholder_expander(log)
-      expander = expander_builder.prepare_placeholders({ 'hostname' => hostname, 'worker_id' => fluentd_worker_id })
+      expander = expander_builder.build({ 'hostname' => hostname, 'worker_id' => fluentd_worker_id })
       @base_labels = parse_labels_elements(conf)
       @base_labels.each do |key, value|
         unless value.is_a?(String)

data/spec/fluent/plugin/in_prometheus_tail_monitor_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'fluent/plugin/in_prometheus_tail_monitor'
+require 'fluent/test/driver/input'
+
+describe Fluent::Plugin::PrometheusTailMonitorInput do
+  MONITOR_CONFIG = %[
+  @type prometheus_tail_monitor
+  <labels>
+    host ${hostname}
+    foo bar
+  </labels>
+]
+
+  INVALID_MONITOR_CONFIG = %[
+  @type prometheus_tail_monitor
+
+  <labels>
+    host ${hostname}
+    foo bar
+    invalid_use1 $.foo.bar
+    invalid_use2 $[0][1]
+  </labels>
+]
+
+  let(:config) { MONITOR_CONFIG }
+  let(:driver) { Fluent::Test::Driver::Input.new(Fluent::Plugin::PrometheusTailMonitorInput).configure(config) }
+
+  describe '#configure' do
+    describe 'valid' do
+      it 'does not raise error' do
+        expect { driver }.not_to raise_error
+      end
+    end
+
+    describe 'invalid' do
+      let(:config) { INVALID_MONITOR_CONFIG }
+      it 'expect raise error' do
+        expect { driver }.to raise_error
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Masahiro Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -131,6 +131,7 @@ files:
 - spec/fluent/plugin/filter_prometheus_spec.rb
 - spec/fluent/plugin/in_prometheus_monitor_spec.rb
 - spec/fluent/plugin/in_prometheus_spec.rb
+- spec/fluent/plugin/in_prometheus_tail_monitor_spec.rb
 - spec/fluent/plugin/out_prometheus_spec.rb
 - spec/fluent/plugin/prometheus/placeholder_expander_spec.rb
 - spec/fluent/plugin/prometheus_metrics_spec.rb
@@ -163,6 +164,7 @@ test_files:
 - spec/fluent/plugin/filter_prometheus_spec.rb
 - spec/fluent/plugin/in_prometheus_monitor_spec.rb
 - spec/fluent/plugin/in_prometheus_spec.rb
+- spec/fluent/plugin/in_prometheus_tail_monitor_spec.rb
 - spec/fluent/plugin/out_prometheus_spec.rb
 - spec/fluent/plugin/prometheus/placeholder_expander_spec.rb
 - spec/fluent/plugin/prometheus_metrics_spec.rb