logstash-filter-zabbix 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64cb99e7916ff49173428321da5bc313f0054f52
-  data.tar.gz: 8dcbfb2de943344880a38bd27c0b77feef19e890
+  metadata.gz: 78713a2817832a7c39002265d3c70038d749621d
+  data.tar.gz: 7bb406a24d3da2542497ff06747f9e40185e60cd
 SHA512:
-  metadata.gz: fddc1521fc9d7748235046e931faa0191e8c2cc4d0aeb26182f84a39cd080df4d011db8cea00e6d9baa52669ca01c82ad9a5308af0cb56a289db538c8ee062bb
-  data.tar.gz: 73686e1eba80064f66bf1098aa259a93b6c60f224a1cacea8002c64bb8b6dedce30bbd909da4c56311ef2714a27badecebbda77db5aaf33625cc482a199b8f94
+  metadata.gz: f83bbe2c23237127827292856038c80ce33096cef94b212591a5e3624de58221ca6e1e5176ff503bc86cb91826249dbddc0c1288985725f839086af77dc7928a
+  data.tar.gz: 79783ba99a61d26e5e6214160daaea97259491e4139b76dfb5e641de0b7a4803590f75c9b6de87329b637b1b0a8872c8bb52c05e9de9226f372c1b7d7c46b017

data/lib/logstash/filters/zabbix.rb

@@ -16,14 +16,16 @@ class LogStash::Filters::Zabbix < LogStash::Filters::Base
 
   public
   def register
-    @items = Cache.fetch(
+    options = {
       url: @url,
       user: @user,
       password: @password,
       group_id: @group_id,
       keys: @keys
-    )
-    @logger.info("Got zabbix items", :size => @items.keys.size)
+    }
+
+    @zabbix_updater = Cache.new(@logger, options)
+    @zabbix_updater.start
   end # def register
 
   public
@@ -32,7 +34,7 @@ class LogStash::Filters::Zabbix < LogStash::Filters::Base
 
     if 'insert' == event.get('type')
       data = event.get("data")
-      item = @items[data["itemid"]]
+      item = @zabbix_updater.items[data["itemid"]]
 
       if item
         metric = {

data/lib/logstash/filters/zabbix/cache.rb

@@ -1,24 +1,52 @@
 # encoding: utf-8
+
+REFRSH_INTERVAL = 6 * 36000 # every 6 hours
+
 class LogStash::Filters::Zabbix::Cache
   require 'zabbixapi'
 
-  def self.fetch(options)
-    zbx = ZabbixApi.connect(options)
+  attr_accessor :items
+
+  def initialize(logger, options)
+    @logger = logger
+    @options = options
+    @items = {}
+  end
+
+  def start
+    self.fetch()
+    @wt = Thread.new do
+      # update zabbix hosts every 6 hours
+      while true
+        sleep(@options[:interval] || REFRSH_INTERVAL)
+        self.fetch()
+      end
+    end
+  end
+
+  def end
+    @wt.kill
+  end
+
+  def fetch()
+    zbx = ZabbixApi.connect(@options)
     response = zbx.query(
       method: 'host.get',
       params: {
-          groupids: options[:group_id],
+          groupids: @options[:group_id],
           output: ['hostid', 'host'],
           selectItems: ['itemid', 'key_', 'formula'],
           selectInterfaces: ['ip'],
       });
 
-    return parse(response, options[:keys])
+    @items = parse(response, @options[:keys])
+    @logger.info("Got zabbix items", :size => @items.keys.size)
+    @items
   end
 
   private
 
-  def self.parse(hosts, keys)
+  def parse(hosts, keys)
     hosts.reduce({}) do |memo, data|
       data['items'].each do |item|
         if keys.any? { |key| item['key_'].start_with?(key) }

data/logstash-filter-zabbix.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-zabbix'
-  s.version       = '0.1.1'
+  s.version       = '0.1.2'
   s.licenses      = ['Apache-2.0']
   s.summary       = %q{logstash-filter-zabbix - A filter to retain zabbix metrics you want to}
   s.description   = %q{This plugin will keep the specific items you want from zabbix history data stream}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-zabbix
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hupu Devops
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement