fluent-plugin-zabbix-agent 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a64f2855d3ae4faad49ca79a4270eaebb3bcd7e
-  data.tar.gz: 614ba107d5bf34550c0b50ed951b66545ce57e94
+  metadata.gz: 45296588e6dc58726e0e86ac22535cbfa65f1f97
+  data.tar.gz: 2b554f37bd12d77653c3d920d1994e63e2e8b924
 SHA512:
-  metadata.gz: b8eae9d506468c45efea37dafa17e513977bb6fa6d212b0fd0670dc9f4c1c89653ee5341f83862d3aaf8e38cbb1ade5a9d3b45a4a70aad4cfd2340445f9c621f
-  data.tar.gz: 818d8a363335565b2f120bcb6becc73405e30de4e0d2cb652af993bb1914431e4f5a77210f52b934e38e0354b6493733fc96e079bf94270ce33726f709f84735
+  metadata.gz: b10efadc433b726f7f2e44b2da1a8aebea1b2e32a1623e4fbd2c71aa07f1da23669c5d972d8f806ab4a2fa576dbc77fa15459274cd850e6c3ce8abc57f4b7084
+  data.tar.gz: 36812b8edb4c2617da803fca7f4a78822dc7dea17eee7339f46645247967fe0fc1b832f11fc39d49fd4e260543ab7ccbccf65de942ca89c6edacb2897b7e4e7e

data/README.md

@@ -38,6 +38,8 @@ Or install it yourself as:
   #extra {}
   #bulk false
   #allow_items_empty false
+  #include_hostname false
+  #hostname_key hostname
 
   items {
     "system.cpu.load[all,avg1]": "load_avg1",

data/lib/fluent/plugin/in_zabbix_agent.rb

@@ -22,6 +22,8 @@ class Fluent::ZabbixAgentInput < Fluent::Input
   config_param :extra,             :hash,    :default => {}
   config_param :bulk,              :bool,    :default => false
   config_param :allow_items_empty, :bool,    :default => false
+  config_param :include_hostname,  :bool,    :default => false
+  config_param :hostname_key,      :string,  :default => 'hostname'
 
   def initialize
     super
@@ -64,6 +66,10 @@ class Fluent::ZabbixAgentInput < Fluent::Input
       value = @items[key]
       @items[key] = key if value.nil?
     end
+
+    if @include_hostname
+      @extra.update(@hostname_key => hostname)
+    end
   end
 
   def start
@@ -151,6 +157,10 @@ class Fluent::ZabbixAgentInput < Fluent::Input
     end
   end
 
+  def hostname
+    `hostname`.strip
+  end
+
   class TimerWatcher < Coolio::TimerWatcher
     def initialize(interval, repeat, log, &callback)
       @callback = callback

data/lib/fluent_plugin_zabbix_agent/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginZabbixAgent
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zabbix-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Genki Sugawara