fluent-plugin-zabbix-agent 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27049880904ec28d2e2159623747826e6fac0b43
-  data.tar.gz: 534b50053c659cd512c11e0f651a3006116ca7ad
+  metadata.gz: 9d7f2b2841901404b8aa1aed837046c9aa79f869
+  data.tar.gz: 9d6019d70e783ad42e3202b3952e44479fdcbf2f
 SHA512:
-  metadata.gz: 1c2aee511111ea3bd9ecfc9fa1a862a797cb276b78680b191fc673af4b48353bdcedc05feb378c8c322d5730c7a473f530cab49f5fe51c24d9b40df2240954c7
-  data.tar.gz: 861a09d4bdca8ad495923f36d49c9b007ec857fb27b13f1eef34ab548940f14e53b6f513d5967aed9f85729af86dcd64541e52c62a1d46f501dfe97e9efd0882
+  metadata.gz: 98334166453109edfd864d9b13cb0a14a393e6ec0dede2e1856b0427fb35b7f180b839ce2312a04447d0e4adc47e7c4d67cc83656ba057bd11abc039720b15ba
+  data.tar.gz: adf317734eff24096edf75015c64c3b1f12f0838c3bc378b758245532c4b9ad75845ff900486224c066e18d4b64d03e5f7012e3e8e8f12608f66ff4cd5d08bff

data/README.md

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

data/lib/fluent/plugin/in_zabbix_agent.rb

@@ -27,6 +27,7 @@ class Fluent::ZabbixAgentInput < Fluent::Input
     require 'socket'
     require 'zabbix_protocol'
     require 'json'
+    require 'open-uri'
   end
 
   def configure(conf)
@@ -41,10 +42,18 @@ class Fluent::ZabbixAgentInput < Fluent::Input
     if @items_file
       @items = {}
 
-      Dir.glob(@items_file) do |path|
-        file = File.read(path)
+      files = Dir.glob(@items_file)
+
+      if files.empty?
+        file = open(@items_file, &:read)
         json = JSON.load(file)
         @items.update(json) if json
+      else
+        Dir.glob(@items_file) do |path|
+          file = File.read(path)
+          json = JSON.load(file)
+          @items.update(json) if json
+        end
       end
     end
 

data/lib/fluent_plugin_zabbix_agent/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginZabbixAgent
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

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