fluent-plugin-munin-node 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee769965d53c56afa58d2d2ba89177b81645980f
-  data.tar.gz: 5bd42c213c57ba9a18d9c7493ab66a9e4740ab39
+  metadata.gz: 40715938a20832b9b2cd85e39c40ced5ea5f74ce
+  data.tar.gz: 3f532fb1d6dd01309a2bc11d09a4035eb6ae3f12
 SHA512:
-  metadata.gz: aa4a147a3036122b811af47008a7c9366eee2d420132bf8bf714ffca518f00a63b6496ad22df8687cd348427ed5cc65bfdaffc917d81809aee9c0ed783bf8cde
-  data.tar.gz: e93447ba38f5111b2d0d1b34d93cc79da379241a540c867a871664d629b5a05f858ff03757ba2dd671857ce554bf65e216390fcba5c99a97f72fe6081e72a2fd
+  metadata.gz: 97d5f677b50cac77e091e30d3a101e80ba5a94f0c9d5da4707742b85c58851cb613ce99381ead9040121d75d137a5c426518533219c138754f1ab5b6767bc8af
+  data.tar.gz: aa23d05edd9be3de41846c9ab9d513bdef97150def68245de629356efa9466763b8b5f4924871129f1931e3c0415b59d882ab5072012cff36e21acc6ef0f0154

data/README.md

@@ -39,6 +39,8 @@ Or install it yourself as:
   #bulk false
   #include_service (cpu|entropy) # regular expression
   #exclude_service df.*          # regular expression
+  #include_hostname false
+  #hostname_key hostname
 </source>
 ```
 

data/lib/fluent/plugin/in_munin_node.rb

@@ -11,18 +11,20 @@ class Fluent::MuninNodeInput < Fluent::Input
     define_method('router') { Fluent::Engine }
   end
 
-  config_param :node_host,       :string,  :default => '127.0.0.1'
-  config_param :node_port,       :integer, :default => 4949
-  config_param :interval,        :time,    :default => 60
-  config_param :tag_prefix,      :string,  :default => 'munin'
-  config_param :bulk_suffix,     :string,  :default => 'metrics'
-  config_param :service_key,     :string,  :default => 'service'
-  config_param :field_key,       :string,  :default => 'field'
-  config_param :value_key,       :string,  :default => 'value'
-  config_param :extra,           :hash,    :default => {}
-  config_param :bulk,            :bool,    :default => false
-  config_param :include_service, :string,  :default => nil
-  config_param :exclude_service, :string,  :default => nil
+  config_param :node_host,        :string,  :default => '127.0.0.1'
+  config_param :node_port,        :integer, :default => 4949
+  config_param :interval,         :time,    :default => 60
+  config_param :tag_prefix,       :string,  :default => 'munin'
+  config_param :bulk_suffix,      :string,  :default => 'metrics'
+  config_param :service_key,      :string,  :default => 'service'
+  config_param :field_key,        :string,  :default => 'field'
+  config_param :value_key,        :string,  :default => 'value'
+  config_param :extra,            :hash,    :default => {}
+  config_param :bulk,             :bool,    :default => false
+  config_param :include_service,  :string,  :default => nil
+  config_param :exclude_service,  :string,  :default => nil
+  config_param :include_hostname, :bool,    :default => false
+  config_param :hostname_key,     :string,  :default => 'hostname'
 
   def initialize
     super
@@ -34,6 +36,10 @@ class Fluent::MuninNodeInput < Fluent::Input
 
     @include_service = Regexp.new(@include_service) if @include_service
     @exclude_service = Regexp.new(@exclude_service) if @exclude_service
+
+    if @include_hostname
+      @extra.update(@hostname_key => hostname)
+    end
   end
 
   def start
@@ -121,6 +127,10 @@ class Fluent::MuninNodeInput < Fluent::Input
     services
   end
 
+  def hostname
+    `hostname`.strip
+  end
+
   class TimerWatcher < Coolio::TimerWatcher
     def initialize(interval, repeat, log, &callback)
       @callback = callback

data/lib/fluent_plugin_munin_node/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginMuninNode
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-munin-node
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd