fluent-plugin-zabbix-agent 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b064b3363a061c4ddb2c5ea48ccc6ca6109cc7
-  data.tar.gz: 73ec863548405ec6471329f375b362e0f384889a
+  metadata.gz: 70ea3efb9f6850bc5baaf5edfd4ba7ceaa5f2727
+  data.tar.gz: 42e89b3a717f56601aad4ba89ef46f6485ab2abf
 SHA512:
-  metadata.gz: 1d1da1ac043177d538f053216c2e334c0654d839f13c47b3077599b2439e90ab059f1059db8b423772a9d6dada4b8510cc9219022617a22a67241c824ccb623f
-  data.tar.gz: bfdaf09ae1e7acf7b6dab73732644eb3972cbbc4ce996750a3b03adea33e892508688b1446c8e365357c4278b8422aea72954af2ad6f6d4f7a8710e4d674e68a
+  metadata.gz: 0cc4ddd43188a5c2d8172e3a13c611a956b7c9f3553ceeb48c406e379e4c7cf91e16cb78667bcbaf072b9774621c8d240c9a368aca9c05bbd865feabbf4d1edd
+  data.tar.gz: d92ac6db472f9f14b2d391e1e863725349ce9a52186446bbcb5759af98578973f41b6b59f952141a7d61c092a7d18788bc4a05e5d4ba1a43a8976fe5c7338b57

data/README.md

@@ -43,6 +43,8 @@ Or install it yourself as:
   }
   # or
   #items_file /path/to/items.json
+  # or
+  #items_file /path/to/conf.d/items-*.json
 </source>
 
 ```

data/lib/fluent/plugin/in_zabbix_agent.rb

@@ -33,12 +33,21 @@ class Fluent::ZabbixAgentInput < Fluent::Input
     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"!
+      raise Fluent::ConfigError, %!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)
+      @items = {}
+
+      Dir.glob(@items_file) do |path|
+        file = File.read(path)
+        json = JSON.load(file)
+        @items.update(json) if json
+      end
+    end
+
+    if @items.empty?
+      raise Fluent::ConfigError, '"items" or "items_file" is empty'
     end
 
     @items.keys.each do |key|

data/lib/fluent_plugin_zabbix_agent/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginZabbixAgent
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

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