fluent-plugin-prometheus 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e788403193d1cee84b22745fc1df7daff846687
-  data.tar.gz: 2daaa89406fd5fdfd40af646e0710f0f852b4a9e
+  metadata.gz: 2697668d79174be33f93db6777808ba2e4b6e856
+  data.tar.gz: 9a842e147273f306bd2b7d18fbf6f2ca35ba3de9
 SHA512:
-  metadata.gz: b74333d759e146f0ca7c0ab6a6457cefa771f6018fbdd5f20dcae0ac13d74b0ce4b028791ee9045124abe9a9d243a900f341538797b774e56426223e9f66c4d5
-  data.tar.gz: 438a688500a58fd8084b4401987ff192c551405cda063838221041cdfe632db6ea6641aac0ca9a48e5420a9adcfc42837cd117e039f1e05f07558b176114bbce
+  metadata.gz: f25473b6467b07dcc4e25ca95696abb22aa2c1bafaf44707ba07bae3ae5d0f3bf89c6cbe62dc57858630bfcab9e2bf85b13d3d7f0423e9ed8dbd504bca33ed1e
+  data.tar.gz: 90a812f445c0b53189119ffe6e62d7eba8541528ace398c1caaebcf991c961ffa063ae440d338614559f436a0a619a9e1ac994f5270bcea0cfed74b3069398ed

data/.gitignore

@@ -2,6 +2,7 @@
 /.yardoc
 /Gemfile.lock
 /Gemfile.fluentd.0.10.lock
+/Gemfile.fluentd.0.12.lock
 /_yardoc/
 /coverage/
 /doc/

data/.travis.yml

@@ -1,13 +1,13 @@
 language: ruby
 
 rvm:
-  - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3.1
 
 gemfile:
   - Gemfile
   - Gemfile.fluentd.0.10
+  - Gemfile.fluentd.0.12
 
 script:
   - bundle exec rake spec

data/Gemfile.fluentd.0.12

@@ -0,0 +1,3 @@
+source 'https://rubygems.org/'
+gem 'fluentd', '~> 0.12.0'
+gemspec

data/README.md

@@ -4,7 +4,7 @@
 
 A fluent plugin that instruments metrics from records and exposes them via web interface. Intended to be used together with a [Prometheus server](https://github.com/prometheus/prometheus).
 
-If you are using Fluentd v0.10, you have to explicitly install [fluent-plugin-record-reformer](https://github.com/sonots/fluent-plugin-record-reformer) together. With Fluentd v0.12, there is no additional dependency.
+If you are using Fluentd v0.10, you have to explicitly install [fluent-plugin-record-reformer](https://github.com/sonots/fluent-plugin-record-reformer) together. With Fluentd v0.12 or v0.14, there is no additional dependency.
 
 ## Installation
 

data/fluent-plugin-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-prometheus"
-  spec.version       = "0.1.2"
+  spec.version       = "0.1.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.rb

@@ -1,3 +1,4 @@
+require 'fluent/input'
 require 'fluent/plugin/prometheus'
 require 'webrick'
 

data/lib/fluent/plugin/in_prometheus_monitor.rb

@@ -1,3 +1,5 @@
+require 'fluent/input'
+require 'fluent/plugin/in_monitor_agent'
 require 'fluent/plugin/prometheus'
 require 'webrick'
 
@@ -16,21 +18,21 @@ module Fluent
     def configure(conf)
       super
       hostname = Socket.gethostname
-      expander = Fluent::Prometheus.placeholder_expnader(log)
+      expander = Fluent::Prometheus.placeholder_expander(log)
       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, placeholders)
       end
 
-      @monitor_agent = MonitorAgentInput.new
+      @monitor_agent = Fluent::MonitorAgentInput.new
 
       buffer_queue_length = @registry.gauge(
         :fluentd_status_buffer_queue_length,
         'Current buffer queue length.')
       buffer_total_queued_size = @registry.gauge(
         :fluentd_status_buffer_total_bytes,
-        'Current total size of ququed buffers.')
+        'Current total size of queued buffers.')
       retry_counts = @registry.gauge(
         :fluentd_status_retry_count,
         'Current retry counts.')

data/lib/fluent/plugin/out_prometheus.rb

@@ -1,3 +1,4 @@
+require 'fluent/output'
 require 'fluent/plugin/prometheus'
 
 module Fluent

data/lib/fluent/plugin/prometheus.rb

@@ -41,7 +41,7 @@ module Fluent
       metrics
     end
 
-    def self.placeholder_expnader(log)
+    def self.placeholder_expander(log)
       # Use internal class in order to expand placeholder
       if defined?(Fluent::Filter) # for v0.12, built-in PlaceholderExpander
         begin
@@ -62,7 +62,7 @@ module Fluent
 
     def configure(conf)
       super
-      @placeholder_expander = Fluent::Prometheus.placeholder_expnader(log)
+      @placeholder_expander = Fluent::Prometheus.placeholder_expander(log)
       @hostname = Socket.gethostname
     end
 

data/misc/fluentd_sample.conf

@@ -2,12 +2,12 @@
 
 # input plugin that exports metrics
 <source>
-  type prometheus
+  @type prometheus
 </source>
 
 # input plugin that collects metrics from MonitorAgent
 <source>
-  type prometheus_monitor
+  @type prometheus_monitor
   <labels>
     host ${hostname}
   </labels>
@@ -16,7 +16,7 @@
 ## Nginx Access Log Configuration
 
 <source>
-  type tail
+  @type tail
   format nginx
   tag nginx
   path /var/log/nginx/access.log
@@ -25,7 +25,7 @@
 </source>
 
 <filter nginx>
-  type prometheus
+  @type prometheus
 
   # You can use counter type with specifying a key,
   # and increments counter by the value
@@ -52,11 +52,11 @@
 </filter>
 
 <match nginx>
-  type copy
+  @type copy
   # for MonitorAgent sample
   # <store>
   #   @id test_forward
-  #   type forward
+  #   @type forward
   #   buffer_type memory
   #  <server>
   #    host 127.0.0.1
@@ -64,14 +64,14 @@
   #  </server>
   # </store>
   <store>
-    type stdout
+    @type stdout
   </store>
 </match>
 
 ## Nginx Proxy Log Configuration
 
 <source>
-  type tail
+  @type tail
   format ltsv
   tag nginx_proxy
   path /var/log/nginx/access_proxy.log
@@ -80,7 +80,7 @@
 </source>
 
 <filter nginx_proxy>
-  type prometheus
+  @type prometheus
 
   # common labels for all metrics
   <labels>
@@ -128,8 +128,8 @@
 </filter>
 
 <match nginx_proxy>
-  type copy
+  @type copy
   <store>
-    type stdout
+    @type stdout
   </store>
 </match>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Masahiro Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -106,6 +106,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.fluentd.0.10
+- Gemfile.fluentd.0.12
 - LICENSE.txt
 - README.md
 - Rakefile