fluent-plugin-zabbix-agent 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95b4a81abb2b8f9c15ead559177ffb99af51bee5
-  data.tar.gz: 3ff836e8e4f56e616c77824871a3f04232bae5b7
+  metadata.gz: 9e9e82ae6acd85c0a2bd78d03fdf9cc6b370f3b0
+  data.tar.gz: e68f51a774ec59b03a533d0563454a2c7fe9806d
 SHA512:
-  metadata.gz: 8c93b0599c818262bbe41605d4d5d6d466dbc2757bee0e11b58e7057e89ecaf31136cf1695ee65f983f36171e7162c003a82abfd9ba7d32b5e9407b99ead5703
-  data.tar.gz: d8694cd8bf37d8301d5279a485ce63927264b576189452d9868b2f9720bca4afe9f732cc03bd2a8dbef387fb195aa3497d8c473a0907956c1e6173c1495d660b
+  metadata.gz: 47709b31852db97f53584c4722b7b64c226fd972de41f25d6e77893fc430a14cbff2d249c14819505e47f415911c5931bb75636177e3f52abaac7e5051d09593
+  data.tar.gz: e87acc4edf7640e60012f8044dd9f00af15efe6ef6e81ce28708b8ac6b6930458733484175df661d494850bbc0496b176fb072e12b825d01d5c06a57272b081c

data/README.md

@@ -41,6 +41,8 @@ Or install it yourself as:
     "system.cpu.load[all,avg5]": "load_avg5",
     ...
   }
+  # or
+  #items_file /path/to/items.json
 </source>
 
 ```

data/lib/fluent/plugin/in_zabbix_agent.rb

@@ -11,21 +11,12 @@ class Fluent::ZabbixAgentInput < Fluent::Input
     define_method('router') { Fluent::Engine }
   end
 
-  def initialize
-    super
-    require 'csv'
-    require 'fileutils'
-    require 'logger'
-    require 'time'
-    require 'addressable/uri'
-    require 'aws-sdk'
-  end
-
   config_param :agent_host, :string,  :default => '127.0.0.1'
   config_param :agent_port, :integer, :default => 10050
   config_param :interval,   :time,    :default => 60
   config_param :tag,        :string,  :default => 'zabbix.item'
-  config_param :items,      :hash
+  config_param :items,      :hash,    :default => nil
+  config_param :items_file, :string,  :default => nil
   config_param :extra,      :hash,    :default => {}
   config_param :bulk,       :bool,    :default => false
 
@@ -33,11 +24,23 @@ class Fluent::ZabbixAgentInput < Fluent::Input
     super
     require 'socket'
     require 'zabbix_protocol'
+    require 'json'
   end
 
   def configure(conf)
     super
 
+    if @items.nil? and @items_file.nil?
+      raise Fluent::ConfigError, 'One of "items" or "items_file" is required'
+    elsif @items and @items_file
+      raise %!It isn't possible to specify both of items" and "items_file"!
+    end
+
+    if @items_file
+      @items = File.read(@items_file)
+      @items = JSON.load(@items)
+    end
+
     @items.keys.each do |key|
       value = @items[key]
       @items[key] = key if value.nil?

data/lib/fluent_plugin_zabbix_agent/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginZabbixAgent
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

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