fluent-plugin-prometheus 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 975f71bc42e2fcbd393003e0de70226c450c3ecc
-  data.tar.gz: 98548ff7299d46702d17a39e204bd05e610dcf67
+  metadata.gz: 0015d77e131a78ad42b181d8d57a981b07398298
+  data.tar.gz: 69cb9279858bef00990af84ee4f82533bb5b4b78
 SHA512:
-  metadata.gz: f95fae92733fc3af07cd27fec952af31772d55dee91ae3eded8bb234c7b0b76272cc667e97ca8ada41fbea4dfaf12c73d12bba209ce63028c31ab74adfac2cd3
-  data.tar.gz: 91a012c917969ac1278ba5769302ade6fde3113a364f79c013e5ce29488d488aa38be73acd77fe1e28f753fecb81f30e98584bb38512944bbe56895ba3c174ee
+  metadata.gz: 8b51025e9ec268a8dc2252c58a99b80a67d019a15933ea763b05f1c5260a2e1ed5c8f282103ed4f0bfc48ab531e73decb1d74c71a294a3b1f147aa5f147165e2
+  data.tar.gz: ce3da1320eb05ee4d5e5fc258ee4b671a6647a84d7e4960fbed6769240ea6c99ece2be130af334436f32b0d5e40e6061e69730ae61366721022b75fbd7a2e148

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 2.1
   - 2.2
+  - 2.3.0
 
 gemfile:
   - Gemfile

data/README.md

@@ -291,9 +291,8 @@ $ bundle install --path vendor/bundle
 Download pre-compiled prometheus binary and start it. It listens on 9090.
 
 ```
-$ mkdir prometheus
-$ wget https://github.com/prometheus/prometheus/releases/download/0.13.3/prometheus-0.13.3.linux-amd64.tar.gz -O - | tar zxf - -C prometheus
-$ ./prometheus/prometheus -config.file=./misc/prometheus.conf -storage.local.path=./prometheus/metrics
+$ wget https://github.com/prometheus/prometheus/releases/download/0.16.1/prometheus-0.16.1.linux-amd64.tar.gz -O - | tar zxf -
+$ ./prometheus-0.16.1.linux-amd64/prometheus -config.file=./misc/prometheus.yaml -storage.local.path=./prometheus/metrics
 ```
 
 Install Nginx for sample metrics. It listens on 80 and 9999.
@@ -301,7 +300,7 @@ Install Nginx for sample metrics. It listens on 80 and 9999.
 ```
 $ sudo apt-get install -y nginx
 $ sudo cp misc/nginx_proxy.conf /etc/nginx/sites-enabled/proxy
-$ sudo chmod 777 /var/log/nginx && sudo chmod +r /var/log/nginx/access.log
+$ sudo chmod 777 /var/log/nginx && sudo chmod +r /var/log/nginx/*.log
 $ sudo service nginx restart
 ```
 

data/fluent-plugin-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-prometheus"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   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"
+  spec.add_development_dependency "bundler", ">= 0.12.13"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "test-unit"

data/lib/fluent/plugin/prometheus.rb

@@ -46,14 +46,14 @@ module Fluent
       if defined?(Fluent::Filter) # for v0.12, built-in PlaceholderExpander
         begin
           require 'fluent/plugin/filter_record_transformer'
-          return Fluent::RecordTransformerFilter::PlaceholderExpander.new(log)
+          return Fluent::RecordTransformerFilter::PlaceholderExpander.new(log: log)
         rescue LoadError => e
           raise ConfigError, "cannot find filter_record_transformer plugin: #{e.message}"
         end
       else # for v0.10, use PlaceholderExapander in fluent-plugin-record-reformer plugin
         begin
           require 'fluent/plugin/out_record_reformer.rb'
-          return Fluent::RecordReformerOutput::PlaceholderExpander.new(log)
+          return Fluent::RecordReformerOutput::PlaceholderExpander.new(log: log)
         rescue LoadError => e
           raise ConfigError, "cannot find fluent-plugin-record-reformer: #{e.message}"
         end

data/misc/prometheus.yaml

@@ -0,0 +1,8 @@
+# A job to scrape an endpoint of Fluentd running on localhost.
+scrape_configs:
+- job_name: fluentd
+  scrape_interval: 5s
+  target_groups:
+    - targets:
+        - 'localhost:24231'
+  metrics_path: /metrics

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Masahiro Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.13
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,8 @@ files:
 - lib/fluent/plugin/prometheus.rb
 - misc/fluentd_sample.conf
 - misc/nginx_proxy.conf
-- misc/prometheus.conf
+- misc/prometheus-old-format.conf
+- misc/prometheus.yaml
 - spec/fluent/plugin/filter_prometheus_spec.rb
 - spec/fluent/plugin/out_prometheus_spec.rb
 - spec/fluent/plugin/prometheus_spec.rb